extend builtin SemLock type

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -158,6 +158,7 @@
 import com.oracle.graal.python.builtins.objects.superobject.SuperBuiltins;
 import com.oracle.graal.python.builtins.objects.thread.LockBuiltins;
 import com.oracle.graal.python.builtins.objects.thread.RLockBuiltins;
+import com.oracle.graal.python.builtins.objects.thread.SemLockBuiltins;
 import com.oracle.graal.python.builtins.objects.thread.ThreadBuiltins;
 import com.oracle.graal.python.builtins.objects.traceback.TracebackBuiltins;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
@@ -373,6 +374,7 @@ private static final PythonBuiltins[] initializeBuiltins() {
                         new LZMACompressorBuiltins(),
                         new LZMADecompressorBuiltins(),
                         new MultiprocessingModuleBuiltins(),
+                        new SemLockBuiltins(),
                         new GraalPythonModuleBuiltins()));
         if (!TruffleOptions.AOT) {
             ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MultiprocessingModuleBuiltins.java

@@ -110,7 +110,7 @@ PSemLock construct(LazyPythonClass cls, Object kindObj, Object valueObj, Object
                     semaphorePut(lang, semaphore, name);
                 }
             }
-            return factory().createSemLock(cls, kind, semaphore);
+            return factory().createSemLock(cls, name, kind, semaphore);
         }
 
         @TruffleBoundary

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PSemLock.java

@@ -52,12 +52,14 @@ public final class PSemLock extends AbstractPythonLock {
 
     private final Semaphore semaphore;
     private final int kind;
+    private final String name;
 
     private int lastThreadID = -1;
     private int count;
 
-    public PSemLock(LazyPythonClass cls, int kind, Semaphore sharedSemaphore) {
+    public PSemLock(LazyPythonClass cls, String name, int kind, Semaphore sharedSemaphore) {
         super(cls);
+        this.name = name;
         this.semaphore = sharedSemaphore;
         this.kind = kind;
     }
@@ -128,4 +130,8 @@ public boolean isMine() {
     public int getKind() {
         return kind;
     }
+
+    public String getName() {
+        return name;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/SemLockBuiltins.java

@@ -55,6 +55,8 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
+import com.oracle.graal.python.runtime.PythonCore;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -69,6 +71,12 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
         return SemLockBuiltinsFactory.getFactories();
     }
 
+    @Override
+    public void initialize(PythonCore core) {
+        builtinConstants.put("SEM_VALUE_MAX", Integer.MAX_VALUE);
+        super.initialize(core);
+    }
+
     @Builtin(name = "_count", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     abstract static class CountNode extends PythonUnaryBuiltinNode {
@@ -96,6 +104,43 @@ int getValue(PSemLock self) {
         }
     }
 
+    @Builtin(name = "handle", minNumOfPositionalArgs = 1, isGetter = true)
+    @GenerateNodeFactory
+    abstract static class GetHandleNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        @TruffleBoundary
+        int getHandle(PSemLock self) {
+            return self.hashCode();
+        }
+    }
+
+    @Builtin(name = "name", minNumOfPositionalArgs = 1, isGetter = true)
+    @GenerateNodeFactory
+    abstract static class GetNameNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        Object getName(@SuppressWarnings("unused") PSemLock self) {
+            return PNone.NONE;
+        }
+    }
+
+    @Builtin(name = "maxvalue", minNumOfPositionalArgs = 1, isGetter = true)
+    @GenerateNodeFactory
+    abstract static class GetMaxValue extends PythonUnaryBuiltinNode {
+        @Specialization
+        Object getMax(@SuppressWarnings("unused") PSemLock self) {
+            return Integer.MAX_VALUE;
+        }
+    }
+
+    @Builtin(name = "kind", minNumOfPositionalArgs = 1, isGetter = true)
+    @GenerateNodeFactory
+    abstract static class GetKindNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        int getKind(PSemLock self) {
+            return self.getKind();
+        }
+    }
+
     @Builtin(name = "acquire", minNumOfPositionalArgs = 1, parameterNames = {"self", "blocking", "timeout"})
     @GenerateNodeFactory
     abstract static class AcquireNode extends PythonTernaryBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -824,8 +824,8 @@ public PThread createPythonThread(LazyPythonClass cls, Thread thread) {
         return trace(new PThread(cls, thread));
     }
 
-    public PSemLock createSemLock(LazyPythonClass cls, int kind, Semaphore sharedSemaphore) {
-        return trace(new PSemLock(cls, kind, sharedSemaphore));
+    public PSemLock createSemLock(LazyPythonClass cls, String name, int kind, Semaphore sharedSemaphore) {
+        return trace(new PSemLock(cls, name, kind, sharedSemaphore));
     }
 
     public PScandirIterator createScandirIterator(LazyPythonClass cls, String path, DirectoryStream<TruffleFile> next) {