diff options
author | David Walter Seikel | 2014-05-16 10:34:31 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-16 10:34:31 +1000 |
commit | b6489395e103929445d78f9a8145cf62262fd82e (patch) | |
tree | 4a87062ec2b9630f783406e101bc12c18392e244 /src/libraries | |
parent | Implement llCSV2List(). (diff) | |
download | SledjHamr-b6489395e103929445d78f9a8145cf62262fd82e.zip SledjHamr-b6489395e103929445d78f9a8145cf62262fd82e.tar.gz SledjHamr-b6489395e103929445d78f9a8145cf62262fd82e.tar.bz2 SledjHamr-b6489395e103929445d78f9a8145cf62262fd82e.tar.xz |
Move timeDiff() to LumbrJack, it has more than one user now.
Diffstat (limited to 'src/libraries')
-rw-r--r-- | src/libraries/LumbrJack.c | 24 | ||||
-rw-r--r-- | src/libraries/LumbrJack.h | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/libraries/LumbrJack.c b/src/libraries/LumbrJack.c index e873d02..8d08622 100644 --- a/src/libraries/LumbrJack.c +++ b/src/libraries/LumbrJack.c | |||
@@ -86,3 +86,27 @@ char *getDateTime(struct tm **nowOut, char *dateOut, time_t *timeOut) | |||
86 | strftime(date, DATE_TIME_LEN, "%d/%m/%Y %H:%M:%S\r", newTime); | 86 | strftime(date, DATE_TIME_LEN, "%d/%m/%Y %H:%M:%S\r", newTime); |
87 | return (dateTime); | 87 | return (dateTime); |
88 | } | 88 | } |
89 | |||
90 | float timeDiff(struct timeval *now, struct timeval *then) | ||
91 | { | ||
92 | if (0 == gettimeofday(now, 0)) | ||
93 | { | ||
94 | struct timeval thisTime = { 0, 0 }; | ||
95 | double result = 0.0; | ||
96 | |||
97 | thisTime.tv_sec = now->tv_sec; | ||
98 | thisTime.tv_usec = now->tv_usec; | ||
99 | if (thisTime.tv_usec < then->tv_usec) | ||
100 | { | ||
101 | thisTime.tv_sec--; | ||
102 | thisTime.tv_usec += 1000000; | ||
103 | } | ||
104 | thisTime.tv_usec -= then->tv_usec; | ||
105 | thisTime.tv_sec -= then->tv_sec; | ||
106 | result = ((double) thisTime.tv_usec) / ((double) 1000000.0); | ||
107 | result += thisTime.tv_sec; | ||
108 | return result; | ||
109 | } | ||
110 | else | ||
111 | return 0.0; | ||
112 | } | ||
diff --git a/src/libraries/LumbrJack.h b/src/libraries/LumbrJack.h index a096e7f..1912bef 100644 --- a/src/libraries/LumbrJack.h +++ b/src/libraries/LumbrJack.h | |||
@@ -33,5 +33,7 @@ typedef enum | |||
33 | 33 | ||
34 | int loggingStartup(char *name, int logDom); | 34 | int loggingStartup(char *name, int logDom); |
35 | char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); | 35 | char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); |
36 | float timeDiff(struct timeval *now, struct timeval *then); | ||
37 | |||
36 | 38 | ||
37 | #endif | 39 | #endif |