Skip to content

Commit de69124

Browse files
committed
Revert RecordThread to integrate file opening into run method
1 parent 5faccbc commit de69124

3 files changed

Lines changed: 10 additions & 18 deletions

File tree

Source/Processors/RecordNode/RecordNode.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,6 @@ void RecordNode::startRecording()
928928
}
929929

930930
recordThread->setFileComponents (rootFolder, experimentNumber, recordingNumber);
931-
recordThread->openFiles();
932931
recordThread->startThread (Thread::Priority::highest);
933932

934933
if (settingsNeeded)

Source/Processors/RecordNode/RecordThread.cpp

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,12 @@ void RecordThread::setFirstBlockFlag (bool state)
9696
this->notify();
9797
}
9898

99-
void RecordThread::openFiles()
99+
void RecordThread::run()
100100
{
101+
// Initialize counters
102+
spikesReceived = 0;
103+
spikesWritten = 0;
104+
101105
// Initialize per-channel sample numbers
102106
sampleNumbers.clear();
103107
for (int chan = 0; chan < m_numChannels; ++chan)
@@ -111,23 +115,15 @@ void RecordThread::openFiles()
111115
m_perStreamTimestampIdxs.resize (numStreams);
112116
m_perStreamSampleNumbers.resize (numStreams, 0);
113117

118+
// 1 - Open files
119+
bool closeEarly = false;
120+
m_cleanExit = false;
121+
Array<int64> initSampleNumbers;
122+
114123
m_engine->openFiles (m_rootFolder, m_experimentNumber, m_recordingNumber);
115124

116125
if (recordNode != nullptr)
117126
recordNode->notifyRecordThreadFilesOpened();
118-
}
119-
120-
void RecordThread::run()
121-
{
122-
// 1-Initialize counters
123-
spikesReceived = 0;
124-
spikesWritten = 0;
125-
126-
bool closeEarly = false;
127-
int numStreams = recordNode->getNumDataStreams();
128-
129-
m_cleanExit = false;
130-
Array<int64> initSampleNumbers;
131127

132128
//2-Wait until the first block has arrived, so we can align the timestamps
133129
bool isWaiting = false;

Source/Processors/RecordNode/RecordThread.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ class RecordThread : public Thread
7272
/** Sets the pointers to the data queues (one per stream), event queue, and spike queue */
7373
void setQueuePointers (OwnedArray<DataQueue>* dataQueues, EventMsgQueue* events, SpikeMsgQueue* spikes);
7474

75-
/** Opens files prior to starting recording */
76-
void openFiles();
77-
7875
/** Runs the thread */
7976
void run() override;
8077

0 commit comments

Comments
 (0)