TD1: Initial commit of exercice 3 code.

Proper locking will be done later on.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/TD1/exo3/BufferCirc.java b/TD1/exo3/BufferCirc.java
new file mode 100644 (file)
index 0000000..71204cc
--- /dev/null
+++ b/TD1/exo3/BufferCirc.java
@@ -0,0 +1,57 @@
+\r
+\r
+/**\r
+ * implementation du producteur consommateur avec un buffer circulaire\r
+ */\r
+public class BufferCirc {\r
+\r
+       private Object[] tampon;\r
+       private int taille;\r
+       private int prem, der, nbObj;\r
+\r
+\r
+       public BufferCirc (int t) {\r
+               taille = t;\r
+               tampon = new Object[taille];\r
+               prem = 0;\r
+               der = 0;\r
+               nbObj = 0;\r
+       }\r
+\r
+\r
+       public boolean isEmpty() {\r
+               return nbObj == 0;\r
+       }\r
+\r
+\r
+       public boolean isFull() {\r
+               return nbObj == taille;\r
+       }\r
+\r
+\r
+       public synchronized void depose(Object obj) {\r
+               if (!isFull()) {\r
+                       nbObj++;\r
+                       tampon[prem] = obj;\r
+                       prem = (prem + 1) % taille;\r
+                       System.out.println(Thread.currentThread().getName() + " a depose " + (Integer)obj);\r
+               } else {\r
+                       System.out.println("Buffer plein pour " + Thread.currentThread().getName());\r
+               }\r
+       }\r
+\r
+\r
+       public synchronized Object preleve() {\r
+               Object outObj = null;\r
+               if (isEmpty()) {\r
+                       nbObj--;\r
+                       outObj = tampon[der];\r
+                       der = (der + 1) % taille;\r
+                       System.out.println(Thread.currentThread().getName() + " a preleve " + (Integer)outObj);\r
+               } else {\r
+                       System.out.println("Buffer vide pour " + Thread.currentThread().getName());\r
+               }\r
+               return outObj;\r
+       }\r
+\r
+} // fin class BufferCirc\r

diff --git a/TD1/exo3/Consommateur.java b/TD1/exo3/Consommateur.java
new file mode 100644 (file)
index 0000000..5a54881
--- /dev/null
+++ b/TD1/exo3/Consommateur.java
@@ -0,0 +1,25 @@
+\r
+\r
+public class Consommateur implements Runnable {\r
+\r
+       private BufferCirc buffer;\r
+\r
+\r
+       public Consommateur(BufferCirc b) {\r
+               buffer = b;\r
+       }\r
+\r
+\r
+       public void run() {\r
+               Integer val;\r
+               while (true) {\r
+                       val = (Integer)buffer.preleve();\r
+                       System.out.println (Thread.currentThread().getName() + " a preleve " + val);\r
+                       try {\r
+                               Thread.sleep((int)(Math.random()*1000));\r
+                       }\r
+                       catch (InterruptedException e) {}\r
+               }\r
+       }\r
+\r
+} // fin classe Consommateur\r

diff --git a/TD1/exo3/Main.java b/TD1/exo3/Main.java
new file mode 100644 (file)
index 0000000..929534c
--- /dev/null
+++ b/TD1/exo3/Main.java
@@ -0,0 +1,20 @@
+\r
+import java.util.ArrayList;\r
+\r
+\r
+public class Main {\r
+\r
+\r
+       public static void main (String[] args) {\r
+               BufferCirc b = new BufferCirc(20);\r
+               Producteur p = new Producteur(b);\r
+               Consommateur c = new Consommateur(b);\r
+               Thread P1 = new Thread(p);\r
+               P1.setName("P1");\r
+               Thread C1 = new Thread(c);\r
+               C1.setName("C1");\r
+               P1.start();\r
+               C1.start();\r
+       }\r
+\r
+}\r

diff --git a/TD1/exo3/Makefile b/TD1/exo3/Makefile
new file mode 100644 (file)
index 0000000..c636449
--- /dev/null
+++ b/TD1/exo3/Makefile
@@ -0,0 +1,92 @@
+# define compiler and compiler flag variables
+# define a variable for compiler flags (JFLAGS)
+# define a variable for the compiler (JC)
+# define a variable for the Java Virtual Machine (JVM)
+
+JFLAGS = -g
+JC = javac
+JVM = java
+
+#
+# Clear any default targets for building .class files from .java files; we
+# will provide our own target entry to do this in this makefile.
+# make has a set of default targets for different suffixes (like .c.o)
+# Currently, clearing the default for .java.class is not necessary since
+# make does not have a definition for this target, but later versions of
+# make may, so it doesn't hurt to make sure that we clear any default
+# definitions for these
+#
+
+.SUFFIXES: .java .class
+
+
+#
+# Here is our target entry for creating .class files from .java files
+# This is a target entry that uses the suffix rule syntax:
+#      DSTS:
+#              rule
+# DSTS (Dependency Suffix     Target Suffix)
+# 'TS' is the suffix of the target file, 'DS' is the suffix of the dependency
+#  file, and 'rule'  is the rule for building a target
+# '$*' is a built-in macro that gets the basename of the current target
+# Remember that there must be a < tab > before the command line ('rule')
+#
+
+.java.class:
+       $(JC) $(JFLAGS) $*.java
+
+
+#
+# CLASSES is a macro consisting of N words (one for each java source file)
+# When a single line is too long, use \<return> to split lines that then will be
+# considered as a single line. For example:
+# NAME = Camilo \
+         Juan
+# is understood as
+# NAME = Camilo        Juan
+
+CLASSES = \
+               BufferCirc.java \
+               Producteur.java \
+               Consommateur.java \
+               Main.java
+
+#
+# MAIN is a variable with the name of the file containing the main method
+#
+
+MAIN = Main
+
+#
+# the default make target entry
+# for this example it is the target classes
+
+default: classes
+
+
+# Next line is a target dependency line
+# This target entry uses Suffix Replacement within a macro:
+# $(macroname:string1=string2)
+# In the words in the macro named 'macroname' replace 'string1' with 'string2'
+# Below we are replacing the suffix .java of all words in the macro CLASSES
+# with the .class suffix
+#
+
+classes: $(CLASSES:.java=.class)
+
+
+# Next two lines contain a target for running the program
+# Remember the tab in the second line.
+# $(JMV) y $(MAIN) are replaced by their values
+
+run: $(MAIN).class
+       $(JVM) $(MAIN)
+
+# this line is to remove all unneeded files from
+# the directory when we are finished executing(saves space)
+# and "cleans up" the directory of unneeded .class files
+# RM is a predefined macro in make (RM = rm -f)
+#
+
+clean:
+       $(RM) *.class

diff --git a/TD1/exo3/Producteur.java b/TD1/exo3/Producteur.java
new file mode 100644 (file)
index 0000000..10eab6d
--- /dev/null
+++ b/TD1/exo3/Producteur.java
@@ -0,0 +1,26 @@
+\r
+\r
+public class Producteur implements Runnable {\r
+\r
+       private BufferCirc buffer;\r
+       private int val;\r
+\r
+\r
+       public Producteur(BufferCirc b) {\r
+               buffer = b;\r
+       }\r
+\r
+\r
+       public void run() {\r
+               while (true) {\r
+                       buffer.depose(new Integer(val));\r
+                       System.out.println (Thread.currentThread().getName() +  " a depose " + val);\r
+                       val++;\r
+                       try {\r
+                               Thread.sleep((int)(Math.random()*100));\r
+                       }\r
+                       catch (InterruptedException e) {}\r
+               }\r
+       }\r
+\r
+} // fin classe Producteur\r