← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_thr_init.cc

  • Committer: Monty Taylor
  • Date: 2009-08-17 18:46:08 UTC
  • mto: (1182.1.1 staging)
  • mto: This revision was merged to the branch mainline in revision 1183.
  • Revision ID: mordred@inaugust.com-20090817184608-0b2emowpjr9m6le7
"Fixed" the deadlock test. I'd still like someone to look at what's going on here.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_thr_init.cc
18
18
  thread variables.
19
19
*/
20
20
 
21
 
#include "config.h"
22
 
 
23
 
#include "drizzled/internal/my_sys.h"
24
 
#include "drizzled/internal/my_pthread.h"
25
 
#include "drizzled/internal/m_string.h"
26
 
 
27
 
#include <cstdio>
 
21
#include "mysys/mysys_priv.h"
 
22
#include <mysys/my_pthread.h>
 
23
#include <mystrings/m_string.h>
 
24
 
 
25
#include <stdio.h>
28
26
#include <signal.h>
29
27
 
30
28
#if TIME_WITH_SYS_TIME
38
36
# endif
39
37
#endif
40
38
 
41
 
namespace drizzled
42
 
{
43
 
namespace internal
44
 
{
45
 
 
46
39
uint32_t thd_lib_detected= 0;
47
40
 
48
41
pthread_key_t THR_KEY_mysys;
50
43
pthread_mutex_t THR_LOCK_threads;
51
44
pthread_cond_t  THR_COND_threads;
52
45
uint32_t            THR_thread_count= 0;
53
 
static uint32_t my_thread_end_wait_time= 5;
 
46
uint32_t                my_thread_end_wait_time= 5;
54
47
#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
55
48
pthread_mutexattr_t my_fast_mutexattr;
56
49
#endif
 
50
#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
 
51
pthread_mutexattr_t my_errorcheck_mutexattr;
 
52
#endif
 
53
 
57
54
 
58
55
static uint32_t get_thread_lib(void);
59
56
 
93
90
  pthread_mutexattr_settype(&my_fast_mutexattr,
94
91
                            PTHREAD_MUTEX_ADAPTIVE_NP);
95
92
#endif
 
93
#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
 
94
  /*
 
95
    Set mutex type to "errorcheck"
 
96
  */
 
97
  pthread_mutexattr_init(&my_errorcheck_mutexattr);
 
98
  pthread_mutexattr_settype(&my_errorcheck_mutexattr,
 
99
                            PTHREAD_MUTEX_ERRORCHECK);
 
100
#endif
96
101
 
97
102
  pthread_mutex_init(&THR_LOCK_lock,MY_MUTEX_INIT_FAST);
98
103
  pthread_mutex_init(&THR_LOCK_threads,MY_MUTEX_INIT_FAST);
138
143
#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
139
144
  pthread_mutexattr_destroy(&my_fast_mutexattr);
140
145
#endif
 
146
#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
 
147
  pthread_mutexattr_destroy(&my_errorcheck_mutexattr);
 
148
#endif
141
149
  pthread_mutex_destroy(&THR_LOCK_lock);
142
150
  if (all_threads_killed)
143
151
  {
146
154
  }
147
155
}
148
156
 
149
 
static uint64_t thread_id= 0;
 
157
static my_thread_id thread_id= 0;
150
158
 
151
159
/*
152
160
  Allocate thread specific memory for the thread, used by mysys
249
257
  return tmp;
250
258
}
251
259
 
 
260
 
 
261
/****************************************************************************
 
262
  Get name of current thread.
 
263
****************************************************************************/
 
264
 
 
265
my_thread_id my_thread_dbug_id()
 
266
{
 
267
  return my_thread_var->id;
 
268
}
 
269
 
252
270
static uint32_t get_thread_lib(void)
253
271
{
254
272
#ifdef _CS_GNU_LIBPTHREAD_VERSION
263
281
#endif
264
282
  return THD_LIB_OTHER;
265
283
}
266
 
 
267
 
} /* namespace internal */
268
 
} /* namespace drizzled */