repositories
/
TD_SE.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make some array initializations variable.
[TD_SE.git]
/
philosophe
/
philosophe.c
diff --git
a/philosophe/philosophe.c
b/philosophe/philosophe.c
index 72b740ed762370407ce8f6334fc0f9dc2b7ac04c..f7b5107623b5404a7c4bd424ee4030749caf179d 100644
(file)
--- a/
philosophe/philosophe.c
+++ b/
philosophe/philosophe.c
@@
-12,11
+12,11
@@
// fourchette droite du philosophe i
#define libre 1
#define occupe 0
// fourchette droite du philosophe i
#define libre 1
#define occupe 0
-
int fourch[N] = { libre, libre, libre, libre, libre }
;
+
static int fourch[N]
;
sem_t mutex;
sem_t mutex;
-void *philosophe(void *num)
+
static
void *philosophe(void *num)
{
int i = *(int *)num, nb = 2;
while (nb) {
{
int i = *(int *)num, nb = 2;
while (nb) {
@@
-42,7
+42,11
@@
void *philosophe(void *num)
int main()
{
int main()
{
- int i, NumPhi[N] = { 0, 1, 2, 3, 4 };
+ int i, NumPhi[N];
+ for (i = 0; i < N; i++)
+ NumPhi[i] = i;
+ for (i = 0; i < N; i++)
+ fourch[i] = libre;
pthread_t th[N];
sem_init(&mutex, 0, 1);
// création des N philosophes
pthread_t th[N];
sem_init(&mutex, 0, 1);
// création des N philosophes
@@
-51,6
+55,6
@@
int main()
// attendre la fin des threads
for (i = 0; i < N; i++)
pthread_join(th[i], NULL);
// attendre la fin des threads
for (i = 0; i < N; i++)
pthread_join(th[i], NULL);
- printf("fin des threads
\n");
+ printf("fin des threads\n");
return 0;
}
return 0;
}