diff options
| author | Rudolfs Kreicbergs <git-no-reply@zabbix.com> | 2011-06-13 13:27:10 +0400 |
|---|---|---|
| committer | Rudolfs Kreicbergs <git-no-reply@zabbix.com> | 2011-06-13 13:27:10 +0400 |
| commit | 82ceaef19d5a9daa6d5374bf37f74b8af07e0134 (patch) | |
| tree | 7f2889d733acc9c9e50a893b277f32bf194c8aa9 /include | |
| parent | f2c4803d07cf24c59ad7fb9ad2f1374fd9fea0b0 (diff) | |
- [ZBX-3519] fixed unterminated processes when system.run[,wait] times out and added proper output handling for system.run[,nowait] on UNIX
Diffstat (limited to 'include')
| -rw-r--r-- | include/threads.h | 6 | ||||
| -rw-r--r-- | include/zbxexec.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/threads.h b/include/threads.h index 0e46b26fdaf..82d4019b371 100644 --- a/include/threads.h +++ b/include/threads.h @@ -43,7 +43,7 @@ #define zbx_thread_kill(h) TerminateThread(h, SUCCEED); -#else /* not _WINDOWS */ +#else /* not _WINDOWS */ int zbx_fork(); @@ -66,7 +66,7 @@ #define zbx_thread_kill(h) kill(h, SIGTERM); -#endif /* _WINDOWS */ +#endif /* _WINDOWS */ typedef struct { @@ -80,4 +80,4 @@ int zbx_thread_wait(ZBX_THREAD_HANDLE thread); /* zbx_thread_exit(status) -- declared as define !!! */ long int zbx_get_thread_id(); -#endif /* ZABBIX_THREADS_H */ +#endif /* ZABBIX_THREADS_H */ diff --git a/include/zbxexec.h b/include/zbxexec.h index d870eff04d3..46bb0047c9c 100644 --- a/include/zbxexec.h +++ b/include/zbxexec.h @@ -21,5 +21,6 @@ #define ZABBIX_ZBXEXEC_H int zbx_execute(const char *command, char **buffer, char *error, size_t max_error_len, int timeout); +int zbx_execute_nowait(const char *command); -#endif /* ZABBIX_ZBXEXEC_H */ +#endif |