Add philosophe course code without famine, fixed.

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

diff --git a/.gitignore b/.gitignore
index 18e9abd85750ae8f112baabaaed09e05de50e4b7..2090219a3118e54d104ded5b4e71f1a3cec8e508 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 TD3/exo2/monexec/monexec
 mem/mem
 philosophe/philosophe
+philosophe-famine/philosophe
 prodcons/prodcons
 rw/reader/reader
 rw/writer/writer

diff --git a/philosophe-famine/Makefile b/philosophe-famine/Makefile
new file mode 100644 (file)
index 0000000..4ca690e
--- /dev/null
+++ b/philosophe-famine/Makefile
@@ -0,0 +1,83 @@
+# Sample Makefile to build simple project.
+#
+# This Makefile expect all source files (.c) to be at the same level, in the
+# current working directory.
+#
+# It will automatically generate dependencies, compile all files, and produce a
+# binary using the provided name.
+#
+# Set BINARY_NAME to the name of the binary file to build.
+# Set BUILD_TYPE to either debug or release
+#
+# Automatic dependencies code from:
+# http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/#tldr
+BINARY_NAME=philosophe
+BUILD_TYPE=debug
+#BUILD_TYPE=release
+LDLIBS=-lpthread
+
+# ====================================
+# DO NOT CHANGE STUFF BEYOND THIS LINE
+# ====================================
+
+all: $(BINARY_NAME)
+
+CC=gcc
+LD=gcc
+
+WARN_FLAGS = -Wall -Wextra
+STD_FLAG = -std=c11
+
+ifeq ($(BUILD_TYPE),debug)
+BUILDDIR := .build/debug
+DEBUG_FLAG = -g
+DEBUG = 1
+STRIP_FLAG =
+OPTI_FLAG = -O0
+else
+BUILDDIR := .build/release
+DEBUG_FLAG =
+DEBUG = 0
+STRIP_FLAG = -s
+OPTI_FLAG = -O3
+endif
+
+CFLAGS := -DDEBUG=$(DEBUG) $(CFLAGS) $(WARN_FLAGS) $(STD_FLAG) $(OPTI_FLAG) $(DEBUG_FLAG)
+LDFLAGS := $(LDFLAGS) $(STRIP_FLAG)
+
+OBJDIR := $(BUILDDIR)/objs
+$(shell mkdir -p $(OBJDIR))
+
+SRCS=$(wildcard *.c)
+OBJS=$(patsubst %.c,$(OBJDIR)/%.o,$(SRCS))
+
+DEPDIR := $(BUILDDIR)/deps
+$(shell mkdir -p $(DEPDIR))
+DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Td
+POSTCOMPILE = mv -f $(DEPDIR)/$*.Td $(DEPDIR)/$*.d
+
+$(BINARY_NAME): $(OBJS)
+       @echo "[LD ] $@"
+       @$(LD) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
+
+$(OBJDIR)/%.o: %.c $(DEPDIR)/%.d
+       @echo "[C  ] $*"
+       @$(CC) $(DEPFLAGS) $(CFLAGS) -c $< -o $@
+       @$(POSTCOMPILE)
+
+$(DEPDIR)/%.d: ;
+
+.PRECIOUS: $(DEPDIR)/%.d
+
+include $(wildcard $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRCS))))
+
+clean:
+       @echo "[CLN]"
+       -@rm -r $(BUILDDIR)
+       -@rm $(BINARY_NAME)
+
+disassemble: $(BINARY_NAME)
+       objdump -d $< | less
+
+symbols: $(BINARY_NAME)
+       objdump -t $< | sort | less

diff --git a/philosophe-famine/philosophe.c b/philosophe-famine/philosophe.c
new file mode 100644 (file)
index 0000000..69e1fe8
--- /dev/null
+++ b/philosophe-famine/philosophe.c
@@ -0,0 +1,78 @@
+// programme philosophe.c
+#include <stdio.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <semaphore.h>
+
+#define N 5
+// nombre de philosophes
+#define G (i + 1) % N
+// fourchette gauche du philosophe i
+#define D i
+// fourchette droite du philosophe i
+
+#define penser 0
+#define faim 1
+#define manger 2
+static int phiState[N] = { penser };
+
+sem_t mutex;
+sem_t semPhil[N];
+
+void test(int i)
+{
+       if (phiState[i] == faim && phiState[G] != manger
+           && phiState[D] != manger) {
+               phiState[i] = manger;
+               sem_post(&semPhil[i]);
+       }
+}
+
+void *philosophe(void *num)
+{
+       int i = *(int *)num, nb = 2;
+       while (nb) {
+               /* penser */
+               sem_wait(&mutex);
+               phiState[i] = penser;
+               sem_post(&mutex);
+               sleep(1);
+               /* essayer de manger */
+               sem_wait(&mutex);
+               phiState[i] = faim;
+               test(i);
+               sem_post(&mutex);
+               /* attendre son tour */
+               sem_wait(&semPhil[i]);
+               /* à nous de manger */
+               printf("philosophe[%d] mange\n", i);
+               sleep(1);
+               printf("philosophe[%d] a fini\n", i);
+               /* laisser manger ses voisins */
+               sem_wait(&mutex);
+               phiState[i] = penser;
+               test(G);
+               test(D);
+               sem_post(&mutex);
+               nb--;
+       }
+       return NULL;
+}
+
+int main()
+{
+       int i, NumPhi[N] = { 0, 1, 2, 3, 4 };
+       pthread_t th[N];
+       sem_init(&mutex, 0, 1);
+       for (int i = 0; i < N; i++) {
+               sem_init(&semPhil[i], 0, 1);
+       }
+       // création des N philosophes
+       for (i = 0; i < N; i++)
+               pthread_create(&th[i], NULL, philosophe, &NumPhi[i]);
+       // attendre la fin des threads
+       for (i = 0; i < N; i++)
+               pthread_join(th[i], NULL);
+       printf("fin des threads\n");
+       return 0;
+}