projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "next".
[cascardo/ovs.git]
/
lib
/
timeval.h
diff --git
a/lib/timeval.h
b/lib/timeval.h
index
e940162
..
89abe80
100644
(file)
--- a/
lib/timeval.h
+++ b/
lib/timeval.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-45,6
+45,8
@@
BUILD_ASSERT_DECL(TYPE_IS_SIGNED(time_t));
#define TIME_UPDATE_INTERVAL 100
void time_init(void);
#define TIME_UPDATE_INTERVAL 100
void time_init(void);
+void time_disable_restart(void);
+void time_enable_restart(void);
void time_postfork(void);
void time_refresh(void);
time_t time_now(void);
void time_postfork(void);
void time_refresh(void);
time_t time_now(void);
@@
-53,6
+55,8
@@
void time_timeval(struct timeval *);
void time_alarm(unsigned int secs);
int time_poll(struct pollfd *, int n_pollfds, int timeout);
void time_alarm(unsigned int secs);
int time_poll(struct pollfd *, int n_pollfds, int timeout);
+long long int timeval_to_msec(const struct timeval *);
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif