diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-08-13 01:22:27 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-08-13 01:22:27 +0300 |
| commit | 465e56b04641381fda9934b3557232f85f8af845 (patch) | |
| tree | 29f820e508d7dd701ca4962c9991b3b4b4ee02ba /innobase/os | |
| parent | 9a78f2fe0f2c37143bdb798cfcec38121d72be42 (diff) | |
| download | mariadb-git-465e56b04641381fda9934b3557232f85f8af845.tar.gz | |
os0thread.h, os0thread.c:
Fix a critical portability bug introduced in the Windows version
innobase/os/os0thread.c:
Fix a critical portability bug introduced in the Windows version
innobase/include/os0thread.h:
Fix a critical portability bug introduced in the Windows version
Diffstat (limited to 'innobase/os')
| -rw-r--r-- | innobase/os/os0thread.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c index 9eb80cdf826..d137014a6af 100644 --- a/innobase/os/os0thread.c +++ b/innobase/os/os0thread.c @@ -19,14 +19,14 @@ Created 9/8/1995 Heikki Tuuri #include "srv0srv.h" /******************************************************************* -Compares two threads or thread ids for equality */ +Compares two thread ids for equality. */ ibool os_thread_eq( /*=========*/ /* out: TRUE if equal */ - os_thread_t a, /* in: OS thread or thread id */ - os_thread_t b) /* in: OS thread or thread id */ + os_thread_id_t a, /* in: OS thread or thread id */ + os_thread_id_t b) /* in: OS thread or thread id */ { #ifdef __WIN__ if (a == b) { @@ -44,13 +44,13 @@ os_thread_eq( } /******************************************************************** -Converts an OS thread or thread id to a ulint. It is NOT guaranteed that -the ulint is unique for the thread though! */ +Converts an OS thread id to a ulint. It is NOT guaranteed that the ulint is +unique for the thread though! */ ulint os_thread_pf( /*=========*/ - os_thread_t a) + os_thread_id_t a) { #ifdef UNIV_HPUX /* In HP-UX a pthread_t is a struct of 3 fields: field1, field2, @@ -64,15 +64,15 @@ os_thread_pf( /********************************************************************* Returns the thread identifier of current thread. Currently the thread -identifier is the thread handle itself. Note that in HP-UX pthread_t is -a struct of 3 fields. */ +identifier in Unix is the thread handle itself. Note that in HP-UX +pthread_t is a struct of 3 fields. */ os_thread_id_t os_thread_get_curr_id(void) /*=======================*/ { #ifdef __WIN__ - return(GetCurrentThread()); + return(GetCurrentThreadId()); #else return(pthread_self()); #endif @@ -95,10 +95,8 @@ os_thread_create( #endif void* arg, /* in: argument to start function */ - os_thread_id_t* thread_id) /* out: id of created - thread; currently this is - identical to the handle to - the thread */ + os_thread_id_t* thread_id) /* out: id of the created + thread */ { #ifdef __WIN__ os_thread_t thread; @@ -120,7 +118,7 @@ os_thread_create( ut_a(SetThreadPriority(thread, srv_query_thread_priority)); } - *thread_id = thread; + *thread_id = win_thread_id; return(thread); #else |