diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-04-21 16:23:36 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-04-21 16:23:36 +0000 |
| commit | 81c95f7d9854521a568179bb19199299835b7a53 (patch) | |
| tree | 148e2833ad3112356c87f0b9286032484d587181 /rts/parallel/Parallel.c | |
| parent | 7dbc1d8f8fb650162e01f6eab8dabaf1f53c819d (diff) | |
| download | haskell-81c95f7d9854521a568179bb19199299835b7a53.tar.gz | |
Use StgWord64 instead of ullong
This patch also fixes ullong_format_string (renamed to showStgWord64)
so that it works with values outside the 32bit range (trac #3979), and
simplifies the without-commas case.
Diffstat (limited to 'rts/parallel/Parallel.c')
| -rw-r--r-- | rts/parallel/Parallel.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rts/parallel/Parallel.c b/rts/parallel/Parallel.c index 414b7e4406..99a2bb221b 100644 --- a/rts/parallel/Parallel.c +++ b/rts/parallel/Parallel.c @@ -38,7 +38,7 @@ GlobalParStats globalParStats; #endif #if defined(PAR) -ullong startTime = 0; +StgWord64 startTime = 0; #endif #if defined(PAR) && !defined(DEBUG) @@ -345,7 +345,7 @@ int prog_argc, rts_argc; ASSERT(startTime==0); // startTime = msTime(); startTime = CURRENT_TIME; - ullong_format_string(CURRENT_TIME, time_string, rtsFalse/*no commas!*/); + showStgWord64(CURRENT_TIME, time_string, rtsFalse/*no commas!*/); fprintf(gr_file, "PE %2u [%s]: TIME\n", thisPE, time_string); # if 0 @@ -407,7 +407,7 @@ end_gr_simulation(void) { char time_string[TIME_STR_LEN]; - ullong_format_string(CURRENT_TIME, time_string, rtsFalse/*no commas!*/); + showStgWord64(CURRENT_TIME, time_string, rtsFalse/*no commas!*/); if (RtsFlags.GranFlags.GranSimStats.Suppressed) return; @@ -530,7 +530,7 @@ end_gr_simulation(void) { char time_string[TIME_STR_LEN]; - ullong_format_string(CURRENT_TIME-startTime, time_string, rtsFalse/*no commas!*/); + showStgWord64(CURRENT_TIME-startTime, time_string, rtsFalse/*no commas!*/); fprintf(stderr, "Computation finished after @ %s @ ms. %d sparks created, %d sparks ignored. Check %s for details.\n", time_string, sparksCreated, sparksIgnored, gr_filename); @@ -590,10 +590,10 @@ StgInt sparkname, len; StgWord id; char time_string[TIME_STR_LEN], node_str[NODE_STR_LEN]; # if defined(GRAN) - ullong_format_string(time, + showStgWord64(time, time_string, rtsFalse/*no commas!*/); # elif defined(PAR) - ullong_format_string(time, + showStgWord64(time, time_string, rtsFalse/*no commas!*/); # endif output_file = gr_file; @@ -702,10 +702,10 @@ rtsBool mandatory_thread; FILE *output_file; // DEBUGGING ONLY !!!!!!!!!!!!!!!!!!!!!!!!!1 char time_string[TIME_STR_LEN]; # if defined(GRAN) - ullong_format_string(TIME_ON_PROC(proc), + showStgWord64(TIME_ON_PROC(proc), time_string, rtsFalse/*no commas!*/); # elif defined(PAR) - ullong_format_string(CURRENT_TIME, + showStgWord64(CURRENT_TIME, time_string, rtsFalse/*no commas!*/); # endif |