← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_alarm.cc

  • Committer: Brian Aker
  • Date: 2008-12-18 17:54:22 UTC
  • mfrom: (713.1.5 devel)
  • Revision ID: brian@tangent.org-20081218175422-zqfm3mpueuq7z2az
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_alarm.cc
164
164
  bool reschedule;
165
165
  struct st_my_thread_var *current_my_thread_var= my_thread_var;
166
166
 
167
 
  if((now= time(0)) == (time_t)-1)
 
167
  now= time(NULL);
 
168
  if(now == (time_t)-1)
168
169
  {
169
170
    fprintf(stderr, "%s: Warning: time() call failed\n", my_progname);
170
171
    return 1;
350
351
    }
351
352
    else
352
353
    {
353
 
      uint32_t now= time(0);
 
354
      time_t now= time(NULL);
354
355
      uint32_t next= now+10-(now%10);
355
356
      while ((alarm_data=(ALARM*) queue_top(&alarm_queue))->expire_time <= now)
356
357
      {
478
479
  info->max_used_alarms= max_used_alarms;
479
480
  if ((info->active_alarms=  alarm_queue.elements))
480
481
  {
481
 
    uint32_t now= (uint32_t)time(0);
 
482
    time_t now= time(NULL);
482
483
    long time_diff;
483
484
    ALARM *alarm_data= (ALARM*) queue_top(&alarm_queue);
484
485
    time_diff= (long) (alarm_data->expire_time - now);
525
526
  {
526
527
    if (alarm_queue.elements)
527
528
    {
528
 
      uint32_t sleep_time, now;
 
529
      uint32_t sleep_time;
529
530
 
530
 
      if ((now= time(0)) == (time_t)-1)
 
531
      time_t now= time(NULL);
 
532
      if (now == (time_t)-1)
531
533
      {
532
534
        pthread_mutex_unlock(&LOCK_alarm);
533
535
        return NULL;