Fix msvcrt.locking

Related #544

Author: msimacek

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

@@ -42,21 +42,34 @@
 
 import java.util.List;
 
+import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.annotations.Builtin;
+import com.oracle.graal.python.annotations.PythonOS;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltins;
-import com.oracle.graal.python.annotations.PythonOS;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.nodes.PConstructAndRaiseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
-import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonTernaryClinicBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
+import com.oracle.graal.python.runtime.PosixSupportLibrary;
+import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
 
 @CoreFunctions(defineModule = "msvcrt", os = PythonOS.PLATFORM_WIN32)
 public final class MsvcrtModuleBuiltins extends PythonBuiltins {
+
+    public static final int LK_LOCK = 1;
+    public static final int LK_NBLCK = 2;
+    public static final int LK_UNLOCK = 3;
+
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
         return MsvcrtModuleBuiltinsFactory.getFactories();
@@ -65,18 +78,35 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @Override
     public void initialize(Python3Core core) {
         super.initialize(core);
-        addBuiltinConstant("LK_NBLCK", 0);
-        addBuiltinConstant("LK_UNLCK", 0);
+        addBuiltinConstant("LK_LOCK", LK_LOCK);
+        addBuiltinConstant("LK_NBLCK", LK_NBLCK);
+        addBuiltinConstant("LK_UNLCK", LK_UNLOCK);
     }
 
-    @Builtin(name = "locking", minNumOfPositionalArgs = 3)
+    @Builtin(name = "locking", minNumOfPositionalArgs = 3, parameterNames = {"fd", "mode", "nbytes"})
+    @ArgumentClinic(name = "fd", conversion = ArgumentClinic.ClinicConversion.Int)
+    @ArgumentClinic(name = "mode", conversion = ArgumentClinic.ClinicConversion.Int)
+    @ArgumentClinic(name = "nbytes", conversion = ArgumentClinic.ClinicConversion.Long)
     @GenerateNodeFactory
-    public abstract static class EnumKeyNode extends PythonTernaryBuiltinNode {
-        @SuppressWarnings("unused")
+    public abstract static class LockingNode extends PythonTernaryClinicBuiltinNode {
         @Specialization
-        static Object locking(VirtualFrame frame, Object file, Object operation, Object arg) {
-            // TODO: implement on windows, this is just here to make mesonbuild work
+        Object locking(VirtualFrame frame, int fd, int mode, long nbytes,
+                        @Bind Node inliningTarget,
+                        @Cached SysModuleBuiltins.AuditNode auditNode,
+                        @CachedLibrary("getPosixSupport()") PosixSupportLibrary posixLib,
+                        @Cached PConstructAndRaiseNode.Lazy constructAndRaiseNode) {
+            auditNode.audit(inliningTarget, "msvcrt.locking", fd, mode, nbytes);
+            try {
+                posixLib.fcntlLock(getPosixSupport(), fd, mode == LK_NBLCK, mode == LK_LOCK ? 1 : 0, 0, 0, nbytes);
+            } catch (PosixSupportLibrary.PosixException e) {
+                throw constructAndRaiseNode.get(inliningTarget).raiseOSErrorFromPosixException(frame, e);
+            }
             return PNone.NONE;
         }
+
+        @Override
+        protected ArgumentClinicProvider getArgumentClinic() {
+            return MsvcrtModuleBuiltinsClinicProviders.LockingNodeClinicProviderGen.INSTANCE;
+        }
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/EmulatedPosixSupport.java

@@ -40,9 +40,9 @@
  */
 package com.oracle.graal.python.runtime;
 
+import static com.oracle.graal.python.PythonLanguage.getPythonOS;
 import static com.oracle.graal.python.annotations.PythonOS.PLATFORM_LINUX;
 import static com.oracle.graal.python.annotations.PythonOS.PLATFORM_WIN32;
-import static com.oracle.graal.python.PythonLanguage.getPythonOS;
 import static com.oracle.graal.python.builtins.modules.SignalModuleBuiltins.signalFromName;
 import static com.oracle.graal.python.builtins.objects.thread.PThread.getThreadId;
 import static com.oracle.graal.python.nodes.StringLiterals.T_EMPTY_STRING;
@@ -873,9 +873,20 @@ void fcntlLock(int fd, boolean blocking, int lockType, int whence, long start, l
             errorBranch.enter(inliningTarget);
             throw posixException(OSErrorEnum.EBADFD);
         }
-        boolean unlock = lockType == F_UNLCK.getValueIfDefined();
-        boolean shared = lockType == F_RDLCK.getValueIfDefined();
-        boolean exclusive = lockType == F_WRLCK.getValueIfDefined();
+        boolean unlock, shared, exclusive;
+        if (PythonLanguage.getPythonOS() == PLATFORM_WIN32) {
+            /*
+             * Windows doesn't expose fnctl, but we call this from MsvcrtModuleBuiltins, where we
+             * use 0 for unlock and 1 for lock
+             */
+            unlock = lockType == 0;
+            exclusive = !unlock;
+            shared = false;
+        } else {
+            unlock = lockType == F_UNLCK.getValueIfDefined();
+            shared = lockType == F_RDLCK.getValueIfDefined();
+            exclusive = lockType == F_WRLCK.getValueIfDefined();
+        }
         if (!unlock && !shared && !exclusive) {
             errorBranch.enter(inliningTarget);
             throw posixException(OSErrorEnum.EINVAL);