[svn-commits] mmichelson: branch 1.6.1 r179939 - in /branches/1.6.1: ./ doc/ res/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Mar  3 15:00:46 2009
New Revision: 179939

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179939
Log:
Merged revisions 179937 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r179937 | mmichelson | 2009-03-03 14:59:16 -0600 (Tue, 03 Mar 2009) | 20 lines
  
  Add documentation for timing modules used in Asterisk
  
  This document specifies the timing modules available in Asterisk beginning
  with Asterisk 1.6.1. The document goes into detail about the differences
  between each and gives a general overview of what timing is used for in
  Asterisk. There is also a section which can be used to help customize
  your setup or to troubleshoot timing issues you may have.
  
  I also added messages to the DAHDI timing test used in res_timing_dahdi.c
  that points to this new documentation if people experience problems.
  
  Big thanks to all who contributed comments on this.
  
  (closes issue #14490)
  Reported by: mmichelson
  Patches:
        timing.txt uploaded by mmichelson (license )
  
  Review: http://reviewboard.digium.com/r/164/
........

Added:
    branches/1.6.1/doc/timing.txt
      - copied unchanged from r179937, trunk/doc/timing.txt
Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_timing_dahdi.c

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

Modified: branches/1.6.1/res/res_timing_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/res/res_timing_dahdi.c?view=diff&rev=179939&r1=179938&r2=179939
==============================================================================
--- branches/1.6.1/res/res_timing_dahdi.c (original)
+++ branches/1.6.1/res/res_timing_dahdi.c Tue Mar  3 15:00:46 2009
@@ -137,6 +137,8 @@
 	return 1000;
 }
 
+#define SEE_TIMING "For more information on Asterisk timing modules, including ways to potentially fix this problem, please see doc/timing.txt\n"
+
 static int dahdi_test_timer(void)
 {
 	int fd;
@@ -149,13 +151,13 @@
 	}
 
 	if (ioctl(fd, DAHDI_TIMERCONFIG, &x)) {
-		ast_log(LOG_ERROR, "You have DAHDI built and drivers loaded, but the DAHDI timer test failed to set DAHDI_TIMERCONFIG to %d.\n", x);
+		ast_log(LOG_ERROR, "You have DAHDI built and drivers loaded, but the DAHDI timer test failed to set DAHDI_TIMERCONFIG to %d.\n" SEE_TIMING, x);
 		close(fd);
 		return -1;
 	}
 
 	if ((x = ast_wait_for_input(fd, 300)) < 0) {
-		ast_log(LOG_ERROR, "You have DAHDI built and drivers loaded, but the DAHDI timer could not be polled during the DAHDI timer test.\n");
+		ast_log(LOG_ERROR, "You have DAHDI built and drivers loaded, but the DAHDI timer could not be polled during the DAHDI timer test.\n" SEE_TIMING);
 		close(fd);
 		return -1;
 	}
@@ -167,7 +169,7 @@
 			"\n\t2. You only have to load DAHDI drivers if you want to take advantage of DAHDI services.  One option is to unload DAHDI modules if you don't need them."
 			"\n\t3. If you need DAHDI services, you must correctly configure DAHDI."
 		};
-		ast_log(LOG_ERROR, "%s\n", dahdi_timer_error);
+		ast_log(LOG_ERROR, "%s\n" SEE_TIMING, dahdi_timer_error);
 		usleep(100);
 		close(fd);
 		return -1;