richter 02/01/19 05:45:40
Modified: . Tag: Embperl2c Embperl.pm Embperl.xs Makefile.PL
epcomp.c epinit.c epnames.h eppublic.h typemap
xsbuilder/maps Tag: Embperl2c ep_function.map
Log:
new data structure
Revision Changes Path
No revision
No revision
1.118.4.77 +13 -4 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.76
retrieving revision 1.118.4.77
diff -u -r1.118.4.76 -r1.118.4.77
--- Embperl.pm 18 Jan 2002 16:22:36 -0000 1.118.4.76
+++ Embperl.pm 19 Jan 2002 13:45:39 -0000 1.118.4.77
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.76 2002/01/18 16:22:36 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.77 2002/01/19 13:45:39 richter Exp $
#
###################################################################################
@@ -24,8 +24,17 @@
require Exporter;
require DynaLoader;
-use HTML::Embperl::Syntax ;
-use HTML::Embperl::Recipe ;
+use Embperl::Syntax ;
+use Embperl::Recipe ;
+use Embperl::Thread ;
+use Embperl::App ;
+use Embperl::App::Config ;
+use Embperl::Req ;
+use Embperl::Req::Config ;
+use Embperl::Req::Param ;
+use Embperl::Component ;
+use Embperl::Component::Config ;
+use Embperl::Component::Param ;
use strict ;
@@ -58,6 +67,6 @@
my $rc ;
my $param = shift ;
- my $r = InitRequest (undef, $param) ;
+ my $r = Embperl::Req::InitRequest (undef, $param) ;
}
1.29.4.36 +9 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.35
retrieving revision 1.29.4.36
diff -u -r1.29.4.35 -r1.29.4.36
--- Embperl.xs 17 Jan 2002 23:16:17 -0000 1.29.4.35
+++ Embperl.xs 19 Jan 2002 13:45:40 -0000 1.29.4.36
@@ -12,3 +12,12 @@
#
###################################################################################*/
+#include "ep.h"
+#include "xs/ep_xs_typedefs.h"
+
+MODULE = Embperl PACKAGE = Embperl PREFIX = embperl_
+
+int
+embperl_Init(pApacheSrvSV, pPerlParam)
+ SV * pApacheSrvSV
+ SV * pPerlParam
1.31.4.41 +18 -15 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.40
retrieving revision 1.31.4.41
diff -u -r1.31.4.40 -r1.31.4.41
--- Makefile.PL 18 Jan 2002 16:22:36 -0000 1.31.4.40
+++ Makefile.PL 19 Jan 2002 13:45:40 -0000 1.31.4.41
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter ([EMAIL PROTECTED]) / ECOS
#
-# $Id: Makefile.PL,v 1.31.4.40 2002/01/18 16:22:36 richter Exp $
+# $Id: Makefile.PL,v 1.31.4.41 2002/01/19 13:45:40 richter Exp $
#
@@ -1142,11 +1142,26 @@
$i .= " -I $EPPATH/xs" ;
+%MMARGS = (
+ 'LIBS' => [$libs || ''],
+ 'DEFINE' => "$d \$(DEFS)",
+ 'INC' => "-I $EPPATH $i",
+ ) ;
+
+
+
+open FH, ">xs/mmargs.pl" or die "Cannot open xs/mmargs.pl ($!)" ;
+print FH Data::Dumper -> Dump ([\%MMARGS], ['MMARGS']) ;
+close FH ;
+
+
+
+
WriteMakefile(
'NAME' => 'Embperl',
'VERSION_FROM' => 'Embperl.pm', # finds $VERSION
- 'OBJECT' => 'epmain$(OBJ_EXT) epio$(OBJ_EXT) epchar$(OBJ_EXT)
eputil$(OBJ_EXT) epeval$(OBJ_EXT) epapinit$(OBJ_EXT) ' .
- ($EP2?'epmem$(OBJ_EXT) epinit$(OBJ_EXT) epcgiinit$(OBJ_EXT)
epcmd2$(OBJ_EXT) epparse$(OBJ_EXT) epdom$(OBJ_EXT) epcomp$(OBJ_EXT) epcache$(OBJ_EXT)
epprovider$(OBJ_EXT)':'epcmd$(OBJ_EXT) Embperl$(OBJ_EXT) ') . $o,
+ 'OBJECT' => 'Embperl$(OBJ_EXT) epmain$(OBJ_EXT) epio$(OBJ_EXT)
epchar$(OBJ_EXT) eputil$(OBJ_EXT) epeval$(OBJ_EXT) epapinit$(OBJ_EXT) ' .
+ ($EP2?'epmem$(OBJ_EXT) epinit$(OBJ_EXT) epcgiinit$(OBJ_EXT)
epcmd2$(OBJ_EXT) epparse$(OBJ_EXT) epdom$(OBJ_EXT) epcomp$(OBJ_EXT) epcache$(OBJ_EXT)
epprovider$(OBJ_EXT)':'epcmd$(OBJ_EXT) ') . $o,
'LIBS' => [$libs || ''],
'DEFINE' => "$d \$(DEFS)",
'INC' => $i,
@@ -1161,18 +1176,6 @@
'macro' => $makemacros,
$EP2?('depend' => { 'Embperl.c' => 'Embperl.xs DOM.xs Cmd.xs Syntax.xs'
}):(),
);
-
-%MMARGS = (
- 'LIBS' => [$libs || ''],
- 'DEFINE' => "$d \$(DEFS)",
- 'INC' => "-I $EPPATH $i",
- ) ;
-
-
-
-open FH, ">xs/mmargs.pl" or die "Cannot open xs/mmargs.pl ($!)" ;
-print FH Data::Dumper -> Dump ([\%MMARGS], ['MMARGS']) ;
-close FH ;
1.4.2.87 +2 -2 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.86
retrieving revision 1.4.2.87
diff -u -r1.4.2.86 -r1.4.2.87
--- epcomp.c 18 Jan 2002 16:22:36 -0000 1.4.2.86
+++ epcomp.c 19 Jan 2002 13:45:40 -0000 1.4.2.87
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcomp.c,v 1.4.2.86 2002/01/18 16:22:36 richter Exp $
+# $Id: epcomp.c,v 1.4.2.87 2002/01/19 13:45:40 richter Exp $
#
###################################################################################*/
@@ -2053,7 +2053,7 @@
pCallerDomTree = DomTree_self (r -> Component.xCurrDomTree) ;
/* xDocFraq = Node_replaceChildWithNode (pSubDomTree, pSubDomTree -> xDocument,
pCallerDomTree, r -> Component.pCurrEscape) ; */
- r -> Component.pCurrEscape = xDocFraq = Node_insertAfter (r -> pApp,
pSubDomTree, pSubDomTree -> xDocument, 0, pCallerDomTree, (int)(r ->
Component.pCurrEscape), r -> Component.nCurrRepeatLevel) ;
+ r -> Component.xCurrNode = xDocFraq = Node_insertAfter (r -> pApp, pSubDomTree,
pSubDomTree -> xDocument, 0, pCallerDomTree, (int)(r -> Component.pCurrEscape), r ->
Component.nCurrRepeatLevel) ;
/* Element_selfSetAttribut (pCallerDomTree, Node_self (pCallerDomTree,
xDocFraq), NULL, xOrderIndexAttr, NULL, nOrderNdx, 0) ; */
1.1.2.10 +9 -10 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- epinit.c 18 Jan 2002 16:22:36 -0000 1.1.2.9
+++ epinit.c 19 Jan 2002 13:45:40 -0000 1.1.2.10
@@ -10,13 +10,15 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epinit.c,v 1.1.2.9 2002/01/18 16:22:36 richter Exp $
+# $Id: epinit.c,v 1.1.2.10 2002/01/19 13:45:40 richter Exp $
#
###################################################################################*/
#include "ep.h"
#include "epmacro.h"
+#include "xs/ep_xs_typedefs.h"
+#include "xs/ep_xs_sv_convert.h"
@@ -54,9 +56,6 @@
static char sStateHashName [] = "HTML::Embperl::sdat" ;
static char sModHashName [] = "HTML::Embperl::mdat" ;
-#define EMBPERL_CREATE(c) epxs_##EMBPERL_PACKAGE##__##c##_create_obj
-#define EMBPERL_INIT(c) EMBPERL_PACKAGE##__##c##_new_init
-
static int bInitDone = 0 ; /* c part is already initialized */
static int nRequestCount = 1 ;
static perl_mutex RequestCountMutex ;
@@ -115,7 +114,7 @@
SV * pThreadSV ;
tMemPool * pPool = ep_make_sub_pool (pMainPool) ;
- EMBPERL_CREATE(ThreadData)(pThread,pThreadSV,pThreadRV) ;
+
epxs_Embperl__Thread_create_obj(pThread,pThreadSV,pThreadRV,ep_palloc(pPool,sizeof(*pThread)))
;
#ifdef PERL_IMPLICIT_CONTEXT
pThread -> pPerlTHX = aTHX ;
#endif
@@ -251,7 +250,7 @@
tMemPool * pPool = ep_make_sub_pool (pThread -> pPool) ;
- EMBPERL_CREATE(App)(pApp,pAppSV,pAppRV,ep_palloc(pPool,sizeof(*pApp))) ;
+
epxs_Embperl__App_create_obj(pApp,pAppSV,pAppRV,ep_palloc(pPool,sizeof(*pApp))) ;
#ifdef PERL_IMPLICIT_CONTEXT
pApp -> pPerlTHX = aTHX ;
#endif
@@ -294,7 +293,7 @@
}
*/
- EMBPERL_INIT(App)(pApp, pPerlParam) ;
+ Embperl__App_new_init(pApp, pPerlParam) ;
}
*ppApp = pApp ;
@@ -451,7 +450,7 @@
/* ---------------------------------------------------------------------------- */
int embperl_Init (/*in*/ pTHX_
- /*in*/ server_rec * pApacheSrvSV,
+ /*in*/ SV * pApacheSrvSV,
/*in*/ SV * pPerlParam)
{
@@ -879,7 +878,7 @@
#endif
tMemPool * pPool = ep_make_sub_pool (pApp -> pPool) ;
- EMBPERL_CREATE(Req)(r,pReqSV,pReqRV,ep_palloc(pPool,sizeof(*r))) ;
+ epxs_Embperl__Req_create_obj(r,pReqSV,pReqRV,ep_palloc(pPool,sizeof(*r))) ;
#ifdef PERL_IMPLICIT_CONTEXT
r -> pPerlTHX = aTHX ;
#endif
@@ -1023,7 +1022,7 @@
tComponent * c ;
epTHX ;
- EMBPERL_CREATE(Component)(c,pComponentSV,
pComponentRV,ep_palloc(r->pPool,sizeof(*c))) ;
+ epxs_Embperl__Component_create_obj(c,pComponentSV,
pComponentRV,ep_palloc(r->pPool,sizeof(*c))) ;
/* for performance reason we copy the actual component directly into the
request object */
1.19.4.17 +27 -1 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.19.4.16
retrieving revision 1.19.4.17
diff -u -r1.19.4.16 -r1.19.4.17
--- epnames.h 18 Jan 2002 16:22:36 -0000 1.19.4.16
+++ epnames.h 19 Jan 2002 13:45:40 -0000 1.19.4.17
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epnames.h,v 1.19.4.16 2002/01/18 16:22:36 richter Exp $
+# $Id: epnames.h,v 1.19.4.17 2002/01/19 13:45:40 richter Exp $
#
###################################################################################*/
@@ -417,3 +417,29 @@
#endif
+#ifndef INT2PTR
+
+/* taken from perl 5.6.1 perl.h */
+
+#if (IVSIZE == PTRSIZE) && (UVSIZE == PTRSIZE)
+# define PTRV UV
+# define INT2PTR(any,d) (any)(d)
+#else
+# if PTRSIZE == LONGSIZE
+# define PTRV unsigned long
+# else
+# define PTRV unsigned
+# endif
+# define INT2PTR(any,d) (any)(PTRV)(d)
+#endif
+#define NUM2PTR(any,d) (any)(PTRV)(d)
+#define PTR2IV(p) INT2PTR(IV,p)
+#define PTR2UV(p) INT2PTR(UV,p)
+#define PTR2NV(p) NUM2PTR(NV,p)
+#if PTRSIZE == LONGSIZE
+# define PTR2ul(p) (unsigned long)(p)
+#else
+# define PTR2ul(p) INT2PTR(unsigned long,p)
+#endif
+
+#endif
1.1.2.3 +2 -2 embperl/Attic/eppublic.h
Index: eppublic.h
===================================================================
RCS file: /home/cvs/embperl/Attic/eppublic.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- eppublic.h 18 Jan 2002 16:22:36 -0000 1.1.2.2
+++ eppublic.h 19 Jan 2002 13:45:40 -0000 1.1.2.3
@@ -10,13 +10,13 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eppublic.h,v 1.1.2.2 2002/01/18 16:22:36 richter Exp $
+# $Id: eppublic.h,v 1.1.2.3 2002/01/19 13:45:40 richter Exp $
#
###################################################################################*/
int embperl_Init (pTHX_
- server_rec * pApacheSrvSV,
+ SV * pApacheSrvSV,
SV * pPerlParam) ;
int embperl_InitRequest ( pTHX_
1.3.4.6 +1 -0 embperl/typemap
Index: typemap
===================================================================
RCS file: /home/cvs/embperl/typemap,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -u -r1.3.4.5 -r1.3.4.6
--- typemap 7 Mar 2001 08:18:27 -0000 1.3.4.5
+++ typemap 19 Jan 2002 13:45:40 -0000 1.3.4.6
@@ -6,6 +6,7 @@
tTokenTable * T_PTROBJ_SYNTAX
AV * T_MYAVREF
HV * T_MYHVREF
+Apache::Server T_PTROBJ
INPUT
T_MYAVREF
No revision
No revision
1.1.2.3 +1 -1 embperl/xsbuilder/maps/Attic/ep_function.map
Index: ep_function.map
===================================================================
RCS file: /home/cvs/embperl/xsbuilder/maps/Attic/ep_function.map,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ep_function.map 18 Jan 2002 16:22:38 -0000 1.1.2.2
+++ ep_function.map 19 Jan 2002 13:45:40 -0000 1.1.2.3
@@ -1,5 +1,5 @@
-MODULE=Embperl PREFIX=embperl_
+MODULE=Embperl::Req PREFIX=embperl_
embperl_Init
embperl_InitRequest | | pApacheReqSV,pPerlParam,<ppReq
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
