Fixed memory leak in perl_destruct/perl_free: now using context of Perl
interpreter to be destroyed.
Fixed memory leak in bend_init: added sv_free of href in bend_init.
Reduced size of code for bend_init/bend_search by avoiding introducing
of a few temporary SVs.
- * $Id: SimpleServer.xs,v 1.28 2004-06-05 07:55:05 adam Exp $
+ * $Id: SimpleServer.xs,v 1.29 2004-06-05 22:18:09 adam Exp $
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
* ----------------------------------------------------------------------
*
* Copyright (c) 2000-2004, Index Data.
-/* debuggin routine to check for destruction of Perl interpreters */
-#if 0
+/* debugging routine to check for destruction of Perl interpreters */
+#if 1
int tst_clones(void)
{
int i;
PerlInterpreter *parent = PERL_GET_CONTEXT;
for (i = 0; i<500; i++)
{
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 );
+ PerlInterpreter *perl_interp;
+
+ PL_perl_destruct_level = 2;
+ perl_interp = perl_clone(parent, 0);
PL_perl_destruct_level = 2;
PL_perl_destruct_level = 2;
- PERL_SET_CONTEXT( parent );
perl_destruct(perl_interp);
perl_free(perl_interp);
}
perl_destruct(perl_interp);
perl_free(perl_interp);
}
*/
if (current_interp != root_perl_context) {
PL_perl_destruct_level = 2;
*/
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);
}
perl_destruct(current_interp);
perl_free(current_interp);
}
PUTBACK;
FREETMPS;
LEAVE;
PUTBACK;
FREETMPS;
LEAVE;
HV *href;
AV *aref;
SV **temp;
HV *href;
AV *aref;
SV **temp;
- SV *hits;
- SV *err_code;
- SV *err_str;
char *ODR_errstr;
STRLEN len;
int i;
char *ODR_errstr;
STRLEN len;
int i;
SPAGAIN;
temp = hv_fetch(href, "HITS", 4, 1);
SPAGAIN;
temp = hv_fetch(href, "HITS", 4, 1);
+ rr->hits = SvIV(*temp);
temp = hv_fetch(href, "ERR_CODE", 8, 1);
temp = hv_fetch(href, "ERR_CODE", 8, 1);
- err_code = newSVsv(*temp);
+ rr->errcode = SvIV(*temp);
temp = hv_fetch(href, "ERR_STR", 7, 1);
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);
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
- PUTBACK;
- FREETMPS;
- LEAVE;
-
hv_undef(href);
av_undef(aref);
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;
- handle = zhandle;
- sv_free(hits);
- sv_free(err_code);
- sv_free(err_str);
sv_free( (SV*) aref);
sv_free( (SV*) href);
sv_free( (SV*) aref);
sv_free( (SV*) href);
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
temp = hv_fetch(href, "HANDLE", 6, 1);
point = newSVsv(*temp);
- PUTBACK;
- FREETMPS;
- LEAVE;
sv_free(err_code),
sv_free(sur_flag);
sv_free(rep_form);
sv_free(err_code),
sv_free(sur_flag);
sv_free(rep_form);
+
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
int bend_present(void *handle, bend_present_rr *rr)
{
int bend_present(void *handle, bend_present_rr *rr)
{
HV *href;
SV **temp;
SV *err_code;
HV *href;
SV **temp;
SV *err_code;
bend_initresult *bend_init(bend_initrequest *q)
{
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;
- NMEM nmem = nmem_create();
- Zfront_handle *zhandle = (Zfront_handle *) nmem_malloc (nmem,
- 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;
char *ptr;
char *user = NULL;
char *passwd = NULL;
CV* handler_cv = 0;
+ STRLEN len;
+ NMEM nmem = nmem_create();
+ Zfront_handle *zhandle = (Zfront_handle *) nmem_malloc (nmem,
+ sizeof(*zhandle));
+ SV *handle;
+ HV *href;
+ SV **temp;
+ SV *status;
+
{
q->bend_scan = bend_scan;
}
{
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);
href = newHV();
hv_store(href, "IMP_ID", 6, newSVpv("", 0), 0);
hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0);
- XPUSHs(sv_2mortal(newRV( (SV*) href)));
+ XPUSHs(sv_2mortal(newRV((SV*) href)));
SPAGAIN;
temp = hv_fetch(href, "IMP_ID", 6, 1);
SPAGAIN;
temp = hv_fetch(href, "IMP_ID", 6, 1);
+ ptr = SvPV(*temp, len);
+ q->implementation_id = nmem_strdup(nmem, ptr);
temp = hv_fetch(href, "IMP_NAME", 8, 1);
temp = hv_fetch(href, "IMP_NAME", 8, 1);
+ ptr = SvPV(*temp, len);
+ q->implementation_name = nmem_strdup(nmem, ptr);
temp = hv_fetch(href, "IMP_VER", 7, 1);
temp = hv_fetch(href, "IMP_VER", 7, 1);
+ ptr = SvPV(*temp, len);
+ q->implementation_version = nmem_strdup(nmem, ptr);
temp = hv_fetch(href, "ERR_CODE", 8, 1);
temp = hv_fetch(href, "ERR_CODE", 8, 1);
- status = newSVsv(*temp);
+ r->errcode = SvIV(*temp);
temp = hv_fetch(href, "ERR_STR", 7, 1);
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);
temp = hv_fetch(href, "HANDLE", 6, 1);
handle= newSVsv(*temp);
+ zhandle->handle = handle;
+
+ r->handle = zhandle;
PUTBACK;
FREETMPS;
LEAVE;
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 = nmem_strdup(nmem, ptr);
- ptr = SvPV(name, len);
- q->implementation_name = nmem_strdup(nmem, ptr);
- ptr = SvPV(ver, len);
- q->implementation_version = nmem_strdup(nmem, ptr);
void bend_close(void *handle)
{
HV *href;
void bend_close(void *handle)
{
HV *href;
SV **temp;
CV* handler_cv = 0;
int stop_flag = 0;
SV **temp;
CV* handler_cv = 0;
int stop_flag = 0;
+ dSP;
+ ENTER;
+ SAVETMPS;
- dSP;
- ENTER;
- SAVETMPS;
href = newHV();
hv_store(href, "HANDLE", 6, zhandle->handle, 0);
href = newHV();
hv_store(href, "HANDLE", 6, zhandle->handle, 0);
- PUTBACK;
- FREETMPS;
- LEAVE;
+ sv_free(zhandle->handle);
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
stop_flag = zhandle->stop_flag;
nmem_destroy(zhandle->nmem);
simpleserver_free();
stop_flag = zhandle->stop_flag;
nmem_destroy(zhandle->nmem);
simpleserver_free();
root_perl_context = PERL_GET_CONTEXT;
nmem_mutex_create(&simpleserver_mutex);
#if 0
root_perl_context = PERL_GET_CONTEXT;
nmem_mutex_create(&simpleserver_mutex);
#if 0
+ /* only for debugging perl_clone .. */