[asterisk-commits] seanbright: branch 1.6.2 r240227 - in /branches/1.6.2: ./ res/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Jan 14 14:35:51 2010
New Revision: 240227

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240227
Log:
Merged revisions 240226 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240226 | seanbright | 2010-01-14 15:30:03 -0500 (Thu, 14 Jan 2010) | 4 lines
  
  If we aren't running on a machine that support CLOCK_MONOTONIC, don't load.
  
  Group developed and tested by seanbright, Corydon76, Kobaz, and Amorsen.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/res/res_timing_timerfd.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/res/res_timing_timerfd.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/res_timing_timerfd.c?view=diff&rev=240227&r1=240226&r2=240227
==============================================================================
--- branches/1.6.2/res/res_timing_timerfd.c (original)
+++ branches/1.6.2/res/res_timing_timerfd.c Thu Jan 14 14:35:51 2010
@@ -262,6 +262,16 @@
 
 static int load_module(void)
 {
+	int fd;
+
+	/* Make sure we support the necessary clock type */
+	if ((fd = timerfd_create(CLOCK_MONOTONIC, 0)) < 0) {
+		ast_log(LOG_ERROR, "CLOCK_MONOTONIC not supported.  Not loading.\n");
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	close(fd);
+
 	if (!(timerfd_timers = ao2_container_alloc(TIMERFD_TIMER_BUCKETS, timerfd_timer_hash, timerfd_timer_cmp))) {
 		return AST_MODULE_LOAD_DECLINE;
 	}