diff --git a/.gitignore b/.gitignore index 80ccb77..f300b53 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ Makefile *.exe *.out *.app +./sensor_network # IDE-spezifische Dateien .vscode/ diff --git a/README.md b/README.md index 4653416..a5689b8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -### Erklärung der Praktikumsaufgabe (Synchronisation) +/* ### Erklärung der Praktikumsaufgabe (Synchronisation) #### **Kernziel der Aufgabe** Sie sollen ein **multithreaded Sensornetzwerk** simulieren, das drei Komponenten umfasst: @@ -151,4 +151,5 @@ Starten Sie das System mit verschiedenen Parametern und beobachten Sie: Mit dieser Struktur erfüllen Sie alle Lernziele: ✅ Reader-Writer-Problem ✅ Producer-Consumer-Pattern -✅ Vermeidung von Race Conditions & Deadlocks! \ No newline at end of file +✅ Vermeidung von Race Conditions & Deadlocks! +*/ \ No newline at end of file diff --git a/analysis_model.h b/analysis_model.h index 111ddbe..d901b8a 100644 --- a/analysis_model.h +++ b/analysis_model.h @@ -3,8 +3,8 @@ #include class AnalysisModel { - int value = 0; - int reader_count = 0; + int value = 0; + int reader_count = 0; std::mutex model_mutex; std::mutex count_mutex; diff --git a/ring_buffer.h b/ring_buffer.h index fc94a85..1bdfb0a 100644 --- a/ring_buffer.h +++ b/ring_buffer.h @@ -12,7 +12,7 @@ private: std::vector data; size_t read_ptr = 0; size_t write_ptr = 0; - bool full = false; + bool full = false; std::mutex mtx; std::condition_variable not_empty; diff --git a/sensor_network b/sensor_network deleted file mode 100755 index e01a289..0000000 Binary files a/sensor_network and /dev/null differ diff --git a/sensor_network.cpp b/sensor_network.cpp index 65b5247..62af088 100644 --- a/sensor_network.cpp +++ b/sensor_network.cpp @@ -44,7 +44,7 @@ void SensorNetwork::sensor_thread(int id) { std::random_device rd; std::mt19937 gen(rd()); std::uniform_int_distribution<> data_gen(0, 100); - std::uniform_int_distribution<> sleep_gen(100, 500); + std::uniform_int_distribution<> sleep_gen(100, 500); while(running) { std::this_thread::sleep_for( diff --git a/sensor_network.h b/sensor_network.h index 468af5f..8f54024 100644 --- a/sensor_network.h +++ b/sensor_network.h @@ -8,7 +8,7 @@ template class SensorNetwork { RingBuffer buffer; - AnalysisModel model; + AnalysisModel model; std::atomic running{false}; std::vector sensors;