Attachment #117110 for bug #159189

View | Details | Raw Unified | Return to bug 159189
Collapse All | Expand All

Lines 7-13 Link Here

(-)taucs/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= taucs	8	PORTNAME= taucs
9	PORTVERSION= 2.2	9	PORTVERSION= 2.2
10	PORTREVISION= 6	10	PORTREVISION= 7
11	CATEGORIES= math	11	CATEGORIES= math
12	MASTER_SITES= http://www.tau.ac.il/~stoledo/taucs/${PORTVERSION}/	12	MASTER_SITES= http://www.tau.ac.il/~stoledo/taucs/${PORTVERSION}/
13	DISTNAME= ${PORTNAME}	13	DISTNAME= ${PORTNAME}

Lines 1-5 Link Here

(-)taucs/files/patch-config+FreeBSD.mk (-5 / +8 lines)
1	--- config/FreeBSD.mk.orig Fri Aug 29 00:13:38 2003	1	--- config/FreeBSD.mk.orig 2003-08-28 15:13:38.000000000 +0000
2	+++ config/FreeBSD.mk Tue Jan 9 14:18:49 2007	2	+++ config/FreeBSD.mk 2011-07-25 18:19:03.000000000 +0000
3	@@ -8,16 +8,16 @@	3	@@ -8,16 +8,16 @@
4	PATHSEP=/	4	PATHSEP=/
5	DEFFLG=-D	5	DEFFLG=-D
Lines 23-29 Link Here
23	LOUTFLG = $(COUTFLG)	23	LOUTFLG = $(COUTFLG)
24		24
25	AR = ar cr	25	AR = ar cr
26	@@ -26,12 +26,12 @@	26	@@ -26,13 +26,13 @@
27	RANLIB = ranlib	27	RANLIB = ranlib
28	RM = rm -rf	28	RM = rm -rf
29		29
Lines 36-42 Link Here
36	+LIBMETIS = -lmetis	36	+LIBMETIS = -lmetis
37		37
38	-LIBF77 = -lg2c	38	-LIBF77 = -lg2c
		39	-#compat is required for ftime()
		40	-LIBC = -lm -lcompat
39	+LIBF77 =	41	+LIBF77 =
40	#compat is required for ftime()	42	+
41	LIBC = -lm -lcompat	43	+LIBC = -lm
42		44
		45	#########################################################




--- src/taucs_timer.c.orig	2003-09-01 10:28:54.000000000 +0000
+++ src/taucs_timer.c	2011-07-25 18:12:00.000000000 +0000
@@ -168,9 +168,9 @@
   static int    first_time    = 1;
 
   if (first_time) {
-    struct timeb T;
+    struct timeval T;
     static time_t start_time, time_diff;
-    static time_t start_mill, mill_diff;
+    static time_t start_micro, micro_diff;
     int    rc;
     double dt;
     /*uint32 hi0, lo0, hi1, lo1;*/
@@ -178,19 +178,19 @@
 
     first_time = 0;
 
-    rc = ftime( &T );
+    rc = gettimeofday( &T,NULL );
     rdtsc(&hi0,&lo0);
-    start_time = T.time;
-    start_mill = T.millitm;
+    start_time = T.tv_sec;
+    start_micro = T.tv_usec;
 
     sleep(1);
 
-    rc = ftime( &T );
+    rc = gettimeofday( &T,NULL );
     rdtsc(&hi1,&lo1);
-    time_diff = T.time - start_time;
-    mill_diff = T.millitm - start_mill; 
+    time_diff = T.tv_sec - start_time;
+    micro_diff = T.tv_usec - start_micro; 
 
-    dt = (1e9) * ((double) time_diff) + (1e6) * ((double) mill_diff);
+    dt = (1e9) * ((double) time_diff) + (1e3) * ((double) micro_diff);
 
     hir = (hi1 - hi0);
     lor = (lo1 - lo0);
@@ -249,32 +249,32 @@
 
 double taucs_wtime()
 {
-  struct timeb T;
+  struct timeval T;
   /*static int first_time    = 1;*/
   /*  static time_t start_time, time_diff;
-      static time_t start_mill, mill_diff;
+      static time_t start_micro, micro_diff;
   */
 
   static time_t time_diff;
-  static time_t mill_diff;
+  static time_t micro_diff;
   /*int    rc;*/
   double dt;
   
-  (void) ftime( &T );
+  (void) gettimeofday( &T,NULL );
   /*
   if (first_time) {
     first_time = 0;
-    start_time = T.time;
-    start_mill = T.millitm;
+    start_time = T.tv_sec;
+    start_micro = T.tv_usec;
   }
 
-  time_diff = T.time - start_time;
-  mill_diff = T.millitm - start_mill; 
+  time_diff = T.tv_sec - start_time;
+  micro_diff = T.tv_usec - start_micro; 
   */
-  time_diff = T.time;
-  mill_diff = T.millitm;
+  time_diff = T.tv_sec;
+  micro_diff = T.tv_usec;
 
-  dt = ((double) time_diff) + (1e-3) * ((double) mill_diff);
+  dt = ((double) time_diff) + (1e-6) * ((double) micro_diff);
 
   return dt;
 }
@@ -316,17 +316,17 @@
   struct timeb T;
   static int first_time    = 1;
   static time_t start_time, time_diff;
-  static time_t start_mill, mill_diff;
+  static time_t start_micro, micro_diff;
   /*int    rc;*/
   double dt,cpu_t;
   static double last_cpu_t;
 
-  (void) ftime( &T );
+  (void) gettimeofday( &T,NULL );
 
   if (first_time) {
     first_time = 0;
-    start_time = T.time;
-    start_mill = T.millitm;
+    start_time = T.tv_sec;
+    start_micro = T.tv_usec;
     getrusage(RUSAGE_SELF,&a);
     
     last_cpu_t = (a.ru_utime).tv_sec+(a.ru_stime).tv_sec+
@@ -337,13 +337,13 @@
   }
   else
     {
-      time_diff = T.time - start_time;
-      mill_diff = T.millitm - start_mill; 
+      time_diff = T.tv_sec - start_time;
+      micro_diff = T.tv_usec - start_micro; 
       
-      dt = ((double) time_diff) + ((double) mill_diff)/1000.;
+      dt = ((double) time_diff) + ((double) micro_diff)/1000000.;
 
-      start_time = T.time;
-      start_mill = T.millitm;
+      start_time = T.tv_sec;
+      start_micro = T.tv_usec;
       
       getrusage(RUSAGE_SELF,&a);
 
@@ -363,17 +363,17 @@
   struct timeb T;
   static int first_time    = 1;
   static time_t start_time, time_diff;
-  static time_t start_mill, mill_diff;
+  static time_t start_micro, micro_diff;
   /*int    rc;*/
   double dt,cpu_t;
   static double start_cpu_t;
   
-  (void) ftime( &T );
+  (void) gettimeofday( &T,NULL );
 
   if (first_time) {
     first_time = 0;
-    start_time = T.time;
-    start_mill = T.millitm;
+    start_time = T.tv_sec;
+    start_micro = T.tv_usec;
     getrusage(RUSAGE_SELF,&a);
 
     start_cpu_t = (a.ru_utime).tv_sec+(a.ru_stime).tv_sec+
@@ -385,9 +385,9 @@
   else
     {
       time_diff = T.time - start_time;
-      mill_diff = T.millitm - start_mill; 
+      micro_diff = T.tv_usec - start_micro; 
       
-      dt = ((double) time_diff) + ((double) mill_diff)/1000.;
+      dt = ((double) time_diff) + ((double) micro_diff)/1000000.;
       
       getrusage(RUSAGE_SELF,&a);


Return to bug 159189

Line 0 Link Here

(-)taucs/files/patch-src-taucs_timer.c (+160 lines)
		1	--- src/taucs_timer.c.orig 2003-09-01 10:28:54.000000000 +0000
		2	+++ src/taucs_timer.c 2011-07-25 18:12:00.000000000 +0000
		3	@@ -168,9 +168,9 @@
		4	static int first_time = 1;
		5
		6	if (first_time) {
		7	- struct timeb T;
		8	+ struct timeval T;
		9	static time_t start_time, time_diff;
		10	- static time_t start_mill, mill_diff;
		11	+ static time_t start_micro, micro_diff;
		12	int rc;
		13	double dt;
		14	/uint32 hi0, lo0, hi1, lo1;/
		15	@@ -178,19 +178,19 @@
		16
		17	first_time = 0;
		18
		19	- rc = ftime( &T );
		20	+ rc = gettimeofday( &T,NULL );
		21	rdtsc(&hi0,&lo0);
		22	- start_time = T.time;
		23	- start_mill = T.millitm;
		24	+ start_time = T.tv_sec;
		25	+ start_micro = T.tv_usec;
		26
		27	sleep(1);
		28
		29	- rc = ftime( &T );
		30	+ rc = gettimeofday( &T,NULL );
		31	rdtsc(&hi1,&lo1);
		32	- time_diff = T.time - start_time;
		33	- mill_diff = T.millitm - start_mill;
		34	+ time_diff = T.tv_sec - start_time;
		35	+ micro_diff = T.tv_usec - start_micro;
		36
		37	- dt = (1e9) * ((double) time_diff) + (1e6) * ((double) mill_diff);
		38	+ dt = (1e9) * ((double) time_diff) + (1e3) * ((double) micro_diff);
		39
		40	hir = (hi1 - hi0);
		41	lor = (lo1 - lo0);
		42	@@ -249,32 +249,32 @@
		43
		44	double taucs_wtime()
		45	{
		46	- struct timeb T;
		47	+ struct timeval T;
		48	/static int first_time = 1;/
		49	/* static time_t start_time, time_diff;
		50	- static time_t start_mill, mill_diff;
		51	+ static time_t start_micro, micro_diff;
		52	*/
		53
		54	static time_t time_diff;
		55	- static time_t mill_diff;
		56	+ static time_t micro_diff;
		57	/int rc;/
		58	double dt;
		59
		60	- (void) ftime( &T );
		61	+ (void) gettimeofday( &T,NULL );
		62	/*
		63	if (first_time) {
		64	first_time = 0;
65	- start_time = T.time;
66	- start_mill = T.millitm;
67	+ start_time = T.tv_sec;
68	+ start_micro = T.tv_usec;
69	}
70
71	- time_diff = T.time - start_time;
72	- mill_diff = T.millitm - start_mill;
73	+ time_diff = T.tv_sec - start_time;
74	+ micro_diff = T.tv_usec - start_micro;
75	*/
76	- time_diff = T.time;
77	- mill_diff = T.millitm;
78	+ time_diff = T.tv_sec;
79	+ micro_diff = T.tv_usec;
80
81	- dt = ((double) time_diff) + (1e-3) * ((double) mill_diff);
82	+ dt = ((double) time_diff) + (1e-6) * ((double) micro_diff);
83
84	return dt;
85	}
86	@@ -316,17 +316,17 @@
87	struct timeb T;
88	static int first_time = 1;
89	static time_t start_time, time_diff;
90	- static time_t start_mill, mill_diff;
91	+ static time_t start_micro, micro_diff;
92	/int rc;/
93	double dt,cpu_t;
94	static double last_cpu_t;
95
96	- (void) ftime( &T );
97	+ (void) gettimeofday( &T,NULL );
98
99	if (first_time) {
100	first_time = 0;
101	- start_time = T.time;
102	- start_mill = T.millitm;
103	+ start_time = T.tv_sec;
104	+ start_micro = T.tv_usec;
105	getrusage(RUSAGE_SELF,&a);
106
107	last_cpu_t = (a.ru_utime).tv_sec+(a.ru_stime).tv_sec+
108	@@ -337,13 +337,13 @@
109	}
110	else
111	{
112	- time_diff = T.time - start_time;
113	- mill_diff = T.millitm - start_mill;
114	+ time_diff = T.tv_sec - start_time;
115	+ micro_diff = T.tv_usec - start_micro;
116
117	- dt = ((double) time_diff) + ((double) mill_diff)/1000.;
118	+ dt = ((double) time_diff) + ((double) micro_diff)/1000000.;
119
120	- start_time = T.time;
121	- start_mill = T.millitm;
122	+ start_time = T.tv_sec;
123	+ start_micro = T.tv_usec;
124
125	getrusage(RUSAGE_SELF,&a);
126
127	@@ -363,17 +363,17 @@
128	struct timeb T;
129	static int first_time = 1;
130	static time_t start_time, time_diff;
131	- static time_t start_mill, mill_diff;
132	+ static time_t start_micro, micro_diff;
133	/int rc;/
134	double dt,cpu_t;
135	static double start_cpu_t;
136
137	- (void) ftime( &T );
138	+ (void) gettimeofday( &T,NULL );
139
140	if (first_time) {
141	first_time = 0;
142	- start_time = T.time;
143	- start_mill = T.millitm;
144	+ start_time = T.tv_sec;
145	+ start_micro = T.tv_usec;
146	getrusage(RUSAGE_SELF,&a);
147
148	start_cpu_t = (a.ru_utime).tv_sec+(a.ru_stime).tv_sec+
149	@@ -385,9 +385,9 @@
150	else
151	{
152	time_diff = T.time - start_time;
153	- mill_diff = T.millitm - start_mill;
154	+ micro_diff = T.tv_usec - start_micro;
155
156	- dt = ((double) time_diff) + ((double) mill_diff)/1000.;
157	+ dt = ((double) time_diff) + ((double) micro_diff)/1000000.;
158
159	getrusage(RUSAGE_SELF,&a);
160