luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 10:38:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gdatetime: Add g_date_time_source_new()"

Browse Source 
This reverts three commits:

 - 1feb752996b404965a2f58b29a569a273d4374fa
 - 5763c631473539746646697e6a775f6eacaa08e2
 - 21a538934091e1449e0479daf066fa20df2dc2ef

https://bugzilla.gnome.org/show_bug.cgi?id=655129
This commit is contained in:
Ryan Lortie 2011-08-30 21:31:40 -04:00
parent fe4fc3e8b5
commit ab8938c64d
9 changed files with 0 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -2665,23 +2665,6 @@ if test x"$glib_cv_eventfd" = x"yes"; then
fi fi
AM_CONDITIONAL(HAVE_EVENTFD, [test "$glib_cv_eventfd" = "yes"]) AM_CONDITIONAL(HAVE_EVENTFD, [test "$glib_cv_eventfd" = "yes"])
AC_CACHE_CHECK(for timerfd_create(2) system call,
glib_cv_timerfd,AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
#include <sys/timerfd.h>
#include <unistd.h>
],[
int
main (void)
{
timerfd_create (CLOCK_MONOTONIC, TFD_CLOEXEC);
return 0;
}
])],glib_cv_timerfd=yes,glib_cv_timerfd=no))
if test x"$glib_cv_timerfd" = x"yes"; then
AC_DEFINE(HAVE_TIMERFD, 1, [we have the timerfd_create(2) system call])
fi
AM_CONDITIONAL(HAVE_TIMERFD, [test "$glib_cv_timerfd" = "yes"])
dnl **************************************** dnl ****************************************
dnl *** GLib POLL* compatibility defines *** dnl *** GLib POLL* compatibility defines ***
dnl **************************************** dnl ****************************************

3
docs/reference/glib/glib-sections.txt
View File

@ -1551,9 +1551,6 @@ g_date_time_to_utc
<SUBSECTION> <SUBSECTION>
g_date_time_format g_date_time_format
<SUBSECTION>
g_date_time_source_new
</SECTION> </SECTION>
<SECTION> <SECTION>

232
glib/gdatetime.c
View File

@ -63,7 +63,6 @@
#include "gatomic.h" #include "gatomic.h"
#include "gfileutils.h" #include "gfileutils.h"
#include "ghash.h" #include "ghash.h"
#include "giochannel.h"
#include "gmain.h" #include "gmain.h"
#include "gmappedfile.h" #include "gmappedfile.h"
#include "gstrfuncs.h" #include "gstrfuncs.h"
@ -76,9 +75,6 @@
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#ifdef HAVE_TIMERFD
#include <sys/timerfd.h>
#endif
#endif /* !G_OS_WIN32 */ #endif /* !G_OS_WIN32 */
/** /**
@ -2591,234 +2587,6 @@ bad_format:
return NULL; return NULL;
} }
typedef struct _GDateTimeSource GDateTimeSource;
struct _GDateTimeSource
{
GSource source;
gint64 real_expiration;
gint64 wakeup_expiration;
gboolean cancel_on_set;
GPollFD pollfd;
};
static inline void
g_datetime_source_reschedule (GDateTimeSource *datetime_source,
gint64 from_monotonic)
{
datetime_source->wakeup_expiration = from_monotonic + G_TIME_SPAN_SECOND;
}
static gboolean
g_datetime_source_is_expired (GDateTimeSource *datetime_source)
{
gint64 real_now;
real_now = g_get_real_time ();
if (datetime_source->real_expiration <= real_now)
return TRUE;
/* We can't really detect without system support when things change;
* so just trigger every second.
*/
if (datetime_source->cancel_on_set)
return TRUE;
return FALSE;
}
/* In prepare, we're just checking the monotonic time against
* our projected wakeup.
*/
static gboolean
g_datetime_source_prepare (GSource *source,
gint *timeout)
{
GDateTimeSource *datetime_source = (GDateTimeSource*)source;
gint64 monotonic_now;
#ifdef HAVE_TIMERFD
if (datetime_source->pollfd.fd != -1)
{
*timeout = -1;
return FALSE;
}
#endif
monotonic_now = g_source_get_time (source);
if (monotonic_now < datetime_source->wakeup_expiration)
{
/* Round up to ensure that we don't try again too early */
*timeout = (datetime_source->wakeup_expiration - monotonic_now + 999) / 1000;
return FALSE;
}
*timeout = 0;
return g_datetime_source_is_expired (datetime_source);
}
/* In check, we're looking at the wall clock.
*/
static gboolean
g_datetime_source_check (GSource *source)
{
GDateTimeSource *datetime_source = (GDateTimeSource*)source;
#ifdef HAVE_TIMERFD
if (datetime_source->pollfd.fd != -1)
return datetime_source->pollfd.revents != 0;
#endif
if (g_datetime_source_is_expired (datetime_source))
return TRUE;
g_datetime_source_reschedule (datetime_source, g_source_get_time (source));
return FALSE;
}
static gboolean
g_datetime_source_dispatch (GSource *source,
GSourceFunc callback,
gpointer user_data)
{
if (!callback)
{
g_warning ("Timeout source dispatched without callback\n"
"You must call g_source_set_callback().");
return FALSE;
}
(callback) (user_data);
/* Always false as this source is documented to run once */
return FALSE;
}
static void
g_datetime_source_finalize (GSource *source)
{
#ifdef HAVE_TIMERFD
GDateTimeSource *datetime_source = (GDateTimeSource*)source;
if (datetime_source->pollfd.fd != -1)
close (datetime_source->pollfd.fd);
#endif
}
static GSourceFuncs g_datetime_source_funcs = {
g_datetime_source_prepare,
g_datetime_source_check,
g_datetime_source_dispatch,
g_datetime_source_finalize
};
#ifdef HAVE_TIMERFD
static gboolean
g_datetime_source_init_timerfd (GDateTimeSource *datetime_source,
gint64 unix_seconds)
{
struct itimerspec its;
int settime_flags;
datetime_source->pollfd.fd = timerfd_create (CLOCK_REALTIME, TFD_CLOEXEC);
if (datetime_source->pollfd.fd == -1)
return FALSE;
memset (&its, 0, sizeof (its));
its.it_value.tv_sec = (time_t) unix_seconds;
/* http://article.gmane.org/gmane.linux.kernel/1132138 */
#ifndef TFD_TIMER_CANCEL_ON_SET
#define TFD_TIMER_CANCEL_ON_SET (1 << 1)
#endif
settime_flags = TFD_TIMER_ABSTIME;
if (datetime_source->cancel_on_set)
settime_flags |= TFD_TIMER_CANCEL_ON_SET;
if (timerfd_settime (datetime_source->pollfd.fd, settime_flags, &its, NULL) < 0)
{
close (datetime_source->pollfd.fd);
datetime_source->pollfd.fd = -1;
return FALSE;
}
datetime_source->pollfd.events = G_IO_IN;
g_source_add_poll ((GSource*) datetime_source, &datetime_source->pollfd);
return TRUE;
}
#endif
/**
* g_date_time_source_new:
* @datetime: Time to await
* @cancel_on_set: Also invoke callback if the system clock changes discontiguously
*
* This function is designed for programs that want to schedule an
* event based on real (wall clock) time, as returned by
* g_get_real_time(). For example, HOUR:MINUTE wall-clock displays
* and calendaring software. The callback will be invoked when the
* specified wall clock time @datetime is reached. This includes
* events such as the system clock being set past the given time.
*
* Compare versus g_timeout_source_new() which is defined to use
* monotonic time as returned by g_get_monotonic_time().
*
* If @cancel_on_set is given, the callback will also be invoked at
* most a second after the system clock is changed. This includes
* being set backwards or forwards, and system
* resume from suspend. Not all operating systems allow detecting all
* relevant events efficiently - this function may cause the process
* to wake up once a second in those cases.
*
* A wall clock display should use @cancel_on_set; a calendaring
* program shouldn't need to.
*
* Note that the return value from the associated callback will be
* ignored; this is a one time watch.
*
* <note><para>This function currently does not detect time zone
* changes. On Linux, your program should also monitor the
* <literal>/etc/timezone</literal> file using
* #GFileMonitor.</para></note>
*
* <example id="gdatetime-example-watch"><title>Clock example</title><programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../glib/tests/glib-clock.c"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting></example>
*
* Return value: A newly-constructed #GSource
*
* Since: 2.30
**/
GSource *
g_date_time_source_new (GDateTime *datetime,
gboolean cancel_on_set)
{
GDateTimeSource *datetime_source;
gint64 unix_seconds;
unix_seconds = g_date_time_to_unix (datetime);
datetime_source = (GDateTimeSource*) g_source_new (&g_datetime_source_funcs, sizeof (GDateTimeSource));
datetime_source->cancel_on_set = cancel_on_set;
#ifdef HAVE_TIMERFD
if (g_datetime_source_init_timerfd (datetime_source, unix_seconds))
return (GSource*)datetime_source;
/* Fall through to non-timerfd code */
#endif
datetime_source->real_expiration = unix_seconds * 1000000;
g_datetime_source_reschedule (datetime_source, g_get_monotonic_time ());
return (GSource*)datetime_source;
}
/* Epilogue {{{1 */ /* Epilogue {{{1 */
/* vim:set foldmethod=marker: */ /* vim:set foldmethod=marker: */

3
glib/gdatetime.h
View File

@ -31,7 +31,6 @@
#define __G_DATE_TIME_H__ #define __G_DATE_TIME_H__
#include <glib/gtimezone.h> #include <glib/gtimezone.h>
#include <glib/gmain.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -213,8 +212,6 @@ GDateTime * g_date_time_to_utc (GDateTi
gchar * g_date_time_format (GDateTime *datetime, gchar * g_date_time_format (GDateTime *datetime,
const gchar *format) G_GNUC_MALLOC; const gchar *format) G_GNUC_MALLOC;
GSource * g_date_time_source_new (GDateTime *datetime,
gboolean cancel_on_set);
G_END_DECLS G_END_DECLS
#endif /* __G_DATE_TIME_H__ */ #endif /* __G_DATE_TIME_H__ */

1
glib/glib.symbols
View File

@ -293,7 +293,6 @@ g_date_time_new_now_local
g_date_time_new_now_utc g_date_time_new_now_utc
g_date_time_new_utc g_date_time_new_utc
g_date_time_ref g_date_time_ref
g_date_time_source_new
g_date_time_to_local g_date_time_to_local
g_date_time_to_timeval g_date_time_to_timeval
g_date_time_to_timezone g_date_time_to_timezone

1
glib/gmain.h
View File

@ -533,7 +533,6 @@ guint g_timeout_add_seconds_full (gint priority,
guint g_timeout_add_seconds (guint interval, guint g_timeout_add_seconds (guint interval,
GSourceFunc function, GSourceFunc function,
gpointer data); gpointer data);
guint g_child_watch_add_full (gint priority, guint g_child_watch_add_full (gint priority,
GPid pid, GPid pid,
GChildWatchFunc function, GChildWatchFunc function,

4
glib/tests/Makefile.am
View File

@ -206,10 +206,6 @@ check-am: gtester-xmllint-check
endif endif
noinst_PROGRAMS += glib-clock
glib_clock_CFLAGS = $(INCLUDES)
glib_clock_LDADD = $(progs_ldadd)
CLEANFILES = \ CLEANFILES = \
tmpsample.xml tmpsample.xml

38
glib/tests/glib-clock.c
View File

@ -1,38 +0,0 @@
#include <glib.h>
static gboolean
redisplay_clock (gpointer data)
{
GSource *source;
GDateTime *now, *expiry;
now = g_date_time_new_now_local ();
g_print ("%02d:%02d\n",
g_date_time_get_hour (now),
g_date_time_get_minute (now));
expiry = g_date_time_add_seconds (now, 60 - g_date_time_get_second (now));
source = g_date_time_source_new (expiry, TRUE);
g_source_set_callback (source, redisplay_clock, NULL, NULL);
g_source_attach (source, NULL);
g_source_unref (source);
g_date_time_unref (expiry);
g_date_time_unref (now);
return FALSE;
}
int
main (void)
{
GMainLoop *loop;
loop = g_main_loop_new (NULL, FALSE);
redisplay_clock (NULL);
g_main_loop_run (loop);
return 0;
}

70
glib/tests/timeout.c
View File

@ -88,74 +88,6 @@ test_rounding (void)
g_main_loop_run (loop); g_main_loop_run (loop);
} }
static gboolean
on_test_date_time_watch_timeout (gpointer user_data)
{
*((gboolean*)user_data) = TRUE;
g_main_loop_quit (loop);
return TRUE;
}
/* This test isn't very useful; it's hard to actually test much of the
* functionality of g_date_time_source_new() without a means to set
* the system clock (which typically requires system-specific
* interfaces as well as elevated privileges).
*
* But at least we're running the code and ensuring the timer fires.
*/
static void
test_date_time_create_watch (gboolean cancel_on_set)
{
GSource *source;
GDateTime *now, *expiry;
gboolean fired = FALSE;
gint64 orig_time_monotonic, end_time_monotonic;
gint64 elapsed_monotonic_seconds;
loop = g_main_loop_new (NULL, FALSE);
orig_time_monotonic = g_get_monotonic_time ();
now = g_date_time_new_now_local ();
expiry = g_date_time_add_seconds (now, 7);
g_date_time_unref (now);
source = g_date_time_source_new (expiry, cancel_on_set);
g_source_set_callback (source, on_test_date_time_watch_timeout, &fired, NULL);
g_source_attach (source, NULL);
g_source_unref (source);
g_main_loop_run (loop);
g_assert (fired);
if (!cancel_on_set)
{
end_time_monotonic = g_get_monotonic_time ();
elapsed_monotonic_seconds = 1 + (end_time_monotonic - orig_time_monotonic) / G_TIME_SPAN_SECOND;
g_assert_cmpint (elapsed_monotonic_seconds, >=, 7);
}
else
{
/* We can't really assert much about the cancel_on_set case */
}
}
static void
test_date_time_create_watch_nocancel_on_set (void)
{
test_date_time_create_watch (FALSE);
}
static void
test_date_time_create_watch_cancel_on_set (void)
{
test_date_time_create_watch (TRUE);
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -163,8 +95,6 @@ main (int argc, char *argv[])
g_test_add_func ("/timeout/seconds", test_seconds); g_test_add_func ("/timeout/seconds", test_seconds);
g_test_add_func ("/timeout/rounding", test_rounding); g_test_add_func ("/timeout/rounding", test_rounding);
g_test_add_func ("/timeout/datetime_watch_nocancel_on_set", test_date_time_create_watch_nocancel_on_set);
g_test_add_func ("/timeout/datetime_watch_cancel_on_set", test_date_time_create_watch_cancel_on_set);
return g_test_run (); return g_test_run ();
} }