GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix process creation on Linux

Browse Source 
Forked child process did not exit properly, sometimes causing scripting compilation to get stuck and never finish.
This commit is contained in:
Ari Vuollet
2023-01-28 19:46:09 +02:00
parent c1e0d70646
commit 2703401f08
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Platform/Linux/LinuxPlatform.cpp
View File

@@ -2802,6 +2802,7 @@ int32 LinuxProcess(const StringView& cmdLine, const StringView& workingDir, cons
{ {
close(fildes[0]); // close the reading end of the pipe close(fildes[0]); // close the reading end of the pipe
dup2(fildes[1], STDOUT_FILENO); // redirect stdout to pipe dup2(fildes[1], STDOUT_FILENO); // redirect stdout to pipe
close(fildes[1]);
dup2(STDOUT_FILENO, STDERR_FILENO); // redirect stderr to stdout dup2(STDOUT_FILENO, STDERR_FILENO); // redirect stderr to stdout
} }
@@ -2810,6 +2811,8 @@ int32 LinuxProcess(const StringView& cmdLine, const StringView& workingDir, cons
{ {
LOG(Warning, " failed, errno={}", errno); LOG(Warning, " failed, errno={}", errno);
} }
fflush(stdout);
_exit(1);
} }
else else
{ {
@@ -2822,7 +2825,7 @@ int32 LinuxProcess(const StringView& cmdLine, const StringView& workingDir, cons
{ {
char lineBuffer[1024]; char lineBuffer[1024];
close(fildes[1]); // close the writing end of the pipe close(fildes[1]); // close the writing end of the pipe
FILE *stdPipe = fdopen(fildes[0], "r"); FILE* stdPipe = fdopen(fildes[0], "r");
while (fgets(lineBuffer, sizeof(lineBuffer), stdPipe) != NULL) while (fgets(lineBuffer, sizeof(lineBuffer), stdPipe) != NULL)
{ {
char *p = lineBuffer + strlen(lineBuffer)-1; char *p = lineBuffer + strlen(lineBuffer)-1;
@@ -2857,6 +2860,7 @@ int32 LinuxProcess(const StringView& cmdLine, const StringView& workingDir, cons
returnCode = EPIPE; returnCode = EPIPE;
} }
} }
close(fildes[0]);
} }
} }