Merge pull request #5 from djordje200179/master

Ispravke nekih zadataka
siwiki · Dec 10, 2022 · a8d925c · a8d925c
2 parents e9c75b0 + 8020bb3
commit a8d925c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/os2/2013/10/k1-sol.md b/os2/2013/10/k1-sol.md
@@ -62,7 +62,7 @@ monitor Mutex;
   var isLocked : boolean, 
       isFree : condition; 
  
-  procedure wait () 
+  procedure lock () 
   begin 
     if isLocked then isFree.wait(); 
     isLocked:=true; 

diff --git a/os2/2017/12/k1-sol.md b/os2/2017/12/k1-sol.md
@@ -179,14 +179,15 @@ public class RequestHandler extends Thread {
                                           throws InterruptedException { 
         synchronized (filesInUse) { 
             while (filesInUse.contains(fileName)) { 
-                wait(); 
+                filesInUse.wait(); 
             } 
             filesInUse.add(fileName); 
         } 
     } 
     private void finishWithFile(String fileName) { 
         synchronized (filesInUse) { 
             filesInUse.remove(fileName); 
+            filesInUse.notifyAll();
         } 
     } 
 } 

diff --git a/os2/2019/11/k1-sol.md b/os2/2019/11/k1-sol.md
@@ -124,18 +124,18 @@ public class RequestHandler extends Thread {
     public void run() { 
         Service service = new Service(client); 
         while(true) { 
-            // #<method>#arg0#...#[0]#[1]#...#[n - 1]# 
+            // <method>#arg0#...#[0]#[1]#...#[n - 1]
             String[] args = service.receiveMessage().split("#"); 
             if (args[0].equals("lock")) { 
                 lock(args); 
                 service.sendMessage("OK"); 
-            } else if (args[0].equals("lock")) { 
+            } else if (args[0].equals("unlock")) { 
                 unlock(args); 
                 service.sendMessage("OK"); 
-            } else if (args[0].equals("lock")) { 
+            } else if (args[0].equals("write")) { 
                 write(args); 
                 service.sendMessage("OK"); 
-            } else if (args[0].equals("lock")) { 
+            } else if (args[0].equals("read")) { 
                 service.sendMessage(read(args)); 
             } 
         } 

diff --git a/os2/2021/11/k1.md b/os2/2021/11/k1.md
@@ -60,7 +60,7 @@ private:
 };
 class BoundedBuffer {
 public:
-    BoundedBuffer() : numberInBuffer(0) {}
+    BoundedBuffer() : numberInBuffer(0), slotAvailable(&mutex), itemAvailable(&mutex) {}
     void put(Data* d);
     Data* get();
 private: