X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=0f4d5ab2b9ae3c763bbbc309383e51350abc11b7;hp=692444075367238efd242fc3b1c549d74d3e2c70;hb=9c887fc97d778b4817ab59bea111f5377196d8b4;hpb=b253d10bee09bcce4b50b47bbe4b283ac8c63306 diff --git a/SimpleServer.xs b/SimpleServer.xs index 6924440..0f4d5ab 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,4 +1,8 @@ /* + + * $Id: SimpleServer.xs,v 1.22 2004-05-11 12:56:37 adam Exp $ + * ---------------------------------------------------------------------- + * * Copyright (c) 2000, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and @@ -24,59 +28,20 @@ * OF THIS SOFTWARE. */ -/*$Log: SimpleServer.xs,v $ -/*Revision 1.19 2003-09-09 11:40:10 mike -/*(Finally!) support implementation-ID -/* -/*Revision 1.18 2003/01/03 09:05:41 sondberg -/*Applied Dave's GRS-1 patch - actually this was already done in revision 1.17. -/* -/*Revision 1.16 2002/11/26 17:09:18 mike -/*basic support for idPass authentication -/* -/*Revision 1.15 2002/09/16 13:55:53 sondberg -/*Added support for authentication into SimpleServer. -/* -/*Revision 1.14 2002/03/05 00:34:13 mike -/*Support for implementation_id (commented out until it's -/*in mainstream Yaz) -/* -/*Revision 1.13 2002/02/28 11:21:57 mike -/*Add RPN structure to search-handler argument hash. -/* -/*Revision 1.12 2001/08/30 14:02:10 sondberg -/*Small changes. -/* -/*Revision 1.11 2001/08/30 13:15:11 sondberg -/*Corrected a memory leak, one more to go. -/* -/*Revision 1.10 2001/08/29 11:48:36 sondberg -/*Added routines -/* -/* Net::Z3950::SimpleServer::ScanSuccess -/* Net::Z3950::SimpleServer::ScanPartial -/* -/*and a bit of documentation. -/* -/*Revision 1.9 2001/08/24 14:00:20 sondberg -/*Added support for scan. -/* -/*Revision 1.8 2001/05/21 11:07:02 sondberg -/*Extended maximum numbers of GRS-1 elements. Should be done dynamically. -/* -/*Revision 1.7 2001/03/13 14:17:15 sondberg -/*Added support for GRS-1. -/**/ #include "EXTERN.h" #include "perl.h" +#include "embed.h" #include "XSUB.h" #include #include #include #include +#ifdef WIN32 +#else #include +#endif #include #include #define GRS_MAX_FIELDS 500 @@ -110,10 +75,50 @@ SV *present_ref = NULL; SV *esrequest_ref = NULL; SV *delete_ref = NULL; SV *scan_ref = NULL; +PerlInterpreter *root_perl_context; int MAX_OID = 15; #define GRS_BUF_SIZE 512 +CV * simpleserver_sv2cv(SV *handler) { + STRLEN len; + char *buf; + + if (SvPOK(handler)) { + CV *ret; + buf = SvPV( handler, len); + if ( !( ret = perl_get_cv(buf, FALSE ) ) ) { + fprintf( stderr, "simpleserver_sv2cv: No such handler '%s'\n\n", buf ); + exit(1); + } + + return ret; + } else { + return (CV *) handler; + } +} + + +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 ); + } + return 0; +} + + +void simpleserver_free(void) { + PerlInterpreter *current_interp = PERL_GET_CONTEXT; + + perl_destruct(current_interp); + perl_free(current_interp); + PERL_SYS_TERM(); +} + + Z_GenericRecord *read_grs1(char *str, ODR o) { int type, ivalue; @@ -554,6 +559,7 @@ int bend_search(void *handle, bend_search_rr *rr) SV *point; SV *ODR_point; Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; dSP; ENTER; @@ -590,7 +596,8 @@ int bend_search(void *handle, bend_search_rr *rr) PUTBACK; - n = perl_call_sv(search_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( search_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); SPAGAIN; @@ -719,6 +726,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) oident *oid; WRBUF oid_dotted; Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; Z_RecordComposition *composition; Z_ElementSetNames *simple; @@ -770,7 +778,8 @@ int bend_fetch(void *handle, bend_fetch_rr *rr) PUTBACK; - perl_call_sv(fetch_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( fetch_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); SPAGAIN; @@ -874,6 +883,7 @@ int bend_present(void *handle, bend_present_rr *rr) char *ODR_errstr; char *ptr; Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; /* WRBUF oid_dotted; */ @@ -921,7 +931,8 @@ int bend_present(void *handle, bend_present_rr *rr) PUTBACK; - perl_call_sv(present_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( present_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); SPAGAIN; @@ -999,8 +1010,8 @@ int bend_scan(void *handle, bend_scan_rr *rr) int term_len; SV *term_tmp; SV *entries_ref; - Zfront_handle *zhandle = (Zfront_handle *)handle; + CV* handler_cv = 0; dSP; ENTER; @@ -1037,7 +1048,8 @@ int bend_scan(void *handle, bend_scan_rr *rr) PUTBACK; - perl_call_sv(scan_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( scan_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); SPAGAIN; @@ -1108,6 +1120,7 @@ int bend_scan(void *handle, bend_scan_rr *rr) 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; @@ -1125,6 +1138,7 @@ bend_initresult *bend_init(bend_initrequest *q) char *ptr; char *user = NULL; char *passwd = NULL; + CV* handler_cv = 0; dSP; ENTER; @@ -1154,6 +1168,7 @@ bend_initresult *bend_init(bend_initrequest *q) hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0); hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0); hv_store(href, "ERR_CODE", 8, newSViv(0), 0); + hv_store(href, "ERR_STR", 7, newSViv(0), 0); hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0); hv_store(href, "HANDLE", 6, newSVsv(&sv_undef), 0); hv_store(href, "PID", 3, newSViv(getpid()), 0); @@ -1184,7 +1199,8 @@ bend_initresult *bend_init(bend_initrequest *q) if (init_ref != NULL) { - perl_call_sv(init_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( init_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); } SPAGAIN; @@ -1201,6 +1217,9 @@ bend_initresult *bend_init(bend_initrequest *q) temp = hv_fetch(href, "ERR_CODE", 8, 1); status = newSVsv(*temp); + temp = hv_fetch(href, "ERR_STR", 7, 1); + err_str = newSVsv(*temp); + temp = hv_fetch(href, "HANDLE", 6, 1); handle= newSVsv(*temp); @@ -1210,6 +1229,10 @@ bend_initresult *bend_init(bend_initrequest *q) 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); @@ -1231,6 +1254,7 @@ void bend_close(void *handle) HV *href; Zfront_handle *zhandle = (Zfront_handle *)handle; SV **temp; + CV* handler_cv = 0; dSP; ENTER; @@ -1250,7 +1274,8 @@ void bend_close(void *handle) PUTBACK; - perl_call_sv(close_ref, G_SCALAR | G_DISCARD); + handler_cv = simpleserver_sv2cv( close_ref ); + perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD); SPAGAIN; @@ -1259,6 +1284,7 @@ void bend_close(void *handle) LEAVE; xfree(handle); + simpleserver_free(); return; } @@ -1346,6 +1372,7 @@ start_server(...) strcpy(*argv_buf++, ptr); } *argv_buf = NULL; + root_perl_context = PERL_GET_CONTEXT; RETVAL = statserv_main(items, argv, bend_init, bend_close); OUTPUT: