Attachment 117111 Details for Bug 159189 – ddd2

ddd2

ddd2 (text/plain), 6.00 KB, created by Stephen Montgomery-Smith on 2011-07-25 21:16:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephen Montgomery-Smith

Created: 2011-07-25 21:16:33 UTC

Size: 6.00 KB

patch

obsolete

>diff -urN /usr/ports/math/taucs/Makefile taucs/Makefile
>--- /usr/ports/math/taucs/Makefile	2011-07-25 00:38:22.000000000 +0000
>+++ taucs/Makefile	2011-07-25 17:54:53.000000000 +0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	taucs
> PORTVERSION=	2.2
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	math
> MASTER_SITES=	http://www.tau.ac.il/~stoledo/taucs/${PORTVERSION}/
> DISTNAME=	${PORTNAME}
>diff -urN /usr/ports/math/taucs/files/patch-config+FreeBSD.mk taucs/files/patch-config+FreeBSD.mk
>--- /usr/ports/math/taucs/files/patch-config+FreeBSD.mk	2007-01-09 05:52:07.000000000 +0000
>+++ taucs/files/patch-config+FreeBSD.mk	2011-07-25 20:06:46.000000000 +0000
>@@ -1,5 +1,5 @@
>---- config/FreeBSD.mk.orig	Fri Aug 29 00:13:38 2003
>-+++ config/FreeBSD.mk	Tue Jan  9 14:18:49 2007
>+--- config/FreeBSD.mk.orig	2003-08-28 15:13:38.000000000 +0000
>++++ config/FreeBSD.mk	2011-07-25 18:19:03.000000000 +0000
> @@ -8,16 +8,16 @@
>  PATHSEP=/
>  DEFFLG=-D
>@@ -19,11 +19,11 @@
> -LD        = $(CC) 
> -LDFLAGS   = $(CFLAGS) -static
> +LD        = %%FC%%
>-+LDFLAGS   = -L%%LOCALBASE%%/lib -L./
>++LDFLAGS   = -Llib/FreeBSD -L%%LOCALBASE%%/lib -L./
>  LOUTFLG   = $(COUTFLG)
>  
>  AR        = ar cr
>-@@ -26,12 +26,12 @@
>+@@ -26,13 +26,13 @@
>  RANLIB    = ranlib
>  RM        = rm -rf
>  
>@@ -36,7 +36,10 @@
> +LIBMETIS  = -lmetis 
>  
> -LIBF77 = -lg2c  
>+-#compat is required for ftime()
>+-LIBC   = -lm -lcompat 
> +LIBF77 = 
>- #compat is required for ftime()
>- LIBC   = -lm -lcompat 
>++
>++LIBC   = -lm
>  
>+ #########################################################
>diff -urN /usr/ports/math/taucs/files/patch-src-taucs_timer.c taucs/files/patch-src-taucs_timer.c
>--- /usr/ports/math/taucs/files/patch-src-taucs_timer.c	1970-01-01 00:00:00.000000000 +0000
>+++ taucs/files/patch-src-taucs_timer.c	2011-07-25 18:12:30.000000000 +0000
>@@ -0,0 +1,160 @@
>+--- 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);
>+

Actions: View

Attachments on bug 159189: 117110 | 117111 | 117112