Rev 2071 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2071 | Rev 4227 | ||
---|---|---|---|
Line 67... | Line 67... | ||
67 | atomic_inc(&items_consumed); |
67 | atomic_inc(&items_consumed); |
68 | thread_usleep(500); |
68 | thread_usleep(500); |
69 | semaphore_up(&sem); |
69 | semaphore_up(&sem); |
70 | } |
70 | } |
71 | 71 | ||
72 | char * test_semaphore1(bool quiet) |
72 | char *test_semaphore1(void) |
73 | { |
73 | { |
74 | int i, j, k; |
74 | int i, j, k; |
75 | int consumers, producers; |
75 | int consumers, producers; |
76 | 76 | ||
77 | waitq_initialize(&can_start); |
77 | waitq_initialize(&can_start); |
Line 84... | Line 84... | ||
84 | atomic_set(&items_consumed, 0); |
84 | atomic_set(&items_consumed, 0); |
85 | 85 | ||
86 | consumers = i * CONSUMERS; |
86 | consumers = i * CONSUMERS; |
87 | producers = (4 - i) * PRODUCERS; |
87 | producers = (4 - i) * PRODUCERS; |
88 | 88 | ||
89 | printf("Creating %d consumers and %d producers...", consumers, producers); |
89 | TPRINTF("Creating %d consumers and %d producers...", consumers, producers); |
90 | 90 | ||
91 | for (j = 0; j < (CONSUMERS + PRODUCERS) / 2; j++) { |
91 | for (j = 0; j < (CONSUMERS + PRODUCERS) / 2; j++) { |
92 | for (k = 0; k < i; k++) { |
92 | for (k = 0; k < i; k++) { |
93 | thrd = thread_create(consumer, NULL, TASK, 0, "consumer", false); |
93 | thrd = thread_create(consumer, NULL, TASK, 0, "consumer", false); |
94 | if (thrd) |
94 | if (thrd) |
95 | thread_ready(thrd); |
95 | thread_ready(thrd); |
96 | else |
96 | else |
97 | printf("could not create consumer %d\n", i); |
97 | TPRINTF("could not create consumer %d\n", i); |
98 | } |
98 | } |
99 | for (k = 0; k < (4 - i); k++) { |
99 | for (k = 0; k < (4 - i); k++) { |
100 | thrd = thread_create(producer, NULL, TASK, 0, "producer", false); |
100 | thrd = thread_create(producer, NULL, TASK, 0, "producer", false); |
101 | if (thrd) |
101 | if (thrd) |
102 | thread_ready(thrd); |
102 | thread_ready(thrd); |
103 | else |
103 | else |
104 | printf("could not create producer %d\n", i); |
104 | TPRINTF("could not create producer %d\n", i); |
105 | } |
105 | } |
106 | } |
106 | } |
107 | 107 | ||
108 | printf("ok\n"); |
108 | TPRINTF("ok\n"); |
109 | 109 | ||
110 | thread_sleep(1); |
110 | thread_sleep(1); |
111 | waitq_wakeup(&can_start, WAKEUP_ALL); |
111 | waitq_wakeup(&can_start, WAKEUP_ALL); |
112 | 112 | ||
113 | while ((items_consumed.count != consumers) || (items_produced.count != producers)) { |
113 | while ((items_consumed.count != consumers) || (items_produced.count != producers)) { |
114 | printf("%d consumers remaining, %d producers remaining\n", consumers - items_consumed.count, producers - items_produced.count); |
114 | TPRINTF("%d consumers remaining, %d producers remaining\n", consumers - items_consumed.count, producers - items_produced.count); |
115 | thread_sleep(1); |
115 | thread_sleep(1); |
116 | } |
116 | } |
117 | } |
117 | } |
118 | 118 | ||
119 | return NULL; |
119 | return NULL; |