X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=44f182c8df92cd2b50ad4360f91e2f28fdc8d766;hp=0f4d5ab2b9ae3c763bbbc309383e51350abc11b7;hb=bf76c3f6ff0e224efce7e47f9f778f6379a3e504;hpb=9c887fc97d778b4817ab59bea111f5377196d8b4 diff --git a/SimpleServer.xs b/SimpleServer.xs index 0f4d5ab..44f182c 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,9 +1,8 @@ /* - - * $Id: SimpleServer.xs,v 1.22 2004-05-11 12:56:37 adam Exp $ + * $Id: SimpleServer.xs,v 1.28 2004-06-05 07:55:05 adam Exp $ * ---------------------------------------------------------------------- * - * Copyright (c) 2000, Index Data. + * Copyright (c) 2000-2004, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, @@ -28,10 +27,9 @@ * OF THIS SOFTWARE. */ - - #include "EXTERN.h" #include "perl.h" +#include "proto.h" #include "embed.h" #include "XSUB.h" #include @@ -52,6 +50,8 @@ #define sv_undef PL_sv_undef #endif +NMEM_MUTEX simpleserver_mutex; + typedef struct { SV *handle; @@ -64,8 +64,12 @@ typedef struct { SV *esrequest_ref; SV *delete_ref; SV *scan_ref; + NMEM nmem; + int stop_flag; /* is used to stop server prematurely .. */ } Zfront_handle; +#define ENABLE_STOP_SERVER 0 + SV *init_ref = NULL; SV *close_ref = NULL; SV *sort_ref = NULL; @@ -98,24 +102,66 @@ CV * simpleserver_sv2cv(SV *handler) { } } +/* debuggin routine to check for destruction of Perl interpreters */ +#if 0 +int tst_clones(void) +{ + int i; + PerlInterpreter *parent = PERL_GET_CONTEXT; + for (i = 0; i<500; i++) + { + PerlInterpreter *perl_interp = perl_clone(parent, 0); + PERL_SET_CONTEXT( perl_interp ); + PL_perl_destruct_level = 2; + PERL_SET_CONTEXT( parent ); + perl_destruct(perl_interp); + perl_free(perl_interp); + } + exit (0); +} +#endif int simpleserver_clone(void) { - PerlInterpreter *current = PERL_GET_CONTEXT; - - if (!current) { - PerlInterpreter *perl_interp = perl_clone(root_perl_context, CLONEf_COPY_STACKS); - PERL_SET_CONTEXT( perl_interp ); +#ifdef USE_ITHREADS + nmem_mutex_enter(simpleserver_mutex); + if (1) + { + PerlInterpreter *current = PERL_GET_CONTEXT; + + /* if current is unset, then we're in a new thread with + * no Perl interpreter for it. So we must create one . + * This will only happen when threaded is used.. + */ + if (!current) { + PerlInterpreter *perl_interp; + PERL_SET_CONTEXT( root_perl_context ); + perl_interp = perl_clone(root_perl_context, 0); + PERL_SET_CONTEXT( perl_interp ); + } } + nmem_mutex_leave(simpleserver_mutex); +#endif return 0; } void simpleserver_free(void) { - PerlInterpreter *current_interp = PERL_GET_CONTEXT; - - perl_destruct(current_interp); - perl_free(current_interp); - PERL_SYS_TERM(); + nmem_mutex_enter(simpleserver_mutex); + if (1) + { + PerlInterpreter *current_interp = PERL_GET_CONTEXT; + + /* If current Perl Interp is different from root interp, then + * we're in threaded mode and we must destroy.. + */ + if (current_interp != root_perl_context) { + PL_perl_destruct_level = 2; + PERL_SET_CONTEXT(root_perl_context); + perl_destruct(current_interp); + perl_free(current_interp); + } + } + nmem_mutex_leave(simpleserver_mutex); } @@ -571,6 +617,12 @@ int bend_search(void *handle, bend_search_rr *rr) { av_push(aref, newSVpv(*basenames++, 0)); } +#if ENABLE_STOP_SERVER + if (rr->num_bases == 1 && !strcmp(rr->basenames[0], "XXstop")) + { + zhandle->stop_flag = 1; + } +#endif href = newHV(); hv_store(href, "SETNAME", 7, newSVpv(rr->setname, 0), 0); hv_store(href, "REPL_SET", 8, newSViv(rr->replace_set), 0); @@ -625,9 +677,7 @@ int bend_search(void *handle, bend_search_rr *rr) ODR_errstr = (char *)odr_malloc(rr->stream, len + 1); strcpy(ODR_errstr, ptr); rr->errstring = ODR_errstr; -/* ODR_point = (SV *)odr_malloc(rr->stream, sizeof(*point)); - memcpy(ODR_point, point, sizeof(*point)); - zhandle->handle = ODR_point;*/ + zhandle->handle = point; handle = zhandle; sv_free(hits); @@ -1129,7 +1179,9 @@ bend_initresult *bend_init(bend_initrequest *q) SV *ver; SV *err_str; SV *status; - Zfront_handle *zhandle = (Zfront_handle *) xmalloc (sizeof(*zhandle)); + NMEM nmem = nmem_create(); + Zfront_handle *zhandle = (Zfront_handle *) nmem_malloc (nmem, + sizeof(*zhandle)); STRLEN len; int n; SV *handle; @@ -1144,6 +1196,8 @@ bend_initresult *bend_init(bend_initrequest *q) ENTER; SAVETMPS; + zhandle->nmem = nmem; + zhandle->stop_flag = 0; /*q->bend_sort = bend_sort;*/ if (search_ref) { @@ -1235,15 +1289,11 @@ bend_initresult *bend_init(bend_initrequest *q) sv_free(err_str); r->handle = zhandle; ptr = SvPV(id, len); - q->implementation_id = (char *)xmalloc(len + 1); - strcpy(q->implementation_id, ptr); + q->implementation_id = nmem_strdup(nmem, ptr); ptr = SvPV(name, len); - q->implementation_name = (char *)xmalloc(len + 1); - strcpy(q->implementation_name, ptr); -/* q->implementation_name = SvPV(name, len);*/ + q->implementation_name = nmem_strdup(nmem, ptr); ptr = SvPV(ver, len); - q->implementation_version = (char *)xmalloc(len + 1); - strcpy(q->implementation_version, ptr); + q->implementation_version = nmem_strdup(nmem, ptr); return r; } @@ -1255,37 +1305,37 @@ void bend_close(void *handle) Zfront_handle *zhandle = (Zfront_handle *)handle; SV **temp; CV* handler_cv = 0; + int stop_flag = 0; - dSP; - ENTER; - SAVETMPS; - - if (close_ref == NULL) + if (close_ref) { - return; - } - - href = newHV(); - hv_store(href, "HANDLE", 6, zhandle->handle, 0); + dSP; + ENTER; + SAVETMPS; + href = newHV(); + hv_store(href, "HANDLE", 6, zhandle->handle, 0); - PUSHMARK(sp); + PUSHMARK(sp); - XPUSHs(sv_2mortal(newRV((SV *)href))); + XPUSHs(sv_2mortal(newRV((SV *)href))); - PUTBACK; + PUTBACK; - handler_cv = simpleserver_sv2cv( close_ref ); - perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( close_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); - SPAGAIN; - - PUTBACK; - FREETMPS; - LEAVE; + SPAGAIN; - xfree(handle); + PUTBACK; + FREETMPS; + LEAVE; + } + stop_flag = zhandle->stop_flag; + nmem_destroy(zhandle->nmem); simpleserver_free(); - + + if (stop_flag) + exit(0); return; } @@ -1373,6 +1423,10 @@ start_server(...) } *argv_buf = NULL; root_perl_context = PERL_GET_CONTEXT; + nmem_mutex_create(&simpleserver_mutex); +#if 0 + tst_clones(); +#endif RETVAL = statserv_main(items, argv, bend_init, bend_close); OUTPUT: