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

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

Browse Source 
There is a function, `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 function in question is called `philosopher_fork()`.

Signed-off-by: Chris Friedt <cfriedt@tenstorrent.com>
This commit is contained in:
Chris Friedt
2025-10-29 11:06:15 -04:00
committed by Chris Friedt
parent ec84b80981
commit 8864ac4c1c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/posix/philosophers/src/main.c
View File

@@ -11,6 +11,7 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <zephyr/sys/util.h>
#include <zephyr/logging/log.h>
@@ -47,7 +48,7 @@ static inline void fork_init(fork_t frk)
}
}
static inline fork_t fork(size_t idx)
static inline fork_t philosopher_fork(size_t idx)
{
return &forks[idx];
}
@@ -148,11 +149,11 @@ static void *philosopher(void *arg)
/* Djkstra'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) {
@@ -204,7 +205,7 @@ static void init_objects(void)
{
ARRAY_FOR_EACH(forks, i) {
LOG_DBG("Initializing fork %zu", i);
fork_init(fork(i));
fork_init(philosopher_fork(i));
}
}