Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 71c265f2f10b
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e8171eb8f32d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 10, 2020

  1. Multithreading and other significant performance improvements to wave… 

    …form loading
    @azonenberg
    azonenberg committed May 10, 2020
    Copy the full SHA
    e8171eb View commit details
Showing with 50 additions and 18 deletions.
  1. +50 −18 glscopeclient/OscilloscopeWindow.cpp
68 changes: 50 additions & 18 deletions glscopeclient/OscilloscopeWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -579,8 +579,6 @@ void OscilloscopeWindow::LoadWaveformDataForScope(
string datadir,
IDTable& table)
{
char tmp[512];

TimePoint time;
time.first = 0;
time.second = 0;
@@ -605,13 +603,15 @@ void OscilloscopeWindow::LoadWaveformDataForScope(
for(size_t i=0; i<scope->GetChannelCount(); i++)
scope->GetChannel(i)->Detach();

//Load each cahnnel
//Set up channel metadata first (serialized)
auto chans = wfm["channels"];
vector<int> channels;
for(auto jt : chans)
{
auto ch = jt.second;
int channel_index = ch["index"].as<int>();
auto chan = scope->GetChannel(channel_index);
channels.push_back(channel_index);

//TODO: support non-analog/digital captures (eyes, spectrograms, etc)
CaptureChannelBase* cap = NULL;
@@ -628,7 +628,21 @@ void OscilloscopeWindow::LoadWaveformDataForScope(
cap->m_startPicoseconds = time.second;
cap->m_triggerPhase = ch["trigphase"].as<float>();

//Load the actual samples
chan->SetData(cap);
}

//Load data for each channel in parallel to speed parsing
#pragma omp parallel for
for(size_t i=0; i<channels.size(); i++)
{
int channel_index = channels[i];
auto chan = scope->GetChannel(channel_index);
auto cap = chan->GetData();
AnalogCapture* acap = dynamic_cast<AnalogCapture*>(cap);
DigitalCapture* dcap = dynamic_cast<DigitalCapture*>(cap);

//Load the actual sample data
char tmp[512];
snprintf(tmp, sizeof(tmp), "%s/scope_%d_waveforms/waveform_%d/channel_%d.bin",
datadir.c_str(),
scope_id,
@@ -638,33 +652,51 @@ void OscilloscopeWindow::LoadWaveformDataForScope(
if(!fp)
{
LogError("couldn't open %s\n", tmp);
return;
continue;
}

int64_t stime[2];
bool b;
float f;
while(!feof(fp))
//Read the whole file into a buffer
fseek(fp, 0, SEEK_END);
long len = ftell(fp);
fseek(fp, 0, SEEK_SET);
unsigned char* buf = new unsigned char[len];
fread(buf, 1, len, fp);

for(long offset=0; offset<len; )
{
if(2 != fread(stime, sizeof(int64_t), 2, fp))
long end = offset + 2*sizeof(int64_t);
if(end > len)
break;

//Read start time and duration
int64_t* stime = reinterpret_cast<int64_t*>(buf+offset);
offset = end;

//Read sample data
if(acap)
{
if(1 != fread(&f, sizeof(float), 1, fp))
LogError("fail to read sample\n");
acap->m_samples.push_back(AnalogSample(stime[0], stime[1], f));
end = offset + sizeof(float);
if(end > len)
break;
float* f = reinterpret_cast<float*>(buf+offset);
offset = end;

acap->m_samples.push_back(AnalogSample(stime[0], stime[1], *f));
}

else
{
if(1 != fread(&b, sizeof(bool), 1, fp))
LogError("fail to read sample\n");
dcap->m_samples.push_back(DigitalSample(stime[0], stime[1], b));
end = offset + sizeof(bool);
if(end > len)
break;
bool *b = reinterpret_cast<bool*>(buf+offset);
offset = end;

dcap->m_samples.push_back(DigitalSample(stime[0], stime[1], *b));
}
}

chan->SetData(cap);

delete[] buf;
fclose(fp);
}