richter 02/05/20 00:04:25
Modified: . Tag: Embperl2c epcache.c epdom.c epinit.c epmem.c
epprovider.c eputil.c
Embperl Tag: Embperl2c Object.pm
Log:
-
Revision Changes Path
No revision
No revision
1.1.2.25 +14 -4 embperl/Attic/epcache.c
Index: epcache.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcache.c,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- epcache.c 25 Feb 2002 11:37:57 -0000 1.1.2.24
+++ epcache.c 20 May 2002 07:04:24 -0000 1.1.2.25
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcache.c,v 1.1.2.24 2002/02/25 11:37:57 richter Exp $
+# $Id: epcache.c,v 1.1.2.25 2002/05/20 07:04:24 richter Exp $
#
###################################################################################*/
@@ -17,6 +17,12 @@
#include "epmacro.h"
+/* --- don't use Perl's memory management here --- */
+
+#undef malloc
+#undef realloc
+#undef strdup
+#undef free
HV * pProviders ; /**< global hash that holds all known providers classes */
@@ -85,6 +91,9 @@
pCacheItems = newHV () ;
ArrayNew (a, &pCachesToRelease, 16, sizeof (tCacheItem *)) ;
+
+ /* lprintf (a, "XXXXX Cache_Init [%d/%d] pProviders=%x pCacheItems=%x
pCachesToRelease=%x", _getpid(), GetCurrentThreadId(), pProviders, pCacheItems,
pCachesToRelease) ; */
+
return ok ;
}
@@ -116,6 +125,8 @@
int n = ArrayGetSize (r -> pApp, pCachesToRelease) ;
int i ;
+ /* lprintf (r -> pApp, "XXXXX Cache_CleanupRequest [%d/%d] pProviders=%x
pCacheItems=%x pCachesToRelease=%x", _getpid(), GetCurrentThreadId(), pProviders,
pCacheItems, pCachesToRelease) ; */
+
for (i = 0; i < n; i++)
Cache_FreeContent (r, pCachesToRelease[i]) ;
@@ -248,6 +259,8 @@
const char * sKey = "" ;
STRLEN len ;
+ /* lprintf (r -> pApp, "XXXXX Cache_New [%d/%d] pProviders=%x %s
pCacheItems=%x %s pCachesToRelease=%x %s\n", _getpid(), GetCurrentThreadId(),
pProviders, IsBadReadPtr (pProviders,4 )?"bad":"ok", pCacheItems, IsBadReadPtr
(pCacheItems, 4)?"bad":"ok", pCachesToRelease, IsBadReadPtr (pCachesToRelease,
4)?"bad":"ok") ; */
+
if (SvTYPE(pParam) == SVt_RV)
pParam = SvRV (pParam) ;
@@ -266,13 +279,11 @@
if (!ppRV || !*ppRV)
{
strncpy (r -> errdat1, "<provider missing>", sizeof(r -> errdat1) - 1) ;
-
return rcUnknownProvider ;
}
if (!SvROK (*ppRV) || SvTYPE(pProviderParam = (HV *)SvRV (*ppRV)) !=
SVt_PVHV)
{
strncpy (r -> errdat1, "<provider missing, element is no hashref>",
sizeof(r -> errdat1) - 1) ;
-
return rcUnknownProvider ;
}
}
@@ -283,7 +294,6 @@
else
{
strncpy (r -> errdat1, "<provider missing, no description found>", sizeof(r
-> errdat1) - 1) ;
-
return rcUnknownProvider ;
}
1.4.2.88 +11 -1 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.87
retrieving revision 1.4.2.88
diff -u -r1.4.2.87 -r1.4.2.88
--- epdom.c 17 May 2002 14:07:01 -0000 1.4.2.87
+++ epdom.c 20 May 2002 07:04:24 -0000 1.4.2.88
@@ -9,13 +9,23 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdom.c,v 1.4.2.87 2002/05/17 14:07:01 richter Exp $
+# $Id: epdom.c,v 1.4.2.88 2002/05/20 07:04:24 richter Exp $
#
###################################################################################*/
#include "ep.h"
#include "epmacro.h"
+
+
+/* --- don't use Perl's memory management here --- */
+
+#undef malloc
+#undef realloc
+#undef strdup
+#undef free
+
+
HV * pStringTableHash ; /* Hash to translate strings to index number */
HE * * pStringTableArray ; /* Array with pointers to strings */
1.1.2.49 +5 -1 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.48
retrieving revision 1.1.2.49
diff -u -r1.1.2.48 -r1.1.2.49
--- epinit.c 20 May 2002 06:09:50 -0000 1.1.2.48
+++ epinit.c 20 May 2002 07:04:24 -0000 1.1.2.49
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epinit.c,v 1.1.2.48 2002/05/20 06:09:50 richter Exp $
+# $Id: epinit.c,v 1.1.2.49 2002/05/20 07:04:24 richter Exp $
#
###################################################################################*/
@@ -1299,9 +1299,13 @@
tainted = 0 ;
+ /*if (r -> Config.bDebug)
+ lprintf (r -> pApp, "[%d]ep_acquire_mutex(RequestCountMutex)\n", r -> pThread
-> nPid) ; */
ep_acquire_mutex(RequestCountMutex) ;
r -> nRequestCount = nRequestCount++ ;
ep_release_mutex(RequestCountMutex) ;
+ /*if (r -> Config.bDebug)
+ lprintf (r -> pApp, "[%d]ep_release_mutex(RequestCountMutex)\n", r -> pThread
-> nPid) ; */
r -> nRequestTime = time(NULL) ;
r -> pErrArray = newAV () ;
1.1.2.6 +2 -2 embperl/Attic/epmem.c
Index: epmem.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epmem.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- epmem.c 12 Mar 2002 04:52:07 -0000 1.1.2.5
+++ epmem.c 20 May 2002 07:04:24 -0000 1.1.2.6
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmem.c,v 1.1.2.5 2002/03/12 04:52:07 richter Exp $
+# $Id: epmem.c,v 1.1.2.6 2002/05/20 07:04:24 richter Exp $
#
###################################################################################*/
@@ -112,7 +112,7 @@
#endif
-/* --- don't use Perl's memory management here and io layer --- */
+/* --- don't use Perl's memory management and io layer here --- */
#undef malloc
#undef free
1.1.2.33 +5 -1 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.32
retrieving revision 1.1.2.33
diff -u -r1.1.2.32 -r1.1.2.33
--- epprovider.c 25 Feb 2002 11:20:26 -0000 1.1.2.32
+++ epprovider.c 20 May 2002 07:04:24 -0000 1.1.2.33
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epprovider.c,v 1.1.2.32 2002/02/25 11:20:26 richter Exp $
+# $Id: epprovider.c,v 1.1.2.33 2002/05/20 07:04:24 richter Exp $
#
###################################################################################*/
@@ -1150,6 +1150,8 @@
if ((rc = Provider_NewDependOne (r, sizeof(tProviderEpCompile), "source",
pItem, pProviderClass, pProviderParam, pParam, nParamIndex)) != ok)
return rc ;
+ /*if (r -> Config.bDebug)
+ lprintf (r -> pApp, "[%d]ep_acquire_mutex(PackageCountMutex)\n", r -> pThread
-> nPid) ; */
if (sPackage = GetHashValueStrDupA (aTHX_ pProviderParam, "package", r ->
Component.Config.sPackage))
{
int n ;
@@ -1171,6 +1173,8 @@
sMainSub = ((tProviderEpCompile *)(pItem -> pProvider)) -> sMainSub =
malloc (40) ;
sprintf (sMainSub, "_ep_main%d", n) ;
}
+ /*if (r -> Config.bDebug)
+ lprintf (r -> pApp, "[%d]ep_release_mutex(PackageCountMutex)\n", r -> pThread
-> nPid) ; */
return ok ;
}
1.15.4.53 +5 -1 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.52
retrieving revision 1.15.4.53
diff -u -r1.15.4.52 -r1.15.4.53
--- eputil.c 11 Apr 2002 06:44:14 -0000 1.15.4.52
+++ eputil.c 20 May 2002 07:04:25 -0000 1.15.4.53
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eputil.c,v 1.15.4.52 2002/04/11 06:44:14 richter Exp $
+# $Id: eputil.c,v 1.15.4.53 2002/05/20 07:04:25 richter Exp $
#
###################################################################################*/
@@ -723,9 +723,13 @@
#ifdef PERL_IMPLICIT_CONTEXT
pTHX ;
if (r)
+ {
aTHX = r -> pPerlTHX ;
+ }
else
+ {
aTHX = PERL_GET_THX ;
+ }
#endif
/*EPENTRY (GetHashValueInt) ;*/
No revision
No revision
1.1.2.21 +1 -7 embperl/Embperl/Attic/Object.pm
Index: Object.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Object.pm,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- Object.pm 20 May 2002 06:57:35 -0000 1.1.2.20
+++ Object.pm 20 May 2002 07:04:25 -0000 1.1.2.21
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Object.pm,v 1.1.2.20 2002/05/20 06:57:35 richter Exp $
+# $Id: Object.pm,v 1.1.2.21 2002/05/20 07:04:25 richter Exp $
#
###################################################################################
@@ -130,13 +130,7 @@
my ($rc, $r) = Embperl::Req::InitRequest ($req -> {req_rec}, $req) ;
return $rc if ($rc) ;
- warn "rc = $rc r = $r" ;
-
- use Data::Dumper ;
- print Dumper ($r) ;
-
my $app = $r -> app ;
-
my $appcfg = $app -> config;
my $cwd ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
