* gsweb.make.in

* GNUmakefile
      remove GSWExtensionsGSW as this is depricated now.
    * GSWeb/GSWDefaultAdaptor.m
      added retain/autorelease
    * GSWUtils.m
      removed category on NSUserDefaults
    * GSWDefaultAdaptor.m
      removed _workerThreadCountMax = 16
This commit is contained in:
David Wetzel 2017-12-28 13:35:30 -05:00
parent a8eccb4273
commit 6688ff9af3
11 changed files with 14 additions and 27 deletions

10
ChangeLog Executable file → Normal file
View file

@ -1,3 +1,13 @@
2017-12-28 David Wetzel <dave@turbocat.de>
* gsweb.make.in
* GNUmakefile
remove GSWExtensionsGSW as this is depricated now.
* GSWeb/GSWDefaultAdaptor.m
added retain/autorelease
* GSWUtils.m
removed category on NSUserDefaults
* GSWDefaultAdaptor.m
removed _workerThreadCountMax = 16
2017-12-25 David Wetzel <dave@turbocat.de>
* GSWDatabase/WODisplayGroup.m
fix format string and NSArray / NSMutableArray bugs

2
GNUmakefile Normal file → Executable file
View file

@ -49,9 +49,9 @@ include ./config.mak
#
SUBPROJECTS = GSWeb \
GSWExtensions \
GSWExtensionsGSW \
GSWDatabase
# GSWExtensionsGSW \
#GSWAdaptors
-include Makefile.preamble

View file

@ -103,9 +103,6 @@ static GSWResponse * static_lastDitchErrorResponse = nil;
_isMultiThreadEnabled=[[arguments objectForKey:GSWOPT_MultiThreadEnabled] boolValue];
ASSIGN(_adaptorHost,[arguments objectForKey:GSWOPT_AdaptorHost[GSWebNamingConv]]);
// for now...
_workerThreadCountMax = 16;
if ((_workerThreadCountMax <1) || (_isMultiThreadEnabled == NO)) {
_workerThreadCountMax = 1;
_isMultiThreadEnabled = NO;
@ -194,11 +191,13 @@ void _queueWorkOnHandle(NSFileHandle* handle, NSMutableArray* waitingThreadArray
- (void) workerThreadWillExit:(GSWWorkerThread*) thread
{
[_selfLock lock];
[thread retain];
[_threads removeObject: thread];
if ([_waitingThreads count]) {
_workOnHandle([_waitingThreads objectAtIndex:0], self, _threads, _isMultiThreadEnabled);
[_waitingThreads removeObjectAtIndex:0];
}
[thread autorelease];
[_selfLock unlock];
}

0
GSWeb/GSWDictionary.h Executable file → Normal file
View file

0
GSWeb/GSWDictionary.m Executable file → Normal file
View file

0
GSWeb/GSWPrivate.h Executable file → Normal file
View file

View file

@ -1365,28 +1365,6 @@ NSString* GSWGetDefaultDocRoot()
};
@end
//====================================================================
//TODO
#ifdef GNUSTEP
@implementation NSUserDefaults (Description)
//--------------------------------------------------------------------
-(NSString*)description
{
return (*nsString_stringWithFormatIMP)(nsStringClass,stringWithFormatSEL,@"<%s %p - searchList:\n%@\n persDomains:\n%@\n tempDomains:\n%@\n changedDomains:\n%@\n dictionaryRep:\n%@\n defaultsDatabase:\n%@\n>",
object_getClassName(self),
(void*)self,
_searchList,
_persDomains,
_tempDomains,
_changedDomains,
_dictionaryRep,
_defaultsDatabase);
};
@end
#endif
//====================================================================
@implementation NSDictionary (FromNSArray)

0
GSWeb/GSWWOCompatibility.h Executable file → Normal file
View file

0
GSWeb/GSWWorkerThread.h Executable file → Normal file
View file

0
GSWeb/GSWeb.h Executable file → Normal file
View file

View file

@ -29,7 +29,7 @@ GSWEB_MINOR_VERSION = @MINOR_VERSION@
GSWEB_SUBMINOR_VERSION = @SUBMINOR_VERSION@
ifeq ($(GSW_NAMES),wo)
AUXILIARY_GSW_LIBS += -lWebObjects -lWOExtensions -lWOExtensionsGSW
AUXILIARY_GSW_LIBS += -lWebObjects -lWOExtensions
else
# AUXILIARY_GSW_LIBS += -lGSWeb -lGSWExtensions -lGSWExtensionsGSW
endif