X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=9e276217aeb2ed5525f2427a8c5959fbbaf7162e;hp=5fe2cfa0399331bdb642db891b12e8265fcc999e;hb=c7145efffe9cfd830ba341d782e8b07ca0a6b40f;hpb=657bd74a4d71b1125a3bff1fe99631591ddf1873 diff --git a/SimpleServer.xs b/SimpleServer.xs index 5fe2cfa..9e27621 100644 --- a/SimpleServer.xs +++ b/SimpleServer.xs @@ -1,5 +1,8 @@ /* - * Copyright (c) 2000, Index Data. + * $Id: SimpleServer.xs,v 1.26 2004-05-29 07:04:26 adam Exp $ + * ---------------------------------------------------------------------- + * + * 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, @@ -24,43 +27,19 @@ * OF THIS SOFTWARE. */ -/*$Log: SimpleServer.xs,v $ -/*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 "proto.h" +#include "embed.h" #include "XSUB.h" #include #include #include #include +#ifdef WIN32 +#else #include +#endif #include #include #define GRS_MAX_FIELDS 500 @@ -71,6 +50,8 @@ #define sv_undef PL_sv_undef #endif +NMEM_MUTEX simpleserver_mutex; + typedef struct { SV *handle; @@ -94,28 +75,121 @@ 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; + } +} + +/* 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) { +#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) { + 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); +} + Z_GenericRecord *read_grs1(char *str, ODR o) { int type, ivalue; - char line[512], *buf, *ptr, *original; - char value[512]; + char line[GRS_BUF_SIZE+1], *buf, *ptr, *original; + char value[GRS_BUF_SIZE+1]; Z_GenericRecord *r = 0; original = str; + r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r)); + r->elements = (Z_TaggedElement **) odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS); + r->num_elements = 0; + for (;;) { Z_TaggedElement *t; Z_ElementData *c; + int len; ptr = strchr(str, '\n'); if (!ptr) { return r; } - strncpy(line, str, ptr - str); - line[ptr - str] = 0; + len = ptr - str; + if (len > GRS_BUF_SIZE) { + yaz_log(LOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE); + len = GRS_BUF_SIZE; + } + strncpy(line, str, len); + line[len] = 0; buf = line; str = ptr + 1; while (*buf && isspace(*buf)) @@ -127,25 +201,16 @@ Z_GenericRecord *read_grs1(char *str, ODR o) if (sscanf(buf, "(%d,%[^)])", &type, value) != 2) { yaz_log(LOG_WARN, "Bad data in '%s'", buf); - return 0; + return r; } if (!type && *value == '0') return r; if (!(buf = strchr(buf, ')'))) - return 0; + return r; buf++; while (*buf && isspace(*buf)) buf++; - if (!*buf) - return 0; - if (!r) - { - r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r)); - r->elements = (Z_TaggedElement **) - odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS); - r->num_elements = 0; - } - if (r->num_elements > GRS_MAX_FIELDS) + if (r->num_elements >= GRS_MAX_FIELDS) { yaz_log(LOG_WARN, "Max number of GRS-1 elements exceeded [GRS_MAX_FIELDS=%d]", GRS_MAX_FIELDS); exit(0); @@ -179,8 +244,6 @@ Z_GenericRecord *read_grs1(char *str, ODR o) else { c->which = Z_ElementData_string; -/* buf[strlen(buf)-1] = '\0';*/ - buf[strlen(buf)] = '\0'; c->u.string = odr_strdup(o, buf); } r->num_elements++; @@ -538,6 +601,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; @@ -574,7 +638,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; @@ -703,6 +768,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; @@ -754,7 +820,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; @@ -858,6 +925,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; */ @@ -905,7 +973,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; @@ -983,8 +1052,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; @@ -1021,7 +1090,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; @@ -1092,9 +1162,11 @@ 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; + SV *id; SV *name; SV *ver; SV *err_str; @@ -1106,6 +1178,9 @@ bend_initresult *bend_init(bend_initrequest *q) /*char *name_ptr; char *ver_ptr;*/ char *ptr; + char *user = NULL; + char *passwd = NULL; + CV* handler_cv = 0; dSP; ENTER; @@ -1131,12 +1206,32 @@ 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); 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); + if (q->auth) { + if (q->auth->which == Z_IdAuthentication_open) { + char *openpass = xstrdup (q->auth->u.open); + char *cp = strchr (openpass, '/'); + if (cp) { + *cp = '\0'; + user = nmem_strdup (odr_getmem (q->stream), openpass); + passwd = nmem_strdup (odr_getmem (q->stream), cp + 1); + } + xfree(openpass); + } else if (q->auth->which == Z_IdAuthentication_idPass) { + user = q->auth->u.idPass->userId; + passwd = q->auth->u.idPass->password; + } + /* ### some code paths have user/password unassigned here */ + hv_store(href, "USER", 4, newSVpv(user, 0), 0); + hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0); + } PUSHMARK(sp); @@ -1146,11 +1241,15 @@ 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; + temp = hv_fetch(href, "IMP_ID", 6, 1); + id = newSVsv(*temp); + temp = hv_fetch(href, "IMP_NAME", 8, 1); name = newSVsv(*temp); @@ -1160,6 +1259,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); @@ -1169,7 +1271,14 @@ 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); + strcpy(q->implementation_id, ptr); ptr = SvPV(name, len); q->implementation_name = (char *)xmalloc(len + 1); strcpy(q->implementation_name, ptr); @@ -1187,34 +1296,34 @@ void bend_close(void *handle) HV *href; Zfront_handle *zhandle = (Zfront_handle *)handle; SV **temp; + CV* handler_cv = 0; - dSP; - ENTER; - SAVETMPS; - if (close_ref == NULL) + if (close_ref) { - return; - } + dSP; + ENTER; + SAVETMPS; + href = newHV(); + hv_store(href, "HANDLE", 6, zhandle->handle, 0); - 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; - 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; - - PUTBACK; - FREETMPS; - LEAVE; + SPAGAIN; + PUTBACK; + FREETMPS; + LEAVE; + } xfree(handle); + simpleserver_free(); return; } @@ -1302,6 +1411,11 @@ start_server(...) strcpy(*argv_buf++, ptr); } *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: