← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2008-12-05 19:17:37 UTC
  • Revision ID: brian@tangent.org-20081205191737-pp8u84pdz6dcp182
Part removal of my_pthread.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
438
438
                LOCK_active_mi,
439
439
                LOCK_connection_count;
440
440
 
441
 
rw_lock_t       LOCK_sys_init_connect, LOCK_sys_init_slave;
442
 
rw_lock_t       LOCK_system_variables_hash;
 
441
pthread_rwlock_t        LOCK_sys_init_connect;
 
442
pthread_rwlock_t        LOCK_sys_init_slave;
 
443
pthread_rwlock_t        LOCK_system_variables_hash;
443
444
pthread_cond_t COND_refresh, COND_thread_count, COND_global_read_lock;
444
445
pthread_t signal_thread;
445
446
pthread_attr_t connection_attrib;
782
783
  if (cleanup_done++)
783
784
    return; /* purecov: inspected */
784
785
 
785
 
  logger.cleanup_base();
786
 
 
787
786
  drizzle_bin_log.cleanup();
788
787
 
789
788
  if (use_slave_mask)
834
833
  // TODO!!!! EPIC FAIL!!!! This sefaults if uncommented.
835
834
/*  if (freeme != NULL)
836
835
    free(freeme);  */
837
 
  /* Tell main we are ready */
838
 
  logger.cleanup_end();
839
836
  (void) pthread_mutex_lock(&LOCK_thread_count);
840
837
  ready_to_exit=1;
841
838
  /* do the broadcast inside the lock to ensure that my_end() is not called */
879
876
  (void) pthread_mutex_destroy(&LOCK_error_log);
880
877
  (void) pthread_mutex_destroy(&LOCK_connection_count);
881
878
  (void) pthread_mutex_destroy(&LOCK_active_mi);
882
 
  (void) rwlock_destroy(&LOCK_sys_init_connect);
883
 
  (void) rwlock_destroy(&LOCK_sys_init_slave);
 
879
  (void) pthread_rwlock_destroy(&LOCK_sys_init_connect);
 
880
  (void) pthread_rwlock_destroy(&LOCK_sys_init_slave);
884
881
  (void) pthread_mutex_destroy(&LOCK_global_system_variables);
885
 
  (void) rwlock_destroy(&LOCK_system_variables_hash);
 
882
  (void) pthread_rwlock_destroy(&LOCK_system_variables_hash);
886
883
  (void) pthread_mutex_destroy(&LOCK_global_read_lock);
887
884
  (void) pthread_cond_destroy(&COND_thread_count);
888
885
  (void) pthread_cond_destroy(&COND_refresh);
2045
2042
  (void) pthread_mutex_init(&LOCK_error_log,MY_MUTEX_INIT_FAST);
2046
2043
  (void) pthread_mutex_init(&LOCK_active_mi, MY_MUTEX_INIT_FAST);
2047
2044
  (void) pthread_mutex_init(&LOCK_global_system_variables, MY_MUTEX_INIT_FAST);
2048
 
  (void) my_rwlock_init(&LOCK_system_variables_hash, NULL);
 
2045
  (void) pthread_rwlock_init(&LOCK_system_variables_hash, NULL);
2049
2046
  (void) pthread_mutex_init(&LOCK_global_read_lock, MY_MUTEX_INIT_FAST);
2050
2047
  (void) pthread_mutex_init(&LOCK_connection_count, MY_MUTEX_INIT_FAST);
2051
 
  (void) my_rwlock_init(&LOCK_sys_init_connect, NULL);
2052
 
  (void) my_rwlock_init(&LOCK_sys_init_slave, NULL);
 
2048
  (void) pthread_rwlock_init(&LOCK_sys_init_connect, NULL);
 
2049
  (void) pthread_rwlock_init(&LOCK_sys_init_slave, NULL);
2053
2050
  (void) pthread_cond_init(&COND_thread_count,NULL);
2054
2051
  (void) pthread_cond_init(&COND_refresh,NULL);
2055
2052
  (void) pthread_cond_init(&COND_global_read_lock,NULL);
2329
2326
  thr_kill_signal= SIGINT;
2330
2327
#endif
2331
2328
 
2332
 
  /*
2333
 
    Perform basic logger initialization logger. Should be called after
2334
 
    MY_INIT, as it initializes mutexes. Log tables are inited later.
2335
 
  */
2336
 
  logger.init_base();
2337
 
 
2338
2329
#ifdef _CUSTOMSTARTUPCONFIG_
2339
2330
  if (_cust_check_startup())
2340
2331
  {