projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimisation of ltt_time_from_uint64
[lttv.git]
/
ltt
/
branches
/
poly
/
ltt
/
time.h
diff --git
a/ltt/branches/poly/ltt/time.h
b/ltt/branches/poly/ltt/time.h
index a257018275262b2dd2da7b87a5fc1e1598492a02..7cb7c8bb95914f303fd484eb7af5e8ff7ce75d07 100644
(file)
--- a/
ltt/branches/poly/ltt/time.h
+++ b/
ltt/branches/poly/ltt/time.h
@@
-20,7
+20,7
@@
#define LTT_TIME_H
#include <glib.h>
#define LTT_TIME_H
#include <glib.h>
-
+#include <ltt/compiler.h>
typedef struct _LttTime {
unsigned long tv_sec;
typedef struct _LttTime {
unsigned long tv_sec;
@@
-42,7
+42,11
@@
static inline LttTime ltt_time_sub(LttTime t1, LttTime t2)
LttTime res;
res.tv_sec = t1.tv_sec - t2.tv_sec;
res.tv_nsec = t1.tv_nsec - t2.tv_nsec;
LttTime res;
res.tv_sec = t1.tv_sec - t2.tv_sec;
res.tv_nsec = t1.tv_nsec - t2.tv_nsec;
- if(t1.tv_nsec < t2.tv_nsec) {
+ /* unlikely : given equal chance to be anywhere in t1.tv_nsec, and
+ * higher probability of low value for t2.tv_sec, we will habitually
+ * not wrap.
+ */
+ if(unlikely(t1.tv_nsec < t2.tv_nsec)) {
res.tv_sec--;
res.tv_nsec += NANOSECONDS_PER_SECOND;
}
res.tv_sec--;
res.tv_nsec += NANOSECONDS_PER_SECOND;
}
@@
-55,16
+59,17
@@
static inline LttTime ltt_time_add(LttTime t1, LttTime t2)
LttTime res;
res.tv_nsec = t1.tv_nsec + t2.tv_nsec;
res.tv_sec = t1.tv_sec + t2.tv_sec;
LttTime res;
res.tv_nsec = t1.tv_nsec + t2.tv_nsec;
res.tv_sec = t1.tv_sec + t2.tv_sec;
- if(res.tv_nsec >= NANOSECONDS_PER_SECOND) {
+ /* unlikely : given equal chance to be anywhere in t1.tv_nsec, and
+ * higher probability of low value for t2.tv_sec, we will habitually
+ * not wrap.
+ */
+ if(unlikely(res.tv_nsec >= NANOSECONDS_PER_SECOND)) {
res.tv_sec++;
res.tv_nsec -= NANOSECONDS_PER_SECOND;
}
return res;
}
res.tv_sec++;
res.tv_nsec -= NANOSECONDS_PER_SECOND;
}
return res;
}
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-
/* Fastest comparison : t1 > t2 */
static inline int ltt_time_compare(LttTime t1, LttTime t2)
{
/* Fastest comparison : t1 > t2 */
static inline int ltt_time_compare(LttTime t1, LttTime t2)
{
@@
-202,11
+207,16
@@
static inline LttTime ltt_time_from_uint64(guint64 t1)
#ifdef EXTRA_CHECK
g_assert(t1 <= MAX_TV_SEC_TO_UINT64);
if(t1 > MAX_TV_SEC_TO_UINT64)
#ifdef EXTRA_CHECK
g_assert(t1 <= MAX_TV_SEC_TO_UINT64);
if(t1 > MAX_TV_SEC_TO_UINT64)
- g_warning("Conversion from
non precise uint64 to
LttTime");
+ g_warning("Conversion from
uint64 to non precise
LttTime");
#endif //EXTRA_CHECK
LttTime res;
#endif //EXTRA_CHECK
LttTime res;
- res.tv_sec = t1/NANOSECONDS_PER_SECOND;
- res.tv_nsec = (t1 - res.tv_sec*NANOSECONDS_PER_SECOND);
+ if(unlikely(t1 >= NANOSECONDS_PER_SECOND)) {
+ res.tv_sec = t1/NANOSECONDS_PER_SECOND;
+ res.tv_nsec = (t1 - res.tv_sec*NANOSECONDS_PER_SECOND);
+ } else {
+ res.tv_sec = 0;
+ res.tv_nsec = (guint32)t1;
+ }
return res;
}
return res;
}
This page took
0.027389 seconds
and
4
git commands to generate.