[svn-commits] dhubbard: branch dhubbard/named_processors r108672 - in /team/dhubbard/named_...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Thu Mar 13 21:53:23 CDT 2008


Author: dhubbard
Date: Thu Mar 13 21:53:22 2008
New Revision: 108672

URL: http://svn.digium.com/view/asterisk?view=rev&rev=108672
Log:
more cleanup

Modified:
    team/dhubbard/named_processors/res/Makefile
    team/dhubbard/named_processors/res/res_testobserver.c
    team/dhubbard/named_processors/res/sandbox/include/simobject.h
    team/dhubbard/named_processors/res/sandbox/include/taskconsumer.h
    team/dhubbard/named_processors/res/sandbox/simobject.c
    team/dhubbard/named_processors/res/sandbox/taskconsumer.c

Modified: team/dhubbard/named_processors/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/dhubbard/named_processors/res/Makefile?view=diff&rev=108672&r1=108671&r2=108672
==============================================================================
--- team/dhubbard/named_processors/res/Makefile (original)
+++ team/dhubbard/named_processors/res/Makefile Thu Mar 13 21:53:22 2008
@@ -51,22 +51,13 @@
 #sandbox/configuration.o: sandbox/configuration.c
 #sandbox/configuration.o: ASTCFLAGS+=-I. -Isandbox
 
-sandbox/taskprocessor.o: sandbox/taskprocessor.c
-sandbox/taskprocessor.o: ASTCFLAGS+=-I. -Isandbox
-
-sandbox/task.o: sandbox/task.c
-sandbox/task.o: ASTCFLAGS+=-I. -Isandbox
-
-sandbox/taskproducer.o: sandbox/taskproducer.c
-sandbox/taskproducer.o: ASTCFLAGS+=-I. -Isandbox
-
 sandbox/taskconsumer.o: sandbox/taskconsumer.c
 sandbox/taskconsumer.o: ASTCFLAGS+=-I. -Isandbox
 
 sandbox/simobject.o: sandbox/simobject.c
 sandbox/simobject.o: ASTCFLAGS+=-I. -Isandbox
 
-$(if $(filter res_testobserver,$(EMBEDDED_MODS)),modules.link,res_testobserver.so): sandbox/configuration.o sandbox/taskprocessor.o sandbox/task.o sandbox/taskproducer.o sandbox/taskconsumer.o sandbox/simobject.o
+$(if $(filter res_testobserver,$(EMBEDDED_MODS)),modules.link,res_testobserver.so): sandbox/configuration.o sandbox/taskconsumer.o sandbox/simobject.o
 
 clean::
 	rm -f snmp/*.o

Modified: team/dhubbard/named_processors/res/res_testobserver.c
URL: http://svn.digium.com/view/asterisk/team/dhubbard/named_processors/res/res_testobserver.c?view=diff&rev=108672&r1=108671&r2=108672
==============================================================================
--- team/dhubbard/named_processors/res/res_testobserver.c (original)
+++ team/dhubbard/named_processors/res/res_testobserver.c Thu Mar 13 21:53:22 2008
@@ -49,12 +49,11 @@
 #include <asterisk/options.h>
 #include <asterisk/config.h>
 #include <asterisk/astobj2.h>
+#include <asterisk/task.h>
+#include <asterisk/taskprocessor.h>
 
 #include "sandbox/include/sandbox.h"
 #include "sandbox/include/configuration.h"
-#include "sandbox/include/task.h"
-#include "sandbox/include/taskdefinitions.h"
-#include "sandbox/include/taskprocessor.h"
 #include "sandbox/include/simobject.h"
 
 static char *app = "testobserver";
@@ -223,7 +222,6 @@
 	struct simobject* s = NULL;
 	
 	ast_log(LOG_NOTICE, "-- testobserver -- unloading.\n");
-	unregister_sandbox_taskprocessor_clis();
 	for (count=0; count < MAX_TEST_PRODUCERS; count++) {
 		s = (struct simobject *)simprod[count];
 		if ( s ) { 
@@ -272,8 +270,6 @@
 	ast_log(LOG_NOTICE, "started %d processors, task pool size: %d\n"
 		, size_of_taskprocessor_singleton_list(), task_pool_size());
 	
-	register_sandbox_taskprocessor_clis();
-	
 	if (ast_register_application(app, app_exec, synopsis, descrip))
 		return AST_MODULE_LOAD_DECLINE;
 	

Modified: team/dhubbard/named_processors/res/sandbox/include/simobject.h
URL: http://svn.digium.com/view/asterisk/team/dhubbard/named_processors/res/sandbox/include/simobject.h?view=diff&rev=108672&r1=108671&r2=108672
==============================================================================
--- team/dhubbard/named_processors/res/sandbox/include/simobject.h (original)
+++ team/dhubbard/named_processors/res/sandbox/include/simobject.h Thu Mar 13 21:53:22 2008
@@ -15,9 +15,10 @@
  * the GNU General Public License Version 2. See the LICENSE file
  * at the top of the source tree.
  */
-#include "sandbox.h"
+#include <asterisk.h>
+#include <asterisk/taskprocessor.h>
+
 #include "taskconsumer.h"
-#include "taskproducer.h"
 
 #ifndef __simobject_h__
 #define __simobject_h__

Modified: team/dhubbard/named_processors/res/sandbox/include/taskconsumer.h
URL: http://svn.digium.com/view/asterisk/team/dhubbard/named_processors/res/sandbox/include/taskconsumer.h?view=diff&rev=108672&r1=108671&r2=108672
==============================================================================
--- team/dhubbard/named_processors/res/sandbox/include/taskconsumer.h (original)
+++ team/dhubbard/named_processors/res/sandbox/include/taskconsumer.h Thu Mar 13 21:53:22 2008
@@ -15,8 +15,8 @@
  * the GNU General Public License Version 2. See the LICENSE file
  * at the top of the source tree.
  */
-#include "sandbox.h"
-#include "taskprocessor.h"
+#include <asterisk.h>
+#include <asterisk/taskprocessor.h>
 
 #ifndef __taskconsumer_h__
 #define __taskconsumer_h__

Modified: team/dhubbard/named_processors/res/sandbox/simobject.c
URL: http://svn.digium.com/view/asterisk/team/dhubbard/named_processors/res/sandbox/simobject.c?view=diff&rev=108672&r1=108671&r2=108672
==============================================================================
--- team/dhubbard/named_processors/res/sandbox/simobject.c (original)
+++ team/dhubbard/named_processors/res/sandbox/simobject.c Thu Mar 13 21:53:22 2008
@@ -15,11 +15,11 @@
  * the GNU General Public License Version 2. See the LICENSE file
  * at the top of the source tree.
  */
-#include "asterisk.h"
+#include <asterisk.h>
+#include <asterisk/taskproducer.h>
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "include/simobject.h"
-#include "include/taskdefinitions.h"
 
 static int start_simobject(struct simobject* s);
 static int start_simproducer(struct simobject* s);
@@ -248,7 +248,7 @@
 		killflag = !i->_poll_thread_run;
 		ast_mutex_unlock(&i->_taskprocessor_lock);
 	}
-	i->_is_purged = TRUE;
+	i->_is_purged = 1;
 	return NULL;
 }
 

Modified: team/dhubbard/named_processors/res/sandbox/taskconsumer.c
URL: http://svn.digium.com/view/asterisk/team/dhubbard/named_processors/res/sandbox/taskconsumer.c?view=diff&rev=108672&r1=108671&r2=108672
==============================================================================
--- team/dhubbard/named_processors/res/sandbox/taskconsumer.c (original)
+++ team/dhubbard/named_processors/res/sandbox/taskconsumer.c Thu Mar 13 21:53:22 2008
@@ -21,12 +21,12 @@
  *  task consumer is also an observer-subject than it needs to notify-observers about
  *  its event.
  */
-#include "asterisk.h"
+#include <asterisk.h>
+#include <asterisk/task.h>
+#include <asterisk/taskprocessor.h>
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "include/task.h"
 #include "include/taskconsumer.h"
-#include "include/taskprocessor.h"
 
 /* the default handler function is a failure */
 static int invalid_handle_task(struct taskconsumer* consumer, struct a_task* task)




More information about the svn-commits mailing list