marcel/gamemode
1
0
Fork 0
mirror of https://github.com/FeralInteractive/gamemode.git synced 2025-08-06 13:18:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add the timout to the call signature of run_external_process

Browse Source
This commit is contained in:
Marc Di Luzio
2019-02-21 20:27:41 +00:00
parent 4578af47ba
commit 53d1700a68
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/external-helper.c
View File

@@ -40,10 +40,12 @@ POSSIBILITY OF SUCH DAMAGE.
#include <time.h>
#include <unistd.h>
static const int default_timout = 5;
/**
* Call an external process
*/
int run_external_process(const char *const *exec_args, char buffer[EXTERNAL_BUFFER_MAX])
int run_external_process(const char *const *exec_args, char buffer[EXTERNAL_BUFFER_MAX], int tsec)
{
pid_t p;
int status = 0;
@@ -54,6 +56,11 @@ int run_external_process(const char *const *exec_args, char buffer[EXTERNAL_BUFF
return -1;
}
/* Set the default timeout */
if (tsec == -1) {
tsec = default_timout;
}
/* set up our signaling for the child and the timout */
sigset_t mask;
sigset_t omask;
@@ -88,7 +95,8 @@ int run_external_process(const char *const *exec_args, char buffer[EXTERNAL_BUFF
/* Set up the timout */
struct timespec timeout;
timeout.tv_sec = 5; /* Magic timeout value of 5s for now - should be sane for most commands */
timeout.tv_sec = tsec; /* Magic timeout value of 5s for now - should be sane for most commands
*/
timeout.tv_nsec = 0;
/* Wait for the child to finish up with a timout */