Update copyright to 2004.

[bison.git] / lib / timevar.c

diff --git a/lib/timevar.c b/lib/timevar.c
index 7a10fe78b4780815d67ff7089e27c7aa95785344..927eac262fed63854d868fe56d819b871fb79b34 100644 (file)
--- a/lib/timevar.c
+++ b/lib/timevar.c
@@ -1,29 +1,46 @@
 /* Timing variables for measuring compiler performance.
 /* Timing variables for measuring compiler performance.

-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002 Free Software Foundation, Inc.

    Contributed by Alex Samuel <samuel@codesourcery.com>
 
    Contributed by Alex Samuel <samuel@codesourcery.com>
 

-This file is part of GCC.
+This file is part of Bison, the GNU Compiler Compiler.

 
 

-GCC is free software; you can redistribute it and/or modify it under
+Bison is free software; you can redistribute it and/or modify it under

 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2, or (at your option) any later
 version.
 
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2, or (at your option) any later
 version.
 

-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+Bison is distributed in the hope that it will be useful, but WITHOUT ANY

 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License

-along with GCC; see the file COPYING.  If not, write to the Free
+along with Bison; see the file COPYING.  If not, write to the Free

 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
 Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 

+#if IN_GCC
+

 #include "config.h"
 #include "system.h"
 #include "intl.h"
 #include "rtl.h"
 
 #include "config.h"
 #include "system.h"
 #include "intl.h"
 #include "rtl.h"
 

+#else
+
+/* This source file is taken from the GCC source code, with slight
+   modifications that are under control of the IN_GCC preprocessor
+   variable.  The !IN_GCC part of this file is specific to Bison.  */
+   
+# include "../src/system.h"
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# endif
+int timevar_report = 0;
+
+#endif
+
+

 #ifdef HAVE_SYS_TIMES_H
 # include <sys/times.h>
 #endif
 #ifdef HAVE_SYS_TIMES_H
 # include <sys/times.h>
 #endif


@@ -101,21 +118,23 @@ extern clock_t clock PARAMS ((void));
    _constants_ variable at run time, anyway?  */
 #ifdef USE_TIMES
 static float ticks_to_msec;
    _constants_ variable at run time, anyway?  */
 #ifdef USE_TIMES
 static float ticks_to_msec;

-#define TICKS_TO_MSEC (1 / (float)TICKS_PER_SECOND)
+#define TICKS_TO_MSEC (1.0 / TICKS_PER_SECOND)

 #endif
 
 #ifdef USE_CLOCK
 static float clocks_to_msec;
 #endif
 
 #ifdef USE_CLOCK
 static float clocks_to_msec;

-#define CLOCKS_TO_MSEC (1 / (float)CLOCKS_PER_SEC)
+#define CLOCKS_TO_MSEC (1.0 / CLOCKS_PER_SEC)

 #endif
 
 #endif
 

+#if IN_GCC

 #include "flags.h"
 #include "flags.h"

+#endif

 #include "timevar.h"
 
 /* See timevar.h for an explanation of timing variables.  */
 
 /* This macro evaluates to nonzero if timing variables are enabled.  */
 #include "timevar.h"
 
 /* See timevar.h for an explanation of timing variables.  */
 
 /* This macro evaluates to nonzero if timing variables are enabled.  */

-#define TIMEVAR_ENABLE (time_report)
+#define TIMEVAR_ENABLE (timevar_report)

 
 /* A timing variable.  */
 
 
 /* A timing variable.  */
 


@@ -193,12 +212,21 @@ get_time (now)
 #ifdef USE_TIMES
     struct tms tms;
     now->wall = times (&tms)  * ticks_to_msec;
 #ifdef USE_TIMES
     struct tms tms;
     now->wall = times (&tms)  * ticks_to_msec;

+#if IN_GCC

     now->user = tms.tms_utime * ticks_to_msec;
     now->sys  = tms.tms_stime * ticks_to_msec;
     now->user = tms.tms_utime * ticks_to_msec;
     now->sys  = tms.tms_stime * ticks_to_msec;

+#else
+    now->user = (tms.tms_utime + tms.tms_cutime) * ticks_to_msec;
+    now->sys  = (tms.tms_stime + tms.tms_cstime) * ticks_to_msec;
+#endif

 #endif
 #ifdef USE_GETRUSAGE
     struct rusage rusage;
 #endif
 #ifdef USE_GETRUSAGE
     struct rusage rusage;

+#if IN_GCC

     getrusage (RUSAGE_SELF, &rusage);
     getrusage (RUSAGE_SELF, &rusage);

+#else
+    getrusage (RUSAGE_CHILDREN, &rusage);
+#endif

     now->user = rusage.ru_utime.tv_sec + rusage.ru_utime.tv_usec * 1e-6;
     now->sys  = rusage.ru_stime.tv_sec + rusage.ru_stime.tv_usec * 1e-6;
 #endif
     now->user = rusage.ru_utime.tv_sec + rusage.ru_utime.tv_usec * 1e-6;
     now->sys  = rusage.ru_stime.tv_sec + rusage.ru_stime.tv_usec * 1e-6;
 #endif


@@ -208,17 +236,17 @@ get_time (now)
   }
 }
 
   }
 }
 

-/* Add the difference between STOP_TIME and START_TIME to TIMER.  */
+/* Add the difference between STOP and START to TIMER.  */

 
 static void
 
 static void

-timevar_accumulate (timer, start_time, stop_time)
+timevar_accumulate (timer, start, stop)

      struct timevar_time_def *timer;
      struct timevar_time_def *timer;

-     struct timevar_time_def *start_time;
-     struct timevar_time_def *stop_time;
+     struct timevar_time_def *start;
+     struct timevar_time_def *stop;

 {
 {

-  timer->user += stop_time->user - start_time->user;
-  timer->sys += stop_time->sys - start_time->sys;
-  timer->wall += stop_time->wall - start_time->wall;
+  timer->user += stop->user - start->user;
+  timer->sys += stop->sys - start->sys;
+  timer->wall += stop->wall - start->wall;

 }
 
 /* Initialize timing variables.  */
 }
 
 /* Initialize timing variables.  */