Merge pull request #538 from myjimmy/bugfix/web-ui-freeze

Fix - Web UI freezes under high CPU load

server/bc-server.cpp

@@ -587,13 +587,11 @@ const char *select_best_path(void)
 
 size_t bc_get_media_locations(bc_string_array &locations)
 {
-	pthread_rwlock_rdlock(&media_lock);
 	struct bc_storage *p;
 
 	for (p = media_stor; p < media_stor+MAX_STOR_LOCS && p->max_thresh; p++)
 		locations.push_back(std::string(p->path));
 
-	pthread_rwlock_unlock(&media_lock);
 	return locations.size();
 }
 
@@ -1094,8 +1092,6 @@ static int bc_cleanup_media()
 
 static int bc_check_media(void)
 {
-	pthread_rwlock_rdlock(&media_lock);
-
 	int ret = 0;
 	bool storage_overloaded = true;
 
@@ -1110,8 +1106,6 @@ static int bc_check_media(void)
 	if (storage_overloaded || is_media_max_age_exceeded())
 		ret = bc_cleanup_media();
 
-	pthread_rwlock_unlock(&media_lock);
-
 	return ret;
 }
 
@@ -1727,5 +1721,7 @@ int main(int argc, char **argv)
 	bc_db_close();
 	bc_ffmpeg_teardown();
 
+	pthread_rwlock_destroy(&media_lock);
+
 	return 0;
 }

server/bc-thread.cpp

@@ -167,6 +167,19 @@ void bc_record::notify_device_state(const char *state)
 	exit(1);
 }
 
+void msleep(int duration) {
+
+    /* Split milliseconds into equivalent seconds + nanoseconds */
+    struct timespec sleep_period = {
+        .tv_sec  =  duration / 1000,
+        .tv_nsec = (duration % 1000) * 1000000
+    };
+
+    /* Sleep for specified interval */
+    nanosleep(&sleep_period, NULL);
+
+}
+
 void bc_record::run()
 {
 	stream_packet packet;
@@ -189,6 +202,7 @@ void bc_record::run()
 		pthread_mutex_unlock(&cfg_mutex);
 		if (local_thread_should_die)
 			break;
+
 		if (local_cfg_dirty) {
 			if (apply_device_cfg(this))
 				break;
@@ -410,6 +424,7 @@ void bc_record::run()
 				}
 			}
 
+			msleep(10);
 			continue;
 		}
 
@@ -429,6 +444,7 @@ void bc_record::run()
 			}
 		}
 
+		msleep(10);
 		continue;
 error:
 		sleep(10);
@@ -529,7 +545,6 @@ bc_record *bc_record::create_from_db(int id, BC_DB_RES dbres)
 	bc_rec->update_motion_thresholds();
 	check_schedule(bc_rec);
 
-
 	/* The following operations are effective only for some V4L2 devices */
 	ret  = bc->input->set_control(V4L2_CID_HUE, bc_rec->cfg.hue);
 	ret |= bc->input->set_control(V4L2_CID_CONTRAST, bc_rec->cfg.contrast);
@@ -543,7 +558,6 @@ bc_record *bc_record::create_from_db(int id, BC_DB_RES dbres)
 	if (ret)
 		bc_rec->log.log(Warning, "Failed to set H264 quantization, please update solo6x10 driver");
 
-
 	/* Start device processing thread */
 	if (pthread_create(&bc_rec->thread, NULL, bc_device_thread,
 			   bc_rec) != 0) {