[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4050 - gnuradio/branches/developers/jcorgan/ticket-10
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r4050 - gnuradio/branches/developers/jcorgan/ticket-103/gnuradio-core/src/lib/general |
Date: |
Thu, 30 Nov 2006 20:07:53 -0700 (MST) |
Author: jcorgan
Date: 2006-11-30 20:07:53 -0700 (Thu, 30 Nov 2006)
New Revision: 4050
Modified:
gnuradio/branches/developers/jcorgan/ticket-103/gnuradio-core/src/lib/general/gr_throttle.cc
Log:
Reverted changeset r4032 from trunk (fix for ticket:103) on developer branch;
will create a gr_nanosleep that encapsulates this conditional code.
Modified:
gnuradio/branches/developers/jcorgan/ticket-103/gnuradio-core/src/lib/general/gr_throttle.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/ticket-103/gnuradio-core/src/lib/general/gr_throttle.cc
2006-12-01 03:01:29 UTC (rev 4049)
+++
gnuradio/branches/developers/jcorgan/ticket-103/gnuradio-core/src/lib/general/gr_throttle.cc
2006-12-01 03:07:53 UTC (rev 4050)
@@ -32,9 +32,6 @@
#ifdef HAVE_TIME_H
#include <time.h>
#endif
-#if !defined(HAVE_NANOSLEEP) && defined(HAVE_SSLEEP)
-#include <windows.h>
-#endif
#ifdef HAVE_NANOSLEEP
@@ -83,7 +80,7 @@
const char *in = (const char *) input_items[0];
char *out = (char *) output_items[0];
-#if defined(HAVE_GETTIMEOFDAY)
+#if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_NANOSLEEP)
//
// If our average sample rate exceeds our target sample rate,
// delay long enough to reduce to our target rate.
@@ -99,14 +96,10 @@
double actual_samples_per_sec = d_total_samples / t;
if (actual_samples_per_sec > d_samples_per_sec){ // need to delay
double delay = d_total_samples / d_samples_per_sec - t;
-#ifdef HAVE_NANOSLEEP
struct timespec ts;
ts.tv_sec = (time_t)floor(delay);
ts.tv_nsec = (long)((delay - floor(delay)) * 1e9);
gr_nanosleep(&ts);
-#elif HAVE_SSLEEP
- Sleep( (DWORD)(delay*1000) );
-#endif
}
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4050 - gnuradio/branches/developers/jcorgan/ticket-103/gnuradio-core/src/lib/general,
jcorgan <=