gnustep_global_lock is removed

gnustep · May 30, 2024 · 7a98157 · 7a98157
1 parent 276d12d
commit 7a98157
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2024-05-30 Richard Frith-Macdonald <[email protected]>
+
+	* Source/GSDisplayServer.m:
+	* Source/NSGraphicsContext.m:
+	* Source/NSWorkspace.m:
+	Avoid using old gnustep_global_lock (removed from base)
+
 2024-05-26 Fred Kiefer <[email protected]>
 
         * ChangeLog: Update for new release

diff --git a/Source/GSDisplayServer.m b/Source/GSDisplayServer.m
@@ -123,7 +123,6 @@ + (void) initialize
 {
   if (serverLock == nil)
     {
-      [gnustep_global_lock lock];
       if (serverLock == nil)
         {
           serverLock = [NSRecursiveLock new];
@@ -132,7 +131,6 @@ + (void) initialize
           windowmaps = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
                                         NSNonOwnedPointerMapValueCallBacks, 20);
         }
-      [gnustep_global_lock unlock];
     }
 }
 

diff --git a/Source/NSGraphicsContext.m b/Source/NSGraphicsContext.m
@@ -138,7 +138,6 @@ + (void) initialize
 {
   if (contextLock == nil)
     {
-      [gnustep_global_lock lock];
       if (contextLock == nil)
 	{
 	  contextLock = [NSRecursiveLock new];
@@ -147,7 +146,6 @@ + (void) initialize
 	  classMethodTable =
 	    [[NSMutableDictionary allocWithZone: _globalGSZone] init];
 	}
-      [gnustep_global_lock unlock];
     }
 }
 

diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m
@@ -131,6 +131,7 @@ + (BOOL)_exists: (int)pid;
 static NSImage	*unknownApplication = nil;
 static NSImage	*unknownTool = nil;
 
+static NSLock   *classLock = nil;
 static NSLock   *mlock = nil;
 
 static NSString	*GSWorkspaceNotification = @"GSWorkspaceNotification";
@@ -598,26 +599,22 @@ + (void) initialize
 {
   if (self == [NSWorkspace class])
     {
-      static BOOL	beenHere = NO;
-      NSFileManager	*mgr = [NSFileManager defaultManager];
-      NSString		*service;
-      NSData		*data;
-      NSDictionary	*dict;
-
       [self setVersion: 1];
-
-      [gnustep_global_lock lock];
-      if (beenHere == YES)
+      if (classLock)
 	{
-	  [gnustep_global_lock unlock];
 	  return;
 	}
-
-      beenHere = YES;
+      classLock = [NSLock new];
       mlock = [NSLock new];
 
       NS_DURING
 	{
+	  NSFileManager	*mgr = [NSFileManager defaultManager];
+	  NSString	*service;
+	  NSData	*data;
+	  NSDictionary	*dict;
+
+
 	  service = [[NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, 
 	    NSUserDomainMask, YES) objectAtIndex: 0]
 	    stringByAppendingPathComponent: @"Services"];
@@ -675,12 +672,9 @@ + (void) initialize
 	}
       NS_HANDLER
 	{
-	  [gnustep_global_lock unlock];
 	  [localException raise];
 	}
       NS_ENDHANDLER
-
-      [gnustep_global_lock unlock];
     }
 }
 
@@ -698,14 +692,14 @@ + (NSWorkspace*) sharedWorkspace
 {
   if (sharedWorkspace == nil)
     {
-      [gnustep_global_lock lock];
+      [classLock lock];
       if (sharedWorkspace == nil)
 	{
 	  sharedWorkspace =
 		(NSWorkspace*)NSAllocateObject(self, 0, NSDefaultMallocZone());
 	  [sharedWorkspace init];
 	}
-      [gnustep_global_lock unlock];
+      [classLock unlock];
     }
   return sharedWorkspace;
 }