1 files changed, 107 insertions, 8 deletions

diff --git a/libraries/luaproc/luaproc.h b/LuaSL/src/LuaSL_threads.h
index 1286107..b12a50d 100644
--- a/libraries/luaproc/luaproc.h
+++ b/LuaSL/src/LuaSL_threads.h
@@ -1,4 +1,8 @@
-/***************************************************
+/* This code is heavily based on luaproc.
+ *
+ * The luaproc copyright notice and license is -
+
+ ***************************************************
 
 Copyright 2008 Alexandre Skyrme, Noemi Rodriguez, Roberto Ierusalimschy
 
@@ -20,16 +24,48 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-*****************************************************
+ ****************************************************
+ *
+ * Additions and changes Copyright 2012 by David Seikel, using the above license.
+ */
+
+#ifndef __LUASL_THREADS_H__
+#define __LUASL_THREADS_H__
+
+//#include <Ecore.h>
+
+
+#define CHANNEL_MAX_NAME_LENGTH 255
+
+#define CHANNEL_DESTROYED 0
+
+/* message channel pointer type */
+typedef struct stchannel *channel;
+
+
+
+/* scheduler function return constants */
+#define LUAPROC_SCHED_OK                                                0
+#define LUAPROC_SCHED_SOCKET_ERROR                              -1
+#define LUAPROC_SCHED_SETSOCKOPT_ERROR                  -2
+#define LUAPROC_SCHED_BIND_ERROR                                -3
+#define LUAPROC_SCHED_LISTEN_ERROR                              -4
+#define LUAPROC_SCHED_FORK_ERROR                                -5
+#define LUAPROC_SCHED_PTHREAD_ERROR                             -6
+#define LUAPROC_SCHED_INIT_ERROR                                -7
+
+/* ready process queue insertion status */
+#define LUAPROC_SCHED_QUEUE_PROC_OK             0
+#define LUAPROC_SCHED_QUEUE_PROC_ERR    -1
 
-[luaproc.h]
+/* scheduler listener service default hostname and port */
+#define LUAPROC_SCHED_DEFAULT_HOST "127.0.0.1"
+#define LUAPROC_SCHED_DEFAULT_PORT 3133
+
+/* scheduler default number of worker threads */
+#define LUAPROC_SCHED_DEFAULT_WORKER_THREADS    1
 
-****************************************************/
-#ifndef _LUAPROC_H_
-#define _LUAPROC_H_
 
-#include "channel.h"
-#include <Ecore.h>
 
 /* process is idle */
 #define LUAPROC_STAT_IDLE                       0
@@ -45,6 +81,68 @@ THE SOFTWARE.
 /* lua process pointer type */
 typedef struct stluaproc *luaproc;
 
+
+
+
+
+/* initialize channels */
+void channel_init( void );
+
+/* create new channel */
+channel channel_create( const char *cname );
+
+/* destroy a channel */
+int channel_destroy( channel chan, const char *chname );
+
+/* search for and return a channel with a given name */
+channel channel_search( const char *cname );
+
+/* return a channel's send queue */
+Eina_Clist *channel_get_sendq( channel chan );
+
+/* return a channel's receive queue */
+Eina_Clist *channel_get_recvq( channel chan );
+
+/* return a channel's mutex */
+pthread_mutex_t *channel_get_mutex( channel chan );
+
+/* return a channel's conditional variable */
+pthread_cond_t *channel_get_cond( channel chan );
+
+
+
+
+
+
+/* initialize local scheduler */
+int sched_init_local( int numworkers );
+
+/* initialize socket enabled scheduler */
+int sched_init_socket( int numworkers, const char *host, int port );
+
+/* exit scheduler */
+void sched_exit( void );
+
+/* move process to ready queue (ie, schedule process) */
+int sched_queue_proc( luaproc lp );
+
+/* join all worker threads and exit */
+void sched_join_workerthreads( void );
+
+/* increase active luaproc count */
+void sched_lpcount_inc( void );
+
+/* decrease active luaproc count */
+void sched_lpcount_dec( void );
+
+/* create a new worker pthread */
+int sched_create_worker( void );
+
+
+
+
+
+
 void luaprocInit(void);
 void luaprocRegister(lua_State *L);
 int newProc(const char *code, int file, Ecore_Cb callback, void *data);
@@ -97,4 +195,5 @@ luaproc luaproc_recycle_pop( void );
 /* add a lua process to the recycle list */
 int luaproc_recycle_push( luaproc lp );
 
+
 #endif