X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftime.c;h=ee90eb8ae552ff9dd677e5100cf4ec776a5466ec;hb=6ede545d597509fefcc3d4fd2ef865bc5f57603f;hp=19f3e488f402780573df110bd66935011f8ed356;hpb=61c39c60565b386e0e12ea669556b030e8cd7180;p=oweals%2Fgnunet.git diff --git a/src/util/time.c b/src/util/time.c index 19f3e488f..ee90eb8ae 100644 --- a/src/util/time.c +++ b/src/util/time.c @@ -1,21 +1,19 @@ /* This file is part of GNUnet. - (C) 2001-2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** @@ -24,9 +22,10 @@ * @brief functions for handling time and time arithmetic */ #include "platform.h" -#include "gnunet_util_lib.h" +#include "gnunet_crypto_lib.h" +#include "gnunet_time_lib.h" -#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__) +#define LOG(kind,...) GNUNET_log_from (kind, "util-time", __VA_ARGS__) /** * Variable used to simulate clock skew. Used for testing, never in production. @@ -57,6 +56,46 @@ GNUNET_TIME_get_offset () } +/** + * Round a time value so that it is suitable for transmission + * via JSON encodings. + * + * @param at time to round + * @return #GNUNET_OK if time was already rounded, #GNUNET_NO if + * it was just now rounded + */ +int +GNUNET_TIME_round_abs (struct GNUNET_TIME_Absolute *at) +{ + if (at->abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us) + return GNUNET_OK; + if (0 == at->abs_value_us % 1000000) + return GNUNET_OK; + at->abs_value_us -= at->abs_value_us % 1000000; + return GNUNET_NO; +} + + +/** + * Round a time value so that it is suitable for transmission + * via JSON encodings. + * + * @param rt time to round + * @return #GNUNET_OK if time was already rounded, #GNUNET_NO if + * it was just now rounded + */ +int +GNUNET_TIME_round_rel (struct GNUNET_TIME_Relative *rt) +{ + if (rt->rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us) + return GNUNET_OK; + if (0 == rt->rel_value_us % 1000000) + return GNUNET_OK; + rt->rel_value_us -= rt->rel_value_us % 1000000; + return GNUNET_NO; +} + + /** * Get the current time (works just as "time", just that we use the * unit of time that the cron-jobs use (and is 64 bit)). @@ -108,6 +147,7 @@ struct GNUNET_TIME_Relative GNUNET_TIME_relative_get_unit_ () { static struct GNUNET_TIME_Relative one = { 1 }; + return one; } @@ -119,6 +159,7 @@ struct GNUNET_TIME_Relative GNUNET_TIME_relative_get_millisecond_ () { static struct GNUNET_TIME_Relative one = { 1000 }; + return one; } @@ -130,6 +171,7 @@ struct GNUNET_TIME_Relative GNUNET_TIME_relative_get_second_ () { static struct GNUNET_TIME_Relative one = { 1000 * 1000LL }; + return one; } @@ -141,6 +183,7 @@ struct GNUNET_TIME_Relative GNUNET_TIME_relative_get_minute_ () { static struct GNUNET_TIME_Relative one = { 60 * 1000 * 1000LL }; + return one; } @@ -152,6 +195,7 @@ struct GNUNET_TIME_Relative GNUNET_TIME_relative_get_hour_ () { static struct GNUNET_TIME_Relative one = { 60 * 60 * 1000 * 1000LL }; + return one; } @@ -163,9 +207,11 @@ struct GNUNET_TIME_Relative GNUNET_TIME_relative_get_forever_ () { static struct GNUNET_TIME_Relative forever = { UINT64_MAX }; + return forever; } + /** * Return "forever". */ @@ -176,6 +222,7 @@ GNUNET_TIME_absolute_get_forever_ () return forever; } + /** * Convert relative time to an absolute time in the * future. @@ -308,7 +355,7 @@ GNUNET_TIME_absolute_get_difference (struct GNUNET_TIME_Absolute start, * Get the duration of an operation as the * difference of the current time and the given start time "whence". * - * @return aborts if whence==FOREVER, 0 if whence > now, otherwise now-whence. + * @return 0 if whence > now, otherwise now-whence. */ struct GNUNET_TIME_Relative GNUNET_TIME_absolute_get_duration (struct GNUNET_TIME_Absolute whence) @@ -317,7 +364,6 @@ GNUNET_TIME_absolute_get_duration (struct GNUNET_TIME_Absolute whence) struct GNUNET_TIME_Relative ret; now = GNUNET_TIME_absolute_get (); - GNUNET_assert (whence.abs_value_us != UINT64_MAX); if (whence.abs_value_us > now.abs_value_us) return GNUNET_TIME_UNIT_ZERO; ret.rel_value_us = now.abs_value_us - whence.abs_value_us; @@ -379,13 +425,15 @@ GNUNET_TIME_absolute_subtract (struct GNUNET_TIME_Absolute start, */ struct GNUNET_TIME_Relative GNUNET_TIME_relative_multiply (struct GNUNET_TIME_Relative rel, - unsigned int factor) + unsigned long long factor) { struct GNUNET_TIME_Relative ret; if (0 == factor) return GNUNET_TIME_UNIT_ZERO; - ret.rel_value_us = rel.rel_value_us * (unsigned long long) factor; + if (rel.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us) + return GNUNET_TIME_UNIT_FOREVER_REL; + ret.rel_value_us = rel.rel_value_us * factor; if (ret.rel_value_us / factor != rel.rel_value_us) { GNUNET_break (0); @@ -395,6 +443,32 @@ GNUNET_TIME_relative_multiply (struct GNUNET_TIME_Relative rel, } +/** + * Saturating multiply relative time by a given factor. + * + * @param rel some duration + * @param factor integer to multiply with + * @return FOREVER if rel=FOREVER or on overflow; otherwise rel*factor + */ +struct GNUNET_TIME_Relative +GNUNET_TIME_relative_saturating_multiply (struct GNUNET_TIME_Relative rel, + unsigned long long factor) +{ + struct GNUNET_TIME_Relative ret; + + if (0 == factor) + return GNUNET_TIME_UNIT_ZERO; + if (rel.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us) + return GNUNET_TIME_UNIT_FOREVER_REL; + ret.rel_value_us = rel.rel_value_us * factor; + if (ret.rel_value_us / factor != rel.rel_value_us) + { + return GNUNET_TIME_UNIT_FOREVER_REL; + } + return ret; +} + + /** * Divide relative time by a given factor. * @@ -404,14 +478,14 @@ GNUNET_TIME_relative_multiply (struct GNUNET_TIME_Relative rel, */ struct GNUNET_TIME_Relative GNUNET_TIME_relative_divide (struct GNUNET_TIME_Relative rel, - unsigned int factor) + unsigned long long factor) { struct GNUNET_TIME_Relative ret; if ((0 == factor) || (rel.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)) return GNUNET_TIME_UNIT_FOREVER_REL; - ret.rel_value_us = rel.rel_value_us / (unsigned long long) factor; + ret.rel_value_us = rel.rel_value_us / factor; return ret; } @@ -522,7 +596,6 @@ GNUNET_TIME_relative_ntoh (struct GNUNET_TIME_RelativeNBO a) ret.rel_value_us = GNUNET_ntohll (a.rel_value_us__); return ret; - } @@ -618,7 +691,7 @@ GNUNET_TIME_year_to_time (unsigned int year) } t.tm_year = year - 1900; t.tm_mday = 1; - t.tm_mon = 1; + t.tm_mon = 0; t.tm_wday = 1; t.tm_yday = 1; tp = mktime (&t);