MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename Process internal opaque type to match naming coventions

Browse Source
This commit is contained in:
moe li 2026-05-26 12:50:12 +08:00
parent b58608043d
commit 81712a891d
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/raylib.h
View File

@ -961,10 +961,14 @@ typedef enum {
NPATCH_THREE_PATCH_HORIZONTAL // Npatch layout: 3x1 tiles NPATCH_THREE_PATCH_HORIZONTAL // Npatch layout: 3x1 tiles
} NPatchLayout; } NPatchLayout;
// Opaque structs declaration for Process
// NOTE: actual definition in rcore.c
typedef struct rProcessData rProcessData;
// Process resources // Process resources
typedef struct Process { typedef struct Process {
int pid; // Process unique identifier int pid; // Process unique identifier
struct ProcessInternal *internal; // Platform-specific process data rProcessData *processData; // Platform-specific process data
} Process; } Process;
// Process state // Process state

53
src/rcore.c
View File

@ -4297,7 +4297,7 @@ int GetTouchPointCount(void)
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
#if defined(_WIN32) #if defined(_WIN32)
struct ProcessInternal { struct rProcessData {
void *pipeStdoutRead; // Process stdout and stderr read pipe void *pipeStdoutRead; // Process stdout and stderr read pipe
void *pipeStdinWrite; // Process stdin write pipe void *pipeStdinWrite; // Process stdin write pipe
}; };
@ -4316,7 +4316,7 @@ static void CloseAllPipesWindows(void** pipes, int count) {
} }
} }
#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
struct ProcessInternal { struct rProcessData {
int pipefdStdout[2]; // Process stdout and stderr pipe file descriptors int pipefdStdout[2]; // Process stdout and stderr pipe file descriptors
int pipefdStdin[2]; // Process stdin pipe file descriptors int pipefdStdin[2]; // Process stdin pipe file descriptors
}; };
@ -4390,9 +4390,9 @@ RLAPI Process InitProcess(const char *command, char *const args[])
CloseHandle(pi.hThread); CloseHandle(pi.hThread);
CloseHandle(pi.hProcess); CloseHandle(pi.hProcess);
process.internal = (struct ProcessInternal *)RL_MALLOC(sizeof(struct ProcessInternal)); process.processData = (rProcessData *)RL_MALLOC(sizeof(rProcessData));
process.internal->pipeStdoutRead = pipeStdoutRead; process.processData->pipeStdoutRead = pipeStdoutRead;
process.internal->pipeStdinWrite = pipeStdinWrite; process.processData->pipeStdinWrite = pipeStdinWrite;
// Free parent process handles // Free parent process handles
CloseHandle(pipeStdoutWrite); CloseHandle(pipeStdoutWrite);
@ -4416,9 +4416,9 @@ RLAPI Process InitProcess(const char *command, char *const args[])
return process; return process;
} }
process.internal = (struct ProcessInternal *)RL_MALLOC(sizeof(struct ProcessInternal)); process.processData = (rProcessData *)RL_MALLOC(sizeof(rProcessData));
memcpy(process.internal->pipefdStdout, &pipefd[0], sizeof(int) * 2); memcpy(process.processData->pipefdStdout, &pipefd[0], sizeof(int) * 2);
memcpy(process.internal->pipefdStdin, &pipefd[2], sizeof(int) * 2); memcpy(process.processData->pipefdStdin, &pipefd[2], sizeof(int) * 2);
pid_t pid = fork(); pid_t pid = fork();
@ -4426,7 +4426,7 @@ RLAPI Process InitProcess(const char *command, char *const args[])
{ {
TRACELOG(LOG_WARNING, "PROCESS: Failed to create process"); TRACELOG(LOG_WARNING, "PROCESS: Failed to create process");
CloseAllPipesUnix(pipefd, 4); CloseAllPipesUnix(pipefd, 4);
RL_FREE(process.internal); RL_FREE(process.processData);
return process; return process;
} }
else if (pid == 0) else if (pid == 0)
@ -4434,15 +4434,15 @@ RLAPI Process InitProcess(const char *command, char *const args[])
// Child process // Child process
// Close pipe read end, redirect stdout and stderr to pipe write end // Close pipe read end, redirect stdout and stderr to pipe write end
close(process.internal->pipefdStdout[0]); close(process.processData->pipefdStdout[0]);
dup2(process.internal->pipefdStdout[1], STDOUT_FILENO); dup2(process.processData->pipefdStdout[1], STDOUT_FILENO);
dup2(process.internal->pipefdStdout[1], STDERR_FILENO); dup2(process.processData->pipefdStdout[1], STDERR_FILENO);
close(process.internal->pipefdStdout[1]); close(process.processData->pipefdStdout[1]);
// Close pipe write end, redirect stdin to pipe read end // Close pipe write end, redirect stdin to pipe read end
close(process.internal->pipefdStdin[1]); close(process.processData->pipefdStdin[1]);
dup2(process.internal->pipefdStdin[0], STDIN_FILENO); dup2(process.processData->pipefdStdin[0], STDIN_FILENO);
close(process.internal->pipefdStdin[0]); close(process.processData->pipefdStdin[0]);
// Execute command // Execute command
execvp(command, args); execvp(command, args);
@ -4456,8 +4456,8 @@ RLAPI Process InitProcess(const char *command, char *const args[])
process.pid = pid; process.pid = pid;
// Close stdout pipe write end and stdin pipe read end // Close stdout pipe write end and stdin pipe read end
close(process.internal->pipefdStdout[1]); close(process.processData->pipefdStdout[1]);
close(process.internal->pipefdStdin[0]); close(process.processData->pipefdStdin[0]);
} }
return process; return process;
@ -4620,11 +4620,10 @@ RLAPI const char *ReadProcessOutput(Process process, int *length)
#if defined(_WIN32) #if defined(_WIN32)
// Read from output pipe // Read from output pipe
// NOTE: This will read whatever in the pipe buffer
// ReadFile will block if there is no data, so call PeekNamedPipe to check for data before reading // ReadFile will block if there is no data, so call PeekNamedPipe to check for data before reading
unsigned long bytesAvail = 0; unsigned long bytesAvail = 0;
if ((!PeekNamedPipe(process.internal->pipeStdoutRead, NULL, 0, NULL, &bytesAvail, NULL)) || if ((!PeekNamedPipe(process.processData->pipeStdoutRead, NULL, 0, NULL, &bytesAvail, NULL)) ||
(bytesAvail == 0)) (bytesAvail == 0))
{ {
*length = 0; *length = 0;
@ -4632,7 +4631,7 @@ RLAPI const char *ReadProcessOutput(Process process, int *length)
} }
unsigned long bytesRead = 0; unsigned long bytesRead = 0;
if (!ReadFile(process.internal->pipeStdoutRead, output, sizeof(output), &bytesRead, NULL)) if (!ReadFile(process.processData->pipeStdoutRead, output, sizeof(output), &bytesRead, NULL))
{ {
*length = 0; *length = 0;
return NULL; return NULL;
@ -4642,14 +4641,14 @@ RLAPI const char *ReadProcessOutput(Process process, int *length)
return output; return output;
#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
struct pollfd fds[1]; struct pollfd fds[1];
fds[0].fd = process.internal->pipefdStdout[0]; fds[0].fd = process.processData->pipefdStdout[0];
fds[0].events = POLLIN; fds[0].events = POLLIN;
// No timeout, just check if there is data to read // No timeout, just check if there is data to read
int pollResult = poll(fds, 1, 0); int pollResult = poll(fds, 1, 0);
if ((pollResult > 0) && (fds[0].revents & POLLIN)) if ((pollResult > 0) && (fds[0].revents & POLLIN))
{ {
ssize_t bytesRead = read(process.internal->pipefdStdout[0], output, sizeof(output)); ssize_t bytesRead = read(process.processData->pipefdStdout[0], output, sizeof(output));
if (bytesRead > 0) if (bytesRead > 0)
{ {
*length = (int)bytesRead; *length = (int)bytesRead;
@ -4787,10 +4786,10 @@ RLAPI void CloseProcess(Process process)
CloseHandle(hProcess); CloseHandle(hProcess);
// Clean up pipes // Clean up pipes
void *pipes[] = { process.internal->pipeStdoutRead, process.internal->pipeStdinWrite }; void *pipes[] = { process.processData->pipeStdoutRead, process.processData->pipeStdinWrite };
CloseAllPipesWindows(pipes, sizeof(pipes) / sizeof(pipes[0])); CloseAllPipesWindows(pipes, sizeof(pipes) / sizeof(pipes[0]));
RL_FREE(process.internal); RL_FREE(process.processData);
#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
// If process is not running or not found, nothing to do // If process is not running or not found, nothing to do
@ -4814,9 +4813,9 @@ RLAPI void CloseProcess(Process process)
// Wait process termination // Wait process termination
waitpid(process.pid, NULL, 0); waitpid(process.pid, NULL, 0);
int pipefd[2] = { process.internal->pipefdStdout[0], process.internal->pipefdStdin[1] }; int pipefd[2] = { process.processData->pipefdStdout[0], process.processData->pipefdStdin[1] };
CloseAllPipesUnix(pipefd, 2); CloseAllPipesUnix(pipefd, 2);
RL_FREE(process.internal); RL_FREE(process.processData);
#else #else
TRACELOG(LOG_WARNING, "PROCESS: Process management not supported on this platform"); TRACELOG(LOG_WARNING, "PROCESS: Process management not supported on this platform");
#endif #endif