projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AUTHORS: Add Kyle Mestery.
[openvswitch]
/
lib
/
timeval.h
diff --git
a/lib/timeval.h
b/lib/timeval.h
index 303461adf4734f72941a60583b440a45b28f925f..e8413ff25ca64caad18c3b9aa140ea3a9207e76c 100644
(file)
--- a/
lib/timeval.h
+++ b/
lib/timeval.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2011
, 2012 Nicira, Inc
.
*
* 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.
@@
-55,13
+55,18
@@
long long int time_wall_msec(void);
void time_timespec(struct timespec *);
void time_wall_timespec(struct timespec *);
void time_alarm(unsigned int secs);
void time_timespec(struct timespec *);
void time_wall_timespec(struct timespec *);
void time_alarm(unsigned int secs);
-int time_poll(struct pollfd *, int n_pollfds, int timeout);
+int time_poll(struct pollfd *, int n_pollfds, long long int timeout_when,
+ int *elapsed);
long long int timespec_to_msec(const struct timespec *);
long long int timeval_to_msec(const struct timeval *);
void xgettimeofday(struct timeval *);
long long int timespec_to_msec(const struct timespec *);
long long int timeval_to_msec(const struct timeval *);
void xgettimeofday(struct timeval *);
+int get_cpu_usage(void);
+
+long long int time_boot_msec(void);
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif