/*
-
- * $Id: SimpleServer.xs,v 1.21 2004-05-11 12:15:16 sondberg 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,
* OF THIS SOFTWARE.
*/
-
-
#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;
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;
}
}
+/* 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<5000; i++)
+ {
+ PerlInterpreter *perl_interp;
+
+ PERL_SET_CONTEXT(parent);
+ PL_perl_destruct_level = 2;
+ 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);
+ }
+ 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, CLONEf_CLONE_HOST);
+ 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(current_interp);
+ perl_destruct(current_interp);
+ perl_free(current_interp);
+ }
+ }
+ nmem_mutex_leave(simpleserver_mutex);
}
temp = hv_fetch(href, "STATUS", 6, 1);
status = newSVsv(*temp);
-
-
-
PUTBACK;
FREETMPS;
LEAVE;
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;
{
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);
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;
}
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
- PUTBACK;
- FREETMPS;
- LEAVE;
hv_undef(href);
sv_free(err_code),
sv_free(sur_flag);
sv_free(rep_form);
+
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
return 0;
}
int bend_present(void *handle, bend_present_rr *rr)
{
-
HV *href;
SV **temp;
SV *err_code;
char *ODR_errstr;
STRLEN len;
int term_len;
- SV *term_tmp;
SV *entries_ref;
Zfront_handle *zhandle = (Zfront_handle *)handle;
CV* handler_cv = 0;
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;
-
- PERL_SET_CONTEXT(PERL_GET_THX);
-
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)
{
{
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);
PUSHMARK(sp);
- XPUSHs(sv_2mortal(newRV( (SV*) href)));
+ XPUSHs(sv_2mortal(newRV((SV*) href)));
PUTBACK;
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 == NULL)
+ if (close_ref)
{
- return;
- }
+ 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;
- 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;
+ SPAGAIN;
+ sv_free((SV*) href);
+ }
+ else
+ sv_free(zhandle->handle);
PUTBACK;
FREETMPS;
LEAVE;
-
- xfree(handle);
+ stop_flag = zhandle->stop_flag;
+ nmem_destroy(zhandle->nmem);
simpleserver_free();
-
+
+ if (stop_flag)
+ exit(0);
return;
}
}
*argv_buf = NULL;
root_perl_context = PERL_GET_CONTEXT;
+ nmem_mutex_create(&simpleserver_mutex);
+#if 0
+ /* only for debugging perl_clone .. */
+ tst_clones();
+#endif
RETVAL = statserv_main(items, argv, bend_init, bend_close);
OUTPUT:
projects / simpleserver-moved-to-github.git / blobdiff