mturk 2002/07/16 10:27:21
Modified: jk/native2/server/isapi jk_iis_thread_pool.c
Log:
Make all thread function as void and use
ExitThread insted of return 0.
Revision Changes Path
1.3 +9 -7
jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c
Index: jk_iis_thread_pool.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_iis_thread_pool.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_iis_thread_pool.c 14 Jul 2002 13:41:36 -0000 1.2
+++ jk_iis_thread_pool.c 16 Jul 2002 17:27:21 -0000 1.3
@@ -112,7 +112,7 @@
/* Timeout for threads shutdown 2 minutes */
#define SHUTDOWN_TIMEOUT 120000
-DWORD WINAPI thread_pool_manager(void *p)
+VOID WINAPI thread_pool_manager(void *p)
{
ULONG n1, n2;
OVERLAPPED *pOverLapped;
@@ -137,10 +137,11 @@
work = TRUE;
}
}
- return 0;
+ /* Clean up and die. */
+ ExitThread(0);
}
-DWORD WINAPI thread_worker(void *p)
+VOID WINAPI thread_worker(void *p)
{
ULONG n1, n2;
OVERLAPPED *pOverLapped;
@@ -174,7 +175,8 @@
InterlockedDecrement(&thread->busy);
}
}
- return 0;
+ /* Clean up and die. */
+ ExitThread(0);
}
int jk2_iis_init_pool(jk_env_t *env)
@@ -211,7 +213,7 @@
/* Create the ThreadPool manager thread */
global_thread_pool.manager_thread = CreateThread(NULL,
0,
- thread_pool_manager,
+ (LPTHREAD_START_ROUTINE)thread_pool_manager,
NULL,
0,
&global_thread_pool.manager_id);
@@ -231,7 +233,7 @@
DWORD id;
global_thread_pool.handles[i] = CreateThread(NULL,
0,
- thread_worker,
+ (LPTHREAD_START_ROUTINE)thread_worker,
global_thread_pool.threads[i],
0,
&id);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
