X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=34cbb9a99e95d5cb2097b8197d4a7a49e2fd8994;hp=13ea3e5fd34051ba1ecd993b05011bcc20f8b454;hb=5b833f1b8ce65bd8c7a1d1afb57dc329f7693a9d;hpb=94e43eb8f5155e810f5e04efca59214408221205 diff --git a/SimpleServer.xs b/SimpleServer.xs index 13ea3e5..34cbb9a 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,9 +1,8 @@ /* - - * $Id: SimpleServer.xs,v 1.23 2004-05-13 18:55:40 adam Exp $ + * $Id: SimpleServer.xs,v 1.33 2004-06-07 17:00:55 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 @@ -66,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; @@ -100,18 +102,21 @@ CV * simpleserver_sv2cv(SV *handler) { } } -/* debuggin routine to check for destruction of Perl interpreters */ -#if 0 -int tst_clones(void) +/* debugging routine to check for destruction of Perl interpreters */ +#ifdef USE_ITHREADS +void tst_clones(void) { int i; PerlInterpreter *parent = PERL_GET_CONTEXT; - for (i = 0; i<500; i++) + for (i = 0; i<5000; i++) { - PerlInterpreter *perl_interp = perl_clone(parent, 0); - PERL_SET_CONTEXT( perl_interp ); + PerlInterpreter *perl_interp; + + PERL_SET_CONTEXT(parent); PL_perl_destruct_level = 2; - PERL_SET_CONTEXT( parent ); + perl_interp = perl_clone(parent, CLONEf_CLONE_HOST); + PL_perl_destruct_level = 2; + PERL_SET_CONTEXT(perl_interp); perl_destruct(perl_interp); perl_free(perl_interp); } @@ -120,6 +125,7 @@ int tst_clones(void) #endif int simpleserver_clone(void) { +#ifdef USE_ITHREADS nmem_mutex_enter(simpleserver_mutex); if (1) { @@ -130,12 +136,14 @@ int simpleserver_clone(void) { * This will only happen when threaded is used.. */ if (!current) { + PerlInterpreter *perl_interp; PERL_SET_CONTEXT( root_perl_context ); - PerlInterpreter *perl_interp = perl_clone(root_perl_context, 0); + perl_interp = perl_clone(root_perl_context, CLONEf_CLONE_HOST); PERL_SET_CONTEXT( perl_interp ); } } nmem_mutex_leave(simpleserver_mutex); +#endif return 0; } @@ -151,7 +159,7 @@ void simpleserver_free(void) { */ if (current_interp != root_perl_context) { PL_perl_destruct_level = 2; - PERL_SET_CONTEXT(root_perl_context); + PERL_SET_CONTEXT(current_interp); perl_destruct(current_interp); perl_free(current_interp); } @@ -558,9 +566,6 @@ int bend_sort(void *handle, bend_sort_rr *rr) temp = hv_fetch(href, "STATUS", 6, 1); status = newSVsv(*temp); - - - PUTBACK; FREETMPS; LEAVE; @@ -587,18 +592,13 @@ int bend_search(void *handle, bend_search_rr *rr) HV *href; AV *aref; SV **temp; - SV *hits; - SV *err_code; - SV *err_str; char *ODR_errstr; STRLEN len; int i; char **basenames; - int n; WRBUF query; char *ptr; SV *point; - SV *ODR_point; Zfront_handle *zhandle = (Zfront_handle *)handle; CV* handler_cv = 0; @@ -612,6 +612,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); @@ -643,41 +649,30 @@ int bend_search(void *handle, bend_search_rr *rr) SPAGAIN; temp = hv_fetch(href, "HITS", 4, 1); - hits = newSVsv(*temp); + rr->hits = SvIV(*temp); temp = hv_fetch(href, "ERR_CODE", 8, 1); - err_code = newSVsv(*temp); + rr->errcode = SvIV(*temp); temp = hv_fetch(href, "ERR_STR", 7, 1); - err_str = newSVsv(*temp); + ptr = SvPV(*temp, len); + ODR_errstr = (char *)odr_malloc(rr->stream, len + 1); + strcpy(ODR_errstr, ptr); + rr->errstring = ODR_errstr; temp = hv_fetch(href, "HANDLE", 6, 1); point = newSVsv(*temp); - PUTBACK; - FREETMPS; - LEAVE; - hv_undef(href); av_undef(aref); - rr->hits = SvIV(hits); - rr->errcode = SvIV(err_code); - ptr = SvPV(err_str, len); - 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); - sv_free(err_code); - sv_free(err_str); sv_free( (SV*) aref); sv_free( (SV*) href); - /*sv_free(point);*/ wrbuf_free(query, 1); + PUTBACK; + FREETMPS; + LEAVE; return 0; } @@ -848,9 +843,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) temp = hv_fetch(href, "HANDLE", 6, 1); point = newSVsv(*temp); - PUTBACK; - FREETMPS; - LEAVE; hv_undef(href); @@ -904,6 +896,10 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) sv_free(err_code), sv_free(sur_flag); sv_free(rep_form); + + PUTBACK; + FREETMPS; + LEAVE; return 0; } @@ -911,7 +907,6 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) int bend_present(void *handle, bend_present_rr *rr) { - HV *href; SV **temp; SV *err_code; @@ -1049,7 +1044,6 @@ int bend_scan(void *handle, bend_scan_rr *rr) char *ODR_errstr; STRLEN len; int term_len; - SV *term_tmp; SV *entries_ref; Zfront_handle *zhandle = (Zfront_handle *)handle; CV* handler_cv = 0; @@ -1158,33 +1152,29 @@ int bend_scan(void *handle, bend_scan_rr *rr) return 0; } - bend_initresult *bend_init(bend_initrequest *q) { - int dummy = simpleserver_clone(); - bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r)); - HV *href; - SV **temp; - SV *id; - SV *name; - SV *ver; - SV *err_str; - SV *status; - Zfront_handle *zhandle = (Zfront_handle *) xmalloc (sizeof(*zhandle)); - STRLEN len; - int n; - SV *handle; - /*char *name_ptr; - char *ver_ptr;*/ + int dummy = simpleserver_clone(); + bend_initresult *r = (bend_initresult *) + odr_malloc (q->stream, sizeof(*r)); char *ptr; char *user = NULL; char *passwd = NULL; CV* handler_cv = 0; - dSP; + STRLEN len; + NMEM nmem = nmem_create(); + Zfront_handle *zhandle = (Zfront_handle *) nmem_malloc (nmem, + sizeof(*zhandle)); + SV *handle; + HV *href; + SV **temp; + ENTER; SAVETMPS; + zhandle->nmem = nmem; + zhandle->stop_flag = 0; /*q->bend_sort = bend_sort;*/ if (search_ref) { @@ -1204,6 +1194,7 @@ bend_initresult *bend_init(bend_initrequest *q) { q->bend_scan = bend_scan; } + href = newHV(); hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0); hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0); @@ -1234,7 +1225,7 @@ bend_initresult *bend_init(bend_initrequest *q) PUSHMARK(sp); - XPUSHs(sv_2mortal(newRV( (SV*) href))); + XPUSHs(sv_2mortal(newRV((SV*) href))); PUTBACK; @@ -1247,62 +1238,53 @@ bend_initresult *bend_init(bend_initrequest *q) SPAGAIN; temp = hv_fetch(href, "IMP_ID", 6, 1); - id = newSVsv(*temp); + ptr = SvPV(*temp, len); + q->implementation_id = nmem_strdup(nmem, ptr); temp = hv_fetch(href, "IMP_NAME", 8, 1); - name = newSVsv(*temp); + ptr = SvPV(*temp, len); + q->implementation_name = nmem_strdup(nmem, ptr); temp = hv_fetch(href, "IMP_VER", 7, 1); - ver = newSVsv(*temp); + ptr = SvPV(*temp, len); + q->implementation_version = nmem_strdup(nmem, ptr); temp = hv_fetch(href, "ERR_CODE", 8, 1); - status = newSVsv(*temp); + r->errcode = SvIV(*temp); temp = hv_fetch(href, "ERR_STR", 7, 1); - err_str = newSVsv(*temp); + ptr = SvPV(*temp, len); + r->errstring = (char *)odr_malloc(q->stream, len + 1); + strcpy(r->errstring, ptr); temp = hv_fetch(href, "HANDLE", 6, 1); handle= newSVsv(*temp); + zhandle->handle = handle; + + r->handle = zhandle; hv_undef(href); + sv_free((SV*) href); + PUTBACK; FREETMPS; LEAVE; - zhandle->handle = handle; - r->errcode = SvIV(status); - ptr = SvPV(err_str, len); - r->errstring = (char *)odr_malloc(q->stream, len + 1); - strcpy(r->errstring, ptr); - sv_free(err_str); - r->handle = zhandle; - ptr = SvPV(id, len); - q->implementation_id = (char *)xmalloc(len + 1); - strcpy(q->implementation_id, ptr); - ptr = SvPV(name, len); - q->implementation_name = (char *)xmalloc(len + 1); - strcpy(q->implementation_name, ptr); -/* q->implementation_name = SvPV(name, len);*/ - ptr = SvPV(ver, len); - q->implementation_version = (char *)xmalloc(len + 1); - strcpy(q->implementation_version, ptr); - return r; + return r; } - void bend_close(void *handle) { HV *href; Zfront_handle *zhandle = (Zfront_handle *)handle; - SV **temp; CV* handler_cv = 0; - + int stop_flag = 0; + dSP; + ENTER; + SAVETMPS; if (close_ref) { - dSP; - ENTER; - SAVETMPS; href = newHV(); hv_store(href, "HANDLE", 6, zhandle->handle, 0); @@ -1317,13 +1299,19 @@ void bend_close(void *handle) SPAGAIN; - PUTBACK; - FREETMPS; - LEAVE; + sv_free((SV*) href); } - xfree(handle); + else + sv_free(zhandle->handle); + PUTBACK; + FREETMPS; + LEAVE; + stop_flag = zhandle->stop_flag; + nmem_destroy(zhandle->nmem); simpleserver_free(); - + + if (stop_flag) + exit(0); return; } @@ -1413,6 +1401,7 @@ start_server(...) root_perl_context = PERL_GET_CONTEXT; nmem_mutex_create(&simpleserver_mutex); #if 0 + /* only for debugging perl_clone .. */ tst_clones(); #endif