← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_alarm.c

  • Committer: Monty
  • Date: 2008-10-02 05:41:33 UTC
  • mfrom: (398.1.10 codestyle)
  • Revision ID: mordred@scylla.inaugust.com-20081002054133-tyxv5bmqpazfaqqi
Merged up to 408 of stdint-includes-fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_alarm.c
94
94
    pthread_attr_setstacksize(&thr_attr,8196);
95
95
 
96
96
    my_pthread_attr_setprio(&thr_attr,100);     /* Very high priority */
97
 
    VOID(pthread_create(&alarm_thread,&thr_attr,alarm_handler,NULL));
98
 
    VOID(pthread_attr_destroy(&thr_attr));
 
97
    pthread_create(&alarm_thread,&thr_attr,alarm_handler,NULL);
 
98
    pthread_attr_destroy(&thr_attr);
99
99
  }
100
100
#elif defined(USE_ONE_SIGNAL_HAND)
101
101
  pthread_sigmask(SIG_BLOCK, &s, NULL);         /* used with sigwait() */
654
654
                break;
655
655
              continue;
656
656
            }
657
 
            VOID(getchar());                    /* Somebody was playing */
 
657
            getchar();                  /* Somebody was playing */
658
658
          }
659
659
        }
660
660
      }
666
666
  }
667
667
  pthread_mutex_lock(&LOCK_thread_count);
668
668
  thread_count--;
669
 
  VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
 
669
  pthread_cond_signal(&COND_thread_count); /* Tell main we are ready */
670
670
  pthread_mutex_unlock(&LOCK_thread_count);
671
671
  free((uchar*) arg);
672
672
  return 0;
695
695
  pthread_detach_this_thread();
696
696
  init_thr_alarm(10);                           /* Setup alarm handler */
697
697
  pthread_mutex_lock(&LOCK_thread_count);       /* Required by bsdi */
698
 
  VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
 
698
  pthread_cond_signal(&COND_thread_count); /* Tell main we are ready */
699
699
  pthread_mutex_unlock(&LOCK_thread_count);
700
700
 
701
701
  sigemptyset(&set);                            /* Catch all signals */
781
781
#ifdef NOT_USED
782
782
  sigemptyset(&set);
783
783
  sigaddset(&set, thr_client_alarm);
784
 
  VOID(pthread_sigmask(SIG_UNBLOCK, &set, (sigset_t*) 0));
 
784
  pthread_sigmask(SIG_UNBLOCK, &set, (sigset_t*) 0);
785
785
#endif
786
786
 
787
787
  pthread_attr_init(&thr_attr);
790
790
  pthread_attr_setstacksize(&thr_attr,65536L);
791
791
 
792
792
  /* Start signal thread and wait for it to start */
793
 
  VOID(pthread_mutex_lock(&LOCK_thread_count));
 
793
  pthread_mutex_lock(&LOCK_thread_count);
794
794
  pthread_create(&tid,&thr_attr,signal_hand,NULL);
795
 
  VOID(pthread_cond_wait(&COND_thread_count,&LOCK_thread_count));
796
 
  VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
795
  pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
 
796
  pthread_mutex_unlock(&LOCK_thread_count);
797
797
 
798
798
  thr_setconcurrency(3);
799
799
  pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_PROCESS);
820
820
         alarm_info.next_alarm_time);
821
821
  while (thread_count)
822
822
  {
823
 
    VOID(pthread_cond_wait(&COND_thread_count,&LOCK_thread_count));
 
823
    pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
824
824
    if (thread_count == 1)
825
825
    {
826
826
      printf("Calling end_thr_alarm. This should cancel the last thread\n");