/*
- * Copyright (c) 2000, Index Data.
+ * $Id: SimpleServer.xs,v 1.25 2004-05-14 04:07:50 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,
* OF THIS SOFTWARE.
*/
-/*$Log: SimpleServer.xs,v $
-/*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 "proto.h"
+#include "embed.h"
#include "XSUB.h"
#include <yaz/backend.h>
#include <yaz/log.h>
#include <yaz/wrbuf.h>
#include <stdio.h>
+#ifdef WIN32
+#else
#include <unistd.h>
+#endif
#include <stdlib.h>
#include <ctype.h>
#define GRS_MAX_FIELDS 500
#define sv_undef PL_sv_undef
#endif
+NMEM_MUTEX simpleserver_mutex;
+
typedef struct {
SV *handle;
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) {
+ 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);
+ 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;
SV *point;
SV *ODR_point;
Zfront_handle *zhandle = (Zfront_handle *)handle;
+ CV* handler_cv = 0;
dSP;
ENTER;
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;
oident *oid;
WRBUF oid_dotted;
Zfront_handle *zhandle = (Zfront_handle *)handle;
+ CV* handler_cv = 0;
Z_RecordComposition *composition;
Z_ElementSetNames *simple;
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;
char *ODR_errstr;
char *ptr;
Zfront_handle *zhandle = (Zfront_handle *)handle;
+ CV* handler_cv = 0;
/* WRBUF oid_dotted; */
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;
int term_len;
SV *term_tmp;
SV *entries_ref;
-
Zfront_handle *zhandle = (Zfront_handle *)handle;
+ CV* handler_cv = 0;
dSP;
ENTER;
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;
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;
char *ptr;
char *user = NULL;
char *passwd = NULL;
+ CV* handler_cv = 0;
dSP;
ENTER;
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 (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, "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);
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;
-#if 0 /* implementation_id support is not yet in mainstream Yaz */
ptr = SvPV(id, len);
q->implementation_id = (char *)xmalloc(len + 1);
strcpy(q->implementation_id, ptr);
-#endif
ptr = SvPV(name, len);
q->implementation_name = (char *)xmalloc(len + 1);
strcpy(q->implementation_name, ptr);
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;
}
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:
projects / simpleserver-moved-to-github.git / blobdiff