diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-03-04 04:53:31 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-03-04 04:53:31 +0000 |
commit | 429d914cdd3dd4eb662c0ca85fa3de77b26e15cc (patch) | |
tree | ea4e7f529df086420017e854c51d5e95c7cf9dbd /src/util/common_logging.c | |
parent | bd68fcf94853210cd9c5695c8e35f2df00347807 (diff) | |
download | gnunet-429d914cdd3dd4eb662c0ca85fa3de77b26e15cc.tar.gz gnunet-429d914cdd3dd4eb662c0ca85fa3de77b26e15cc.zip |
-include time offsets in logging as well
Diffstat (limited to 'src/util/common_logging.c')
-rw-r--r-- | src/util/common_logging.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 000c33880..cd845ccce 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c | |||
@@ -886,11 +886,14 @@ mylog (enum GNUNET_ErrorType kind, const char *comp, const char *message, | |||
886 | memset (date, 0, DATE_STR_SIZE); | 886 | memset (date, 0, DATE_STR_SIZE); |
887 | { | 887 | { |
888 | char buf[size]; | 888 | char buf[size]; |
889 | long long offset; | ||
889 | #ifdef WINDOWS | 890 | #ifdef WINDOWS |
890 | LARGE_INTEGER pc; | 891 | LARGE_INTEGER pc; |
891 | time_t timetmp; | 892 | time_t timetmp; |
892 | 893 | ||
894 | offset = GNUNET_TIME_get_offset (); | ||
893 | time (&timetmp); | 895 | time (&timetmp); |
896 | timetmp += offset / 1000; | ||
894 | tmptr = localtime (&timetmp); | 897 | tmptr = localtime (&timetmp); |
895 | pc.QuadPart = 0; | 898 | pc.QuadPart = 0; |
896 | QueryPerformanceCounter (&pc); | 899 | QueryPerformanceCounter (&pc); |
@@ -909,6 +912,30 @@ mylog (enum GNUNET_ErrorType kind, const char *comp, const char *message, | |||
909 | struct timeval timeofday; | 912 | struct timeval timeofday; |
910 | 913 | ||
911 | gettimeofday (&timeofday, NULL); | 914 | gettimeofday (&timeofday, NULL); |
915 | offset = GNUNET_TIME_get_offset (); | ||
916 | if (offset > 0) | ||
917 | { | ||
918 | timeofday.tv_sec += offset / 1000LL; | ||
919 | timeofday.tv_usec += (offset % 1000LL) * 1000LL; | ||
920 | if (timeofday.tv_usec > 1000000LL) | ||
921 | { | ||
922 | timeofday.tv_usec -= 1000000LL; | ||
923 | timeofday.tv_sec++; | ||
924 | } | ||
925 | } | ||
926 | else | ||
927 | { | ||
928 | timeofday.tv_sec += offset / 1000LL; | ||
929 | if (timeofday.tv_usec > - (offset % 1000LL) * 1000LL) | ||
930 | { | ||
931 | timeofday.tv_usec += (offset % 1000LL) * 1000LL; | ||
932 | } | ||
933 | else | ||
934 | { | ||
935 | timeofday.tv_usec += 1000000LL + (offset % 1000LL) * 1000LL; | ||
936 | timeofday.tv_sec--; | ||
937 | } | ||
938 | } | ||
912 | tmptr = localtime (&timeofday.tv_sec); | 939 | tmptr = localtime (&timeofday.tv_sec); |
913 | if (NULL == tmptr) | 940 | if (NULL == tmptr) |
914 | { | 941 | { |