From d59abab64f6e75bf2ad843bcfcadc22b5d431694 Mon Sep 17 00:00:00 2001 From: antirez Date: Fri, 6 May 2011 17:55:16 +0200 Subject: ustime() added as it is used by scripting.c --- src/redis.h | 1 + src/util.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/redis.h b/src/redis.h index 56f5dcf1b..1f23a4551 100644 --- a/src/redis.h +++ b/src/redis.h @@ -873,6 +873,7 @@ int isStringRepresentableAsLong(sds s, long *longval); int isStringRepresentableAsLongLong(sds s, long long *longval); int isObjectRepresentableAsLongLong(robj *o, long long *llongval); int string2ll(char *s, size_t slen, long long *value); +long long ustime(void); /* Configuration */ void loadServerConfig(char *filename); diff --git a/src/util.c b/src/util.c index 1e5d5a928..1e3a488fa 100644 --- a/src/util.c +++ b/src/util.c @@ -1,6 +1,7 @@ #include "redis.h" #include #include +#include /* Glob-style pattern matching. */ int stringmatchlen(const char *pattern, int patternLen, @@ -301,3 +302,14 @@ int string2ll(char *s, size_t slen, long long *value) { } return 1; } + +/* Return the UNIX time in microseconds */ +long long ustime(void) { + struct timeval tv; + long long ust; + + gettimeofday(&tv, NULL); + ust = ((long long)tv.tv_sec)*1000000; + ust += tv.tv_usec; + return ust; +} -- cgit v1.2.1