FlapJackApps/libdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use higher resolution timestamps on Windows.

Browse Source 
In commit 886884ab606def1183d99eca7dec8affefee635e, the custom log
function in the example applications has already been modified to use
high resolution timestamps. But I forgot about the built-in default log
function. So this is basically the same change, but now applied to the
built-in log function.
This commit is contained in:
Jef Driesen 2014-05-27 22:21:36 +02:00
parent 2e71075c5b
commit 20c874b267
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/context.c
View File

@ -40,7 +40,7 @@ struct dc_context_t {
#ifdef ENABLE_LOGGING
char msg[8192 + 32];
#ifdef _WIN32
DWORD timestamp;
LARGE_INTEGER timestamp, frequency;
#else
struct timeval timestamp;
#endif
@ -134,28 +134,31 @@ logfunc (dc_context_t *context, dc_loglevel_t loglevel, const char *file, unsign
{
const char *loglevels[] = {"NONE", "ERROR", "WARNING", "INFO", "DEBUG", "ALL"};
unsigned long seconds = 0, milliseconds = 0;
unsigned long seconds = 0, microseconds = 0;
#ifdef _WIN32
DWORD now = GetTickCount ();
DWORD delta = now - context->timestamp;
seconds = delta / 1000;
milliseconds = delta % 1000;
LARGE_INTEGER now, delta;
QueryPerformanceCounter(&now);
delta.QuadPart = now.QuadPart - context->timestamp.QuadPart;
delta.QuadPart *= 1000000;
delta.QuadPart /= context->frequency.QuadPart;
seconds = delta.QuadPart / 1000000;
microseconds = delta.QuadPart % 1000000;
#else
struct timeval now, delta;
gettimeofday (&now, NULL);
timersub (&now, &context->timestamp, &delta);
seconds = delta.tv_sec;
milliseconds = delta.tv_usec / 1000;
microseconds = delta.tv_usec;
#endif
if (loglevel == DC_LOGLEVEL_ERROR || loglevel == DC_LOGLEVEL_WARNING) {
fprintf (stderr, "[%li.%03li] %s: %s [in %s:%d (%s)]\n",
seconds, milliseconds,
fprintf (stderr, "[%li.%06li] %s: %s [in %s:%d (%s)]\n",
seconds, microseconds,
loglevels[loglevel], msg, file, line, function);
} else {
fprintf (stderr, "[%li.%03li] %s: %s\n",
seconds, milliseconds,
fprintf (stderr, "[%li.%06li] %s: %s\n",
seconds, microseconds,
loglevels[loglevel], msg);
}
}
@ -185,7 +188,8 @@ dc_context_new (dc_context_t **out)
#ifdef ENABLE_LOGGING
memset (context->msg, 0, sizeof (context->msg));
#ifdef _WIN32
context->timestamp = GetTickCount ();
QueryPerformanceFrequency(&context->frequency);
QueryPerformanceCounter(&context->timestamp);
#else
gettimeofday (&context->timestamp, NULL);
#endif