Lock and remove on idle job

components/common/cpp/src/timer.cpp

@@ -61,12 +61,15 @@ static void waitTimePoint() {
 	}
 
 	// Still lots of time so do some idle jobs
+	{
+		UNIQUE_LOCK(mtx, lk);
 		auto idle_job = jobs[kTimerIdle10].begin();
 		while (idle_job != jobs[kTimerIdle10].end() && msdelay >= 10 && sincelast != mspf) {
 			(*idle_job++).job(now);
 			now = get_time();
 			msdelay = mspf - (now % mspf);
 		}
+	}
 
 	// Spin loop until exact grab time
 	//LOG(INFO) << "Spin Delay: " << (now / 40) << " = " << (40 - (now%40));

components/rgbd-sources/include/ftl/rgbd/streamer.hpp

@@ -130,6 +130,8 @@ class Streamer : public ftl::Configurable {
 	//int64_t last_dropped_;
 	//int drop_count_;
 
+	ftl::timer::TimerHandle timer_job_;
+
 	void _transmit(ftl::rgbd::FrameSet &);
 	void _cleanUp();
 	void _addClient(const std::string &source, int N, int rate, const ftl::UUID &peer, const std::string &dest);

components/rgbd-sources/src/streamer.cpp

@@ -125,6 +125,7 @@ Streamer::Streamer(nlohmann::json &config, Universe *net)
 }
 
 Streamer::~Streamer() {
+	timer_job_.cancel();
 	net_->unbind("find_stream");
 	net_->unbind("list_streams");
 	net_->unbind("source_calibration");
@@ -172,7 +173,7 @@ void Streamer::_addClient(const string &source, int N, int rate, const ftl::UUID
 		if (time_peer_ == ftl::UUID(0)) {
 			time_peer_ = peer;
 
-			ftl::timer::add(ftl::timer::kTimerIdle10, [peer,this](int id) {
+			timer_job_ = ftl::timer::add(ftl::timer::kTimerIdle10, [peer,this](int id) {
 				// Also do a time sync (but should be repeated periodically)
 				auto start = std::chrono::high_resolution_clock::now();
 				int64_t mastertime = net_->call<int64_t>(peer, "__ping__");