Merge pull request mas-bandwidth#98 from networkprotocol/revert-96-UseNanosleep

gafferongames · web-flow · commit c81ee2381d81 · 2020-07-03T17:36:21.000-04:00
Revert "Change implementation of netcode_sleep on linux and mac"
diff --git a/netcode.c b/netcode.c
@@ -5179,10 +5179,7 @@ int netcode_generate_connect_token( int num_server_addresses,
 
 void netcode_sleep( double time )
 {
-    struct timespec ts;
-    ts.tv_sec = (time_t) time;
-    ts.tv_nsec = (long) ((time - (double) ( ts.tv_sec )) * 1000000000.0);
-    nanosleep( &ts, NULL );
+    usleep( (int) ( time * 1000000 ) );
 }
 
 static uint64_t start = 0;
@@ -5208,10 +5205,7 @@ double netcode_time()
 
 void netcode_sleep( double time )
 {
-    struct timespec ts;
-    ts.tv_sec = (time_t) time;
-    ts.tv_nsec = (long) ((time - (double) ( ts.tv_sec )) * 1000000000.0);
-    nanosleep( &ts, NULL );
+    usleep( (int) ( time * 1000000 ) );
 }
 
 double netcode_time()

Original file line number	Diff line number	Diff line change
`@@ -5179,10 +5179,7 @@ int netcode_generate_connect_token( int num_server_addresses,`
`5179`	`5179`
`5180`	`5180`	`void netcode_sleep( double time )`
`5181`	`5181`	`{`
`5182`		`- struct timespec ts;`
`5183`		`- ts.tv_sec = (time_t) time;`
`5184`		`- ts.tv_nsec = (long) ((time - (double) ( ts.tv_sec )) * 1000000000.0);`
`5185`		`- nanosleep( &ts, NULL );`
	`5182`	`+ usleep( (int) ( time * 1000000 ) );`
`5186`	`5183`	`}`
`5187`	`5184`
`5188`	`5185`	`static uint64_t start = 0;`
`@@ -5208,10 +5205,7 @@ double netcode_time()`
`5208`	`5205`
`5209`	`5206`	`void netcode_sleep( double time )`
`5210`	`5207`	`{`
`5211`		`- struct timespec ts;`
`5212`		`- ts.tv_sec = (time_t) time;`
`5213`		`- ts.tv_nsec = (long) ((time - (double) ( ts.tv_sec )) * 1000000000.0);`
`5214`		`- nanosleep( &ts, NULL );`
	`5208`	`+ usleep( (int) ( time * 1000000 ) );`
`5215`	`5209`	`}`
`5216`	`5210`
`5217`	`5211`	`double netcode_time()`