Allow more spans than 32. Also, rearrange compiler flags so the most often

used flags appear closer to the top.
Reported by: tzafrir
Patch by: tzafrir,tilghman
(Closes issue #11528)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94818 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 2cd423e..87b21e5 100644 (file)
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -1,24 +1,20 @@
        <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
-               <member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
-               </member>
-               <member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
+               <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
                </member>
                <member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
                </member>
-               <member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
-               </member>
-               <member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
-                       <depend>DEBUG_THREADS</depend>
+               <member name="STATIC_BUILD" displayname="Build static binaries">
                </member>
-               <member name="DO_CRASH" displayname="Crash on fatal errors">
+               <member name="LOADABLE_MODULES" displayname="Runtime module loading">
+                       <defaultenabled>yes</defaultenabled>
                </member>
-               <member name="THREAD_CRASH" displayname="Crash on mutex errors">
+               <member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
                </member>
-               <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
+               <member name="LOTS_OF_SPANS" displayname="More than 32 Zaptel spans">
                </member>
-               <member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
+               <member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
                </member>
-               <member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
+               <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
                </member>
                <member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
                        <defaultenabled>no</defaultenabled>
@@ -33,17 +29,23 @@
                <member name="TEST_TANDEM_TRANSCODING" displayname="New ulaw/alaw codec, turn on transcoding tests on init">
                        <depend>G711_NEW_ALGORITHM</depend>
                </member>
-               <member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
+               <member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
                </member>
-               <member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
+               <member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
                </member>
-               <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
+               <member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
+               </member>
+               <member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
+                       <depend>DEBUG_THREADS</depend>
+               </member>
+               <member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
+               </member>
+               <member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
                </member>
                <member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
                </member>
-               <member name="STATIC_BUILD" displayname="Build static binaries">
+               <member name="DO_CRASH" displayname="Crash on fatal errors">
                </member>
-               <member name="LOADABLE_MODULES" displayname="Runtime module loading">
-                       <defaultenabled>yes</defaultenabled>
+               <member name="THREAD_CRASH" displayname="Crash on mutex errors">
                </member>
        </category>

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 0e01298..76ece38 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -205,7 +205,11 @@ static const char config[] = "zapata.conf";
 #define SIG_GR303FXOKS (0x0100000 | ZT_SIG_FXOKS)
 #define SIG_GR303FXSKS (0x0100000 | ZT_SIG_FXSKS)
 
+#ifdef LOTS_OF_SPANS
+#define NUM_SPANS      ZT_MAX_SPANS
+#else
 #define NUM_SPANS              32
+#endif
 #define NUM_DCHANS             4       /*!< No more than 4 d-channels */
 #define MAX_CHANNELS   672             /*!< No more than a DS3 per trunk group */