diff --git a/Aufgabe3/ConsoleApplication1/Consumer.cs b/Aufgabe3/ConsoleApplication1/Consumer.cs index d79fa9c26d8bc2b7f10ff7ae4964f229bff6df26..87b0d02af8197d25f22d3080292e6bfc9840f05c 100644 --- a/Aufgabe3/ConsoleApplication1/Consumer.cs +++ b/Aufgabe3/ConsoleApplication1/Consumer.cs @@ -39,17 +39,17 @@ namespace ConsoleApplication1 else { Thread.Sleep(_random.Next(500, 1500)); - Mutex m = _buffer.getMutex(); + Mutex m = _buffer.GetMutex(); m.WaitOne(); - if (_buffer.full()) + if (_buffer.Full()) { Producer.WakeUp(); } - if (!_buffer.empty()) + if (!_buffer.Empty()) { - Car c = _buffer.pop(); + Car c = _buffer.Pop(); Console.WriteLine("car pulled out of parking space. car id = " + c.getThisCarId()); } diff --git a/Aufgabe3/ConsoleApplication1/Producer.cs b/Aufgabe3/ConsoleApplication1/Producer.cs index e2a54b4e05ce638c60d2671bf86f04f4e1cf8721..f9ea5de69076eb8b23b599f2ff9ca302333a2022 100644 --- a/Aufgabe3/ConsoleApplication1/Producer.cs +++ b/Aufgabe3/ConsoleApplication1/Producer.cs @@ -41,18 +41,18 @@ namespace ConsoleApplication1 else { Thread.Sleep(_random.Next(500, 1500)); - Mutex m = _buffer.getMutex(); + Mutex m = _buffer.GetMutex(); m.WaitOne(); - if (_buffer.empty()) + if (_buffer.Empty()) { Consumer.WakeUp(); } - if (!_buffer.full()) + if (!_buffer.Full()) { Car c = new Car(); - _buffer.push(c); + _buffer.Push(c); Console.WriteLine("car " + c.getThisCarId() + " added"); } //if buffer is full: producers are set to sleep, own instance is set to sleep diff --git a/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.exe b/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.exe index 774de8d4f13bbf69d2c9d90bfab528e54ccd92be..1fe5394feeddf9a97268bbee4a3bac30e7dcb6e3 100644 Binary files a/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.exe and b/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.exe differ diff --git a/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.pdb b/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.pdb index cc3427a8e02ea48332d80d114b47b4b4aa19d210..dfb05576fd290f5d2e5f3dcc9cb7478d6744f54e 100644 Binary files a/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.pdb and b/Aufgabe3/ConsoleApplication1/bin/Debug/ConsoleApplication1.pdb differ diff --git a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.exe b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.exe index 774de8d4f13bbf69d2c9d90bfab528e54ccd92be..1fe5394feeddf9a97268bbee4a3bac30e7dcb6e3 100644 Binary files a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.exe and b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.exe differ diff --git a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.pdb b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.pdb index cc3427a8e02ea48332d80d114b47b4b4aa19d210..dfb05576fd290f5d2e5f3dcc9cb7478d6744f54e 100644 Binary files a/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.pdb and b/Aufgabe3/ConsoleApplication1/obj/Debug/ConsoleApplication1.pdb differ