Merge pull request #30 from luxonis/data-packet-corruption-fix

SzabolcsGergely · web-flow · commit 17d0aaf92690 · 2020-06-12T02:20:27.000+03:00
guard spsc queue push with mutex since it's not thread safe
diff --git a/host/core/pipeline/host_pipeline.cpp b/host/core/pipeline/host_pipeline.cpp
@@ -47,11 +47,10 @@ void HostPipeline::onNewData(
             info.elem_size
             ));
 
+    std::unique_lock<std::mutex> guard(q_lock);
     if (!_data_queue_lf.push(host_data))
     {
-        std::unique_lock<std::mutex> guard(q_lock);
         _data_queue_lf.pop();
-        guard.unlock();
         if (!_data_queue_lf.push(host_data))
         {
             std::cerr << "Data queue is full " << info.name << ":\n";

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,10 @@ void HostPipeline::onNewData(`
`47`	`47`	`info.elem_size`
`48`	`48`	`));`
`49`	`49`
	`50`	`+ std::unique_lock<std::mutex> guard(q_lock);`
`50`	`51`	`if (!_data_queue_lf.push(host_data))`
`51`	`52`	`{`
`52`		`- std::unique_lock<std::mutex> guard(q_lock);`
`53`	`53`	`_data_queue_lf.pop();`
`54`		`- guard.unlock();`
`55`	`54`	`if (!_data_queue_lf.push(host_data))`
`56`	`55`	`{`
`57`	`56`	`std::cerr << "Data queue is full " << info.name << ":\n";`