michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

samples: philosophers: rename 'fork' to avoid POSIX conflict

Browse Source 
There is a macro, `fork()`, inside of the philosophers example that
conflicts with the POSIX `fork()` function.

Since it is customary to avoid using reserved names, adjust the sample
so that the macro in question is called `philosopher_fork()`.

Signed-off-by: Chris Friedt <cfriedt@tenstorrent.com>
This commit is contained in:
Chris Friedt
2025-10-29 12:57:39 -04:00
committed by Chris Friedt
parent 63868e4301
commit f6eb86fe6f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/philosophers/src/main.c
View File

@@ -87,7 +87,7 @@
#include "phil_obj_abstract.h"
#define fork(x) (forks[x])
#define philosopher_fork(x) (forks[x])
static void set_phil_state_pos(int id)
{
@@ -149,11 +149,11 @@ void philosopher(void *id, void *unused1, void *unused2)
/* Dijkstra's solution: always pick up the lowest numbered fork first */
if (is_last_philosopher(my_id)) {
my_fork1 = fork(0);
my_fork2 = fork(my_id);
my_fork1 = philosopher_fork(0);
my_fork2 = philosopher_fork(my_id);
} else {
my_fork1 = fork(my_id);
my_fork2 = fork(my_id + 1);
my_fork1 = philosopher_fork(my_id);
my_fork2 = philosopher_fork(my_id + 1);
}
while (1) {
@@ -202,7 +202,7 @@ static void init_objects(void)
{
#if !STATIC_OBJS
for (int i = 0; i < NUM_PHIL; i++) {
fork_init(fork(i));
fork_init(philosopher_fork(i));
}
#endif
}
@@ -225,8 +225,8 @@ static void start_threads(void)
snprintk(tname, CONFIG_THREAD_MAX_NAME_LEN, "Philosopher %d", i);
k_thread_name_set(&threads[i], tname);
#endif /* CONFIG_THREAD_NAME */
k_object_access_grant(fork(i), &threads[i]);
k_object_access_grant(fork((i + 1) % NUM_PHIL), &threads[i]);
k_object_access_grant(philosopher_fork(i), &threads[i]);
k_object_access_grant(philosopher_fork((i + 1) % NUM_PHIL), &threads[i]);
k_thread_start(&threads[i]);
}