summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Mikkel Kamstrup Erlandsen2014-03-19 21:29:13 +0100
committerGravatar Martin Szulecki2014-03-24 17:01:30 +0100
commit427da9b898ad6d6d6b091b375f9fc38f155b4813 (patch)
tree146baa967432cb9b215b6a2a2da87d9cf7b6d1bc
parentf87407aacfd335398cc6897d3d65103f20ead20a (diff)
downloadusbmuxd-427da9b898ad6d6d6b091b375f9fc38f155b4813.tar.gz
usbmuxd-427da9b898ad6d6d6b091b375f9fc38f155b4813.tar.bz2
device/utils: move mstime64() into utils since it is generally useful
-rw-r--r--src/device.c10
-rw-r--r--src/utils.c14
-rw-r--r--src/utils.h2
3 files changed, 16 insertions, 10 deletions
diff --git a/src/device.c b/src/device.c
index ef97f72..e36509e 100644
--- a/src/device.c
+++ b/src/device.c
@@ -120,16 +120,6 @@ struct mux_device
120static struct collection device_list; 120static struct collection device_list;
121pthread_mutex_t device_list_mutex; 121pthread_mutex_t device_list_mutex;
122 122
123static uint64_t mstime64(void)
124{
125 struct timeval tv;
126 gettimeofday(&tv, NULL);
127
128 // Careful, avoid overflow on 32 bit systems
129 // time_t could be 4 bytes
130 return ((long long)tv.tv_sec) * 1000LL + ((long long)tv.tv_usec) / 1000LL;
131}
132
133static struct mux_device* get_mux_device_for_id(int device_id) 123static struct mux_device* get_mux_device_for_id(int device_id)
134{ 124{
135 struct mux_device *dev = NULL; 125 struct mux_device *dev = NULL;
diff --git a/src/utils.c b/src/utils.c
index 9fa4d80..4218758 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
29#include <string.h> 29#include <string.h>
30#include <stdio.h> 30#include <stdio.h>
31#include <stdarg.h> 31#include <stdarg.h>
32#include <sys/time.h>
32 33
33#include "utils.h" 34#include "utils.h"
34 35
@@ -272,3 +273,16 @@ int plist_write_to_filename(plist_t plist, const char *filename, enum plist_form
272 273
273 return 1; 274 return 1;
274} 275}
276
277/**
278 * Get number of milliseconds since the epoch.
279 */
280uint64_t mstime64(void)
281{
282 struct timeval tv;
283 gettimeofday(&tv, NULL);
284
285 // Careful, avoid overflow on 32 bit systems
286 // time_t could be 4 bytes
287 return ((long long)tv.tv_sec) * 1000LL + ((long long)tv.tv_usec) / 1000LL;
288}
diff --git a/src/utils.h b/src/utils.h
index 67477b5..92a7d68 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -87,4 +87,6 @@ enum plist_format_t {
87int plist_read_from_filename(plist_t *plist, const char *filename); 87int plist_read_from_filename(plist_t *plist, const char *filename);
88int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format); 88int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format);
89 89
90uint64_t mstime64(void);
91
90#endif 92#endif