summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixEvent.c
diff options
context:
space:
mode:
Diffstat (limited to 'unix/tclUnixEvent.c')
-rw-r--r--unix/tclUnixEvent.c57
1 files changed, 18 insertions, 39 deletions
diff --git a/unix/tclUnixEvent.c b/unix/tclUnixEvent.c
index 40aac6f..f43954f 100644
--- a/unix/tclUnixEvent.c
+++ b/unix/tclUnixEvent.c
@@ -1,17 +1,16 @@
-/*
+/*
* tclUnixEvent.c --
*
* This file implements Unix specific event related routines.
*
* Copyright (c) 1997 by Sun Microsystems, Inc.
*
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tclInt.h"
-#ifndef HAVE_COREFOUNDATION /* Darwin/Mac OS X CoreFoundation notifier is
- * in tclMacOSXNotify.c */
+#include "tclPort.h"
/*
*----------------------------------------------------------------------
@@ -30,16 +29,17 @@
*/
void
-Tcl_Sleep(
- int ms) /* Number of milliseconds to sleep. */
+Tcl_Sleep(ms)
+ int ms; /* Number of milliseconds to sleep. */
{
struct timeval delay;
- Tcl_Time before, after, vdelay;
+ Tcl_Time before, after;
/*
- * The only trick here is that select appears to return early under some
- * conditions, so we have to check to make sure that the right amount of
- * time really has elapsed. If it's too early, go back to sleep again.
+ * The only trick here is that select appears to return early
+ * under some conditions, so we have to check to make sure that
+ * the right amount of time really has elapsed. If it's too
+ * early, go back to sleep again.
*/
Tcl_GetTime(&before);
@@ -51,28 +51,16 @@ Tcl_Sleep(
after.sec += 1;
}
while (1) {
- /*
- * TIP #233: Scale from virtual time to real-time for select.
- */
-
- vdelay.sec = after.sec - before.sec;
- vdelay.usec = after.usec - before.usec;
-
- if (vdelay.usec < 0) {
- vdelay.usec += 1000000;
- vdelay.sec -= 1;
+ delay.tv_sec = after.sec - before.sec;
+ delay.tv_usec = after.usec - before.usec;
+ if (delay.tv_usec < 0) {
+ delay.tv_usec += 1000000;
+ delay.tv_sec -= 1;
}
- if ((vdelay.sec != 0) || (vdelay.usec != 0)) {
- tclScaleTimeProcPtr(&vdelay, tclTimeClientData);
- }
-
- delay.tv_sec = vdelay.sec;
- delay.tv_usec = vdelay.usec;
-
/*
- * Special note: must convert delay.tv_sec to int before comparing to
- * zero, since delay.tv_usec is unsigned on some platforms.
+ * Special note: must convert delay.tv_sec to int before comparing
+ * to zero, since delay.tv_usec is unsigned on some platforms.
*/
if ((((int) delay.tv_sec) < 0)
@@ -84,12 +72,3 @@ Tcl_Sleep(
Tcl_GetTime(&before);
}
}
-
-#endif /* HAVE_COREFOUNDATION */
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 4
- * fill-column: 78
- * End:
- */