Branch: Tag:

2007-06-10

2007-06-10 12:49:47 by Martin Stjernholm <mast@lysator.liu.se>

Reverted a few things that got in by mistake.

Rev: src/gc.c:1.289

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: gc.c,v 1.288 2007/06/10 12:41:59 mast Exp $ + || $Id: gc.c,v 1.289 2007/06/10 12:49:47 mast Exp $   */      #include "global.h"
120:   static double objects_freed = 0.0;   static double gc_time = 0.0, non_gc_time = 0.0;   static cpu_time_t last_gc_end_time = 0; - #ifdef CPU_TIME_MIGHT_NOT_BE_THREAD_LOCAL + #if CPU_TIME_IS_THREAD_LOCAL == PIKE_NO   cpu_time_t auto_gc_time = 0;   #endif   
3691:    alloc_threshold = (ALLOC_COUNT_TYPE) new_threshold;       if (!explicit_call && last_gc_time != (cpu_time_t) -1) { -  if (cpu_time_is_thread_local) + #if CPU_TIME_IS_THREAD_LOCAL == PIKE_YES    Pike_interpreter.thread_state->auto_gc_time += last_gc_time; -  else + #elif CPU_TIME_IS_THREAD_LOCAL == PIKE_NO    auto_gc_time += last_gc_time; -  + #endif    }       if(GC_VERBOSE_DO(1 ||) gc_trace)