[svn-commits] dhubbard: branch dhubbard/named_processors r107997 - /team/dhubbard/named_pro...

[SVN commits to the Digium repositories]

Author: dhubbard
Date: Wed Mar 12 01:50:18 2008
New Revision: 107997

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107997
Log:
make it compile

Modified:
    team/dhubbard/named_processors/include/asterisk/task.h
    team/dhubbard/named_processors/include/asterisk/taskprocessor.h
    team/dhubbard/named_processors/include/asterisk/taskproducer.h

Modified: team/dhubbard/named_processors/include/asterisk/task.h
URL: http://svn.digium.com/view/asterisk/team/dhubbard/named_processors/include/asterisk/task.h?view=diff&rev=107997&r1=107996&r2=107997
==============================================================================
--- team/dhubbard/named_processors/include/asterisk/task.h (original)
+++ team/dhubbard/named_processors/include/asterisk/task.h Wed Mar 12 01:50:18 2008
@@ -15,7 +15,6 @@
  * the GNU General Public License Version 2. See the LICENSE file
  * at the top of the source tree.
  */
-#include "sandbox.h"
 #include <sys/time.h>
 #include "asterisk.h"
 #include "asterisk/lock.h"
@@ -27,14 +26,13 @@
 #define __task_h__
 
 struct a_task {
-	unsigned long _id;
-	char _source[256];
+	int (* execute)(struct a_task* t);
+	void *_datap;
+	size_t _datapsize;
 	void* _p_producer;
 	void* _p_consumer;
-	
-	int (* execute)(struct a_task* t);
-	
 	time_t _timestamp;
+	char _source[256];
 	AST_LIST_ENTRY(a_task) list;
 };
 
@@ -42,8 +40,7 @@
  * get an available a_task structure from the pool of available
  * structures.  If no structures are available, allocate one
  */
-struct a_task* get_available_task(unsigned long id, char* src);
-struct a_task* get_available_task_with_handler(unsigned long id, char* src, int (*f)(struct a_task* t));
+struct a_task* get_available_task(int (*task_exe)(struct a_task *task), void* datap, size_t size, char* src);
 int task_pool_size(void);
 /*
  * release a_task structure back to the pool
@@ -53,7 +50,6 @@
 int stop_taskpool(void);
 int destroy_task_pool(void);
 
-int invalid_task_execute(struct a_task* t);
 int noop_task_execute(struct a_task* t);
 
 #endif

Modified: team/dhubbard/named_processors/include/asterisk/taskprocessor.h
URL: http://svn.digium.com/view/asterisk/team/dhubbard/named_processors/include/asterisk/taskprocessor.h?view=diff&rev=107997&r1=107996&r2=107997
==============================================================================
--- team/dhubbard/named_processors/include/asterisk/taskprocessor.h (original)
+++ team/dhubbard/named_processors/include/asterisk/taskprocessor.h Wed Mar 12 01:50:18 2008
@@ -15,7 +15,6 @@
  * 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/lock.h"
 #include "asterisk/linkedlists.h"

Modified: team/dhubbard/named_processors/include/asterisk/taskproducer.h
URL: http://svn.digium.com/view/asterisk/team/dhubbard/named_processors/include/asterisk/taskproducer.h?view=diff&rev=107997&r1=107996&r2=107997
==============================================================================
--- team/dhubbard/named_processors/include/asterisk/taskproducer.h (original)
+++ team/dhubbard/named_processors/include/asterisk/taskproducer.h Wed Mar 12 01:50:18 2008
@@ -15,7 +15,7 @@
  * 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 "task.h"
 #include "taskprocessor.h"
 
@@ -23,13 +23,12 @@
 #define __taskproducer_h__
 
 struct taskproducer {
-	void* _owner;
 	struct taskprocessor_singleton_info* _taskprocessor;
 	unsigned long _tasks_produced;
 
 	int (* queue_task)(struct taskproducer* producer, struct a_task* task);
 }; 
 
-struct taskproducer* construct_taskproducer(void* owner, struct taskprocessor_singleton_info* processor);
+struct taskproducer* construct_taskproducer(struct taskprocessor_singleton_info* processor);
 #endif