Changeset 5065:18cdc8c3a1ab in roaraudio for roard/req.c

Timestamp:

06/18/11 04:07:49 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_clock_gettime()

File:

• roard/req.c (modified) (3 diffs)

roard/req.c

@@ -683 +683 @@
 
 int req_on_gettimeofday (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
-#if defined(ROAR_HAVE_GETTIMEOFDAY) || defined(ROAR_HAVE_TIME)
  struct roar_time curtime;
-#ifdef ROAR_HAVE_GETTIMEOFDAY
- struct timeval tv;
-#elif defined(ROAR_HAVE_TIME)
- time_t now = time(NULL);
-#endif
 
  ROAR_DBG("req_on_gettimeofday(client=%i, mes=%p, data=%p, flags=%p) = ?", client, mes, data, flags);
@@ -713 +707 @@
  ROAR_DBG("req_on_gettimeofday(client=%i, mes=%p, data=%p, flags=%p) = ?", client, mes, data, flags);
 
- memset(&curtime, 0, sizeof(curtime));
-
-#ifdef ROAR_HAVE_GETTIMEOFDAY
- if ( gettimeofday(&tv, NULL) == -1 )
-  return -1;
- curtime.t_sec  = tv.tv_sec;
- curtime.t_ssec = (uint64_t)tv.tv_usec * (uint64_t)18446744073709ULL;
-#elif defined(ROAR_HAVE_TIME)
- curtime.t_sec = now;
-#endif
+ if ( roar_clock_gettime(&curtime, ROAR_CLOCK_REALTIME) == -1 )
+  return -1;
 
  if ( roar_time_to_msg(mes, &curtime) == -1 )
@@ -732 +718 @@
 
  return 0;
-#else
- return -1;
-#endif
 }