mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-05-31 09:11:11 +00:00
* GSWeb.framework/GSWApplication.m
(GSWApplicationMainReal): Reformat. Use GSCurrentThread instead of objc_thread_id. Remove \n in NSLog type logs. (GSWApplicationMain): Ditto. ([GSWApplication init], [GSWApplication lockRequestHandling], [GSWApplication unlockRequestHandling], [GSWApplication lock], [GSWApplication unlock], [GSWApplication _sessionClass], [GSWApplication run], [GSWApplication addDynCreateClassName:superClassName:], [GSWApplication pageWithName:], [GSWApplication dynamicElementWithName:associations:template:]): Ditto. * GSWeb.framework/GSWComponent.m ([GSWComponent appendToResponse:inContext:], [GSWComponent templateWithHTMLString:declarationString:languages:]): Ditto. * GSWeb.framework/GSWContext.m ([GSWContext dealloc], [GSWContext setValidate:]): Ditto. * GSWeb.framework/GSWDebug.m (GSWLogC_, GSWLogDumpObjectFn): Ditto. * GSWeb.framework/GSWDefaultAdaptor.m ([GSWDefaultAdaptor registerForEvents], [GSWDefaultAdaptor announceNewConnection:], [GSWDefaultAdaptor adaptorThreadExited:], [GSWDefaultAdaptor tryLock]): Ditto. * GSWeb.framework/GSWDefaultAdaptorThread.m ([GSWDefaultAdaptorThread setPool:destroyLast:], [GSWDefaultAdaptorThread run:], [GSWDefaultAdaptorThread threadExited], [GSWDefaultAdaptorThread isExpired], [GSWDefaultAdaptorThread sendRetryLasterResponseToStream:], [GSWDefaultAdaptorThread sendConnectionRefusedResponseToStream:withMessage:]): Ditto. * GSWeb.framework/GSWDeployedBundle.m ([GSWDeployedBundle initWithPath:], [GSWDeployedBundle dealloc], [GSWDeployedBundle lock], [GSWDeployedBundle unlock]): Ditto. * GSWeb.framework/GSWLifebeatThread.m ([GSWLifebeatThread setPool:destroyLast:], [GSWLifebeatThread threadExited]): Ditto. * GSWeb.framework/GSWSession.m ([GSWSession initWithCoder:], [GSWSession _releaseAutoreleasePool]): Ditto. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18611 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
c62d15ffe2
commit
8c0a3efa9f
10 changed files with 326 additions and 232 deletions
|
@ -61,7 +61,7 @@ RCS_ID("$Id$")
|
|||
_absolutePathsCache=[NSMutableDictionary new];
|
||||
_urlsCache=[NSMutableDictionary new];
|
||||
#ifndef NDEBUG
|
||||
_creation_thread_id=objc_thread_id();
|
||||
_creation_thread_id=GSCurrentThread();
|
||||
#endif
|
||||
_selfLock=[NSRecursiveLock new];
|
||||
};
|
||||
|
@ -80,12 +80,13 @@ RCS_ID("$Id$")
|
|||
DESTROY(_absolutePathsCache);
|
||||
DESTROY(_urlsCache);
|
||||
GSWLogC("Dealloc GSWDeployedBundle: selfLock");
|
||||
NSDebugFLog(@"selfLock=%p selfLockn=%d selfLock_thread_id=%p objc_thread_id()=%p creation_thread_id=%p",
|
||||
NSDebugFLog(@"selfLock=%p selfLockn=%d selfLock_thread_id=%@ "
|
||||
@"GSCurrentThread()=%@ creation_thread_id=%@",
|
||||
(void*)_selfLock,
|
||||
_selfLockn,
|
||||
(void*)_selfLock_thread_id,
|
||||
(void*)objc_thread_id(),
|
||||
(void*)_creation_thread_id);
|
||||
_selfLock_thread_id,
|
||||
GSCurrentThread(),
|
||||
_creation_thread_id);
|
||||
fflush(stderr);
|
||||
DESTROY(_selfLock);
|
||||
GSWLogC("Dealloc GSWDeployedBundle Super");
|
||||
|
@ -644,15 +645,15 @@ if it was not cached **/
|
|||
{
|
||||
LOGObjectFnStart();
|
||||
NSDebugMLLog(@"bundles",
|
||||
@"selfLock=%p selfLockn=%d selfLock_thread_id=%p "
|
||||
@"objc_thread_id()=%p",
|
||||
@"selfLock=%p selfLockn=%d selfLock_thread_id=%@ "
|
||||
@"GSCurrentThread()=%@",
|
||||
(void*)_selfLock,
|
||||
_selfLockn,
|
||||
(void*)_selfLock_thread_id,
|
||||
(void*)objc_thread_id());
|
||||
_selfLock_thread_id,
|
||||
GSCurrentThread());
|
||||
if (_selfLockn>0)
|
||||
{
|
||||
if (_selfLock_thread_id!=objc_thread_id())
|
||||
if (_selfLock_thread_id!=GSCurrentThread())
|
||||
{
|
||||
NSDebugMLog0(@"PROBLEM: owner!=thread id");
|
||||
};
|
||||
|
@ -660,15 +661,15 @@ if it was not cached **/
|
|||
LoggedLockBeforeDate(_selfLock,GSW_LOCK_LIMIT);
|
||||
#ifndef NDEBUG
|
||||
_selfLockn++;
|
||||
_selfLock_thread_id=objc_thread_id();
|
||||
_selfLock_thread_id=GSCurrentThread();
|
||||
#endif
|
||||
NSDebugMLLog(@"bundles",
|
||||
@"selfLock=%p selfLockn=%d selfLock_thread_id=%p "
|
||||
@"objc_thread_id()=%p",
|
||||
@"selfLock=%p selfLockn=%d selfLock_thread_id=%@ "
|
||||
@"GSCurrentThread()=%@",
|
||||
_selfLock,
|
||||
_selfLockn,
|
||||
(void*)_selfLock_thread_id,
|
||||
(void*)objc_thread_id());
|
||||
_selfLock_thread_id,
|
||||
GSCurrentThread());
|
||||
LOGObjectFnStop();
|
||||
};
|
||||
|
||||
|
@ -677,14 +678,16 @@ if it was not cached **/
|
|||
-(void)unlock
|
||||
{
|
||||
LOGObjectFnStart();
|
||||
NSDebugMLLog(@"bundles",@"selfLock=%p selfLockn=%d selfLock_thread_id=%p objc_thread_id()=%p",
|
||||
NSDebugMLLog(@"bundles",
|
||||
@"selfLock=%p selfLockn=%d selfLock_thread_id=%@ "
|
||||
@"GSCurrentThread()=%@",
|
||||
(void*)_selfLock,
|
||||
_selfLockn,
|
||||
(void*)_selfLock_thread_id,
|
||||
(void*)objc_thread_id());
|
||||
_selfLock_thread_id,
|
||||
GSCurrentThread());
|
||||
if (_selfLockn>0)
|
||||
{
|
||||
if (_selfLock_thread_id!=objc_thread_id())
|
||||
if (_selfLock_thread_id!=GSCurrentThread())
|
||||
{
|
||||
NSDebugMLog0(@"PROBLEM: owner!=thread id");
|
||||
};
|
||||
|
@ -695,11 +698,13 @@ if it was not cached **/
|
|||
if (_selfLockn==0)
|
||||
_selfLock_thread_id=NULL;
|
||||
#endif
|
||||
NSDebugMLLog(@"bundles",@"selfLock=%p selfLockn=%d selfLock_thread_id=%p objc_thread_id()=%p",
|
||||
NSDebugMLLog(@"bundles",
|
||||
@"selfLock=%p selfLockn=%d selfLock_thread_id=%@ "
|
||||
@"GSCurrentThread()=%@",
|
||||
(void*)_selfLock,
|
||||
_selfLockn,
|
||||
(void*)_selfLock_thread_id,
|
||||
(void*)objc_thread_id());
|
||||
_selfLock_thread_id,
|
||||
GSCurrentThread());
|
||||
LOGObjectFnStop();
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue