diff options
| author | Rudolfs Kreicbergs <git-no-reply@zabbix.com> | 2011-07-20 16:01:26 +0400 |
|---|---|---|
| committer | Rudolfs Kreicbergs <git-no-reply@zabbix.com> | 2011-07-20 16:01:26 +0400 |
| commit | eb001955c5e424384c969cd31861049a4c8114a7 (patch) | |
| tree | 376f714baf6d7f638120479480ef6758f79c2daa /include/threads.h | |
| parent | 6b916cad6b1ceb157408ca28b3a283839f5a3bf7 (diff) | |
- [ZBX-3902] fixed possible zombie states in UNIX, moved watchdog (server) and heartbeats (proxy) to separate processes (main process just waits), added more logging to exiting Windows agent
[Merged from 1.8 r20693]
Diffstat (limited to 'include/threads.h')
| -rw-r--r-- | include/threads.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/threads.h b/include/threads.h index 82d4019b371..7a65b3d0133 100644 --- a/include/threads.h +++ b/include/threads.h @@ -24,10 +24,10 @@ #if defined(_WINDOWS) - #define ZBX_THREAD_ERROR 0 + #define ZBX_THREAD_ERROR 0 - #define ZBX_THREAD_HANDLE HANDLE - #define ZBX_THREAD_HANDLE_NULL NULL + #define ZBX_THREAD_HANDLE HANDLE + #define ZBX_THREAD_HANDLE_NULL NULL #define ZBX_THREAD_ENTRY_POINTER(pointer_name) \ unsigned (__stdcall *pointer_name)(void *) @@ -46,11 +46,12 @@ #else /* not _WINDOWS */ int zbx_fork(); + int zbx_child_fork(); - #define ZBX_THREAD_ERROR (-1) + #define ZBX_THREAD_ERROR -1 - #define ZBX_THREAD_HANDLE pid_t - #define ZBX_THREAD_HANDLE_NULL 0 + #define ZBX_THREAD_HANDLE pid_t + #define ZBX_THREAD_HANDLE_NULL 0 #define ZBX_THREAD_ENTRY_POINTER(pointer_name) \ unsigned (* pointer_name)(void *) |