| View Issue Details [ Jump to Notes ] | [ Issue History ] [ Print ] |
| ID | Project | Category | View Status | Date Submitted | Last Update |
| 0000719 | VCMI | Other | public | 2011-03-31 13:25 | 2014-05-30 17:40 |
|
| Reporter | plush | |
| Assigned To | Tow | |
| Priority | normal | Severity | minor | Reproducibility | always |
| Status | closed | Resolution | fixed | |
| Platform | AMD64 | OS | FreeBSD | OS Version | 8.2 |
| Product Version | 0.84 | |
| Target Version | | Fixed in Version | 0.85 | |
|
| Summary | 0000719: [PATCH] Make VCMI work under FreeBSD |
| Description | VMCI compiles and installs under FreeBSD 8.2 but crashes upon start-up with a floating point exception. The problem lies in timeHandler.h, line 21:
return ret/(CLOCKS_PER_SEC/1000);
This code assumes that CLOCKS_PER_SEC > 1000. Under Linux, clocks() has microsecond resolution so that CLOCKS_PER_SEC = 1000000 and the code works as desired. Under FreeBSD, CLOCKS_PER_SEC = 128, leading to a division by zero. |
| Steps To Reproduce | Compile, install and attempt to run under FreeBSD. |
| Additional Information | A clock with microsecond resolution is available under FreeBSD via the getrusage() system call. The attached patch introduces a private method clock() that returns a timestamp with microsecond resolution, mimicking the Linux function. The getDif() method is adjusted to divide by the correct number.
Additionally, the fields start, last, mem are made private so that no other class can access them and misinterpret the resolution of these timestamps. |
| Tags | No tags attached. |
|
| Attached Files |  patch_freebsd [^] (1,550 bytes) 2011-03-31 13:25 [Show Content] [Hide Content]--- timeHandler.h.orig 2011-03-31 13:58:12.000000000 +0200
+++ timeHandler.h 2011-03-31 14:20:32.000000000 +0200
@@ -1,7 +1,13 @@
#ifndef __TIMEHANDLER_H__
#define __TIMEHANDLER_H__
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#else
#include <ctime>
+#endif
/*
* timeHandler.h, part of VCMI engine
@@ -13,16 +19,35 @@
*
*/
+#ifdef __FreeBSD__
class timeHandler
{
public:
- clock_t start, last, mem;
timeHandler():start(clock()){last=clock();mem=0;};
- long getDif(){long ret=clock()-last;last=clock();return ret/(CLOCKS_PER_SEC/1000);};//get diff in milliseconds
+ long getDif(){long ret=clock()-last;last=clock();return ret/1000;};//get diff in milliseconds
void update(){last=clock();};
void remember(){mem=clock();};
long memDif(){return clock()-mem;};
+private:
+ long start, last, mem;
+ long clock() {
+ struct rusage usage;
+ getrusage(RUSAGE_SELF, &usage);
+ return static_cast<long>(usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * 1000000 + usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;
+ }
};
-
+#else
+class timeHandler
+{
+public:
+ timeHandler():start(clock()){last=clock();mem=0;};
+ long getDif(){long ret=clock()-last;last=clock();return ret/(CLOCKS_PER_SEC/1000);};//get diff in milliseconds
+ void update(){last=clock();};
+ void remember(){mem=clock();};
+ long memDif(){return clock()-mem;};
+private:
+ clock_t start, last, mem;
+};
+#endif // __FreeBSD__
#endif // __TIMEHANDLER_H__
|
|
Relationships 
Relationships 