← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: lbieber
  • Date: 2010-08-07 03:42:13 UTC
  • mfrom: (1691 staging)
  • mto: (1684.7.3 test-1)
  • mto: This revision was merged to the branch mainline in revision 1694.
  • Revision ID: lbieber@orisndriz03-20100807034213-f3n7wyvq26bkhuwq
Merge Brian - Convert LOCK_global_system_variables to boost

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
29
29
#include <limits.h>
30
30
 
31
31
#include <boost/program_options.hpp>
 
32
#include <boost/thread/recursive_mutex.hpp>
 
33
#include <boost/thread/mutex.hpp>
32
34
 
33
35
#include "drizzled/internal/my_sys.h"
34
36
#include "drizzled/internal/my_bit.h"
335
337
pthread_mutex_t LOCK_thread_count;
336
338
pthread_mutex_t LOCK_status;
337
339
pthread_mutex_t LOCK_global_read_lock;
338
 
pthread_mutex_t LOCK_global_system_variables;
 
340
boost::recursive_mutex LOCK_global_system_variables;
339
341
 
340
342
pthread_cond_t COND_refresh, COND_thread_count, COND_global_read_lock;
341
343
pthread_t signal_thread;
539
541
  (void) pthread_mutex_destroy(&LOCK_open);
540
542
  (void) pthread_mutex_destroy(&LOCK_thread_count);
541
543
  (void) pthread_mutex_destroy(&LOCK_status);
542
 
  (void) pthread_mutex_destroy(&LOCK_global_system_variables);
543
544
  (void) pthread_mutex_destroy(&LOCK_global_read_lock);
544
545
  (void) pthread_cond_destroy(&COND_thread_count);
545
546
  (void) pthread_cond_destroy(&COND_server_end);
809
810
 
810
811
  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); 
811
812
  (void) pthread_mutex_init(&LOCK_thread_count, &attr);
812
 
  (void) pthread_mutex_init(&LOCK_global_system_variables, &attr);
813
813
 
814
814
  (void) pthread_mutex_init(&LOCK_status, MY_MUTEX_INIT_FAST);
815
815
  (void) pthread_mutex_init(&LOCK_global_read_lock, MY_MUTEX_INIT_FAST);