Implement os.getegid

msimacek · msimacek · commit 5fa1a8489101 · 2023-12-21T15:13:46.000+01:00
Fixes #370
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
@@ -372,6 +372,7 @@ public void postInitialize(Python3Core core) {
         if (posixLib.getBackend(posixSupport).toJavaStringUncached().equals("java")) {
             posix.setAttribute(toTruffleStringUncached("statvfs"), PNone.NO_VALUE);
             posix.setAttribute(toTruffleStringUncached("geteuid"), PNone.NO_VALUE);
+            posix.setAttribute(toTruffleStringUncached("getegid"), PNone.NO_VALUE);
         }
     }
 
@@ -611,6 +612,15 @@ long getGid(@CachedLibrary(limit = "1") PosixSupportLibrary posixLib) {
         }
     }
 
+    @Builtin(name = "getegid", minNumOfPositionalArgs = 0)
+    @GenerateNodeFactory
+    public abstract static class GetEGidNode extends PythonBuiltinNode {
+        @Specialization
+        long getGid(@CachedLibrary(limit = "1") PosixSupportLibrary posixLib) {
+            return posixLib.getegid(getPosixSupport());
+        }
+    }
+
     @Builtin(name = "getppid", minNumOfPositionalArgs = 0)
     @GenerateNodeFactory
     public abstract static class GetPpidNode extends PythonBuiltinNode {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/EmulatedPosixSupport.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/EmulatedPosixSupport.java
@@ -2047,6 +2047,13 @@ public long getgid() {
         return 1000;
     }
 
+    @ExportMessage
+    @SuppressWarnings("static-method")
+    @TruffleBoundary
+    public long getegid() {
+        throw new UnsupportedPosixFeatureException("Emulated getegid not supported");
+    }
+
     @ExportMessage
     @SuppressWarnings("static-method")
     public long getppid() {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/ImageBuildtimePosixSupport.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/ImageBuildtimePosixSupport.java
@@ -666,6 +666,12 @@ final long getgid(@CachedLibrary("this.nativePosixSupport") PosixSupportLibrary
         return nativeLib.getgid(nativePosixSupport);
     }
 
+    @ExportMessage
+    final long getegid(@CachedLibrary("this.nativePosixSupport") PosixSupportLibrary nativeLib) {
+        checkNotInImageBuildtime();
+        return nativeLib.getegid(nativePosixSupport);
+    }
+
     @ExportMessage
     final long getppid(@CachedLibrary("this.nativePosixSupport") PosixSupportLibrary nativeLib) {
         checkNotInImageBuildtime();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/LoggingPosixSupport.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/LoggingPosixSupport.java
@@ -856,6 +856,13 @@ final long getgid(
         return logExit("getgid", "%d", lib.getgid(delegate));
     }
 
+    @ExportMessage
+    final long getegid(
+                    @CachedLibrary("this.delegate") PosixSupportLibrary lib) {
+        logEnter("getegid", "");
+        return logExit("getegid", "%d", lib.getegid(delegate));
+    }
+
     @ExportMessage
     final long getppid(
                     @CachedLibrary("this.delegate") PosixSupportLibrary lib) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIPosixSupport.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIPosixSupport.java
@@ -236,6 +236,7 @@ private enum PosixNativeFunction {
         call_getuid("():sint64"),
         call_geteuid("():sint64"),
         call_getgid("():sint64"),
+        call_getegid("():sint64"),
         call_getppid("():sint64"),
         call_getpgid("(sint64):sint64"),
         call_setpgid("(sint64,sint64):sint32"),
@@ -1196,6 +1197,11 @@ public long getgid(@Shared("invoke") @Cached InvokeNativeFunction invokeNode) {
         return invokeNode.callLong(this, PosixNativeFunction.call_getgid);
     }
 
+    @ExportMessage
+    public long getegid(@Shared("invoke") @Cached InvokeNativeFunction invokeNode) {
+        return invokeNode.callLong(this, PosixNativeFunction.call_getegid);
+    }
+
     @ExportMessage
     public long getppid(@Shared("invoke") @Cached InvokeNativeFunction invokeNode) {
         return invokeNode.callLong(this, PosixNativeFunction.call_getppid);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixSupportLibrary.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PosixSupportLibrary.java
@@ -282,6 +282,8 @@ public abstract class PosixSupportLibrary extends Library {
 
     public abstract long getgid(Object receiver);
 
+    public abstract long getegid(Object receiver);
+
     public abstract long getppid(Object receiver);
 
     public abstract long getpgid(Object receiver, long pid) throws PosixException;
diff --git a/graalpython/python-libposix/src/posix.c b/graalpython/python-libposix/src/posix.c
@@ -581,6 +581,10 @@ int64_t call_getgid() {
     return getgid();
 }
 
+int64_t call_getegid() {
+    return getegid();
+}
+
 int64_t call_getppid() {
     return getppid();
 }

Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,7 @@ public void postInitialize(Python3Core core) {`
`372`	`372`	`if (posixLib.getBackend(posixSupport).toJavaStringUncached().equals("java")) {`
`373`	`373`	`posix.setAttribute(toTruffleStringUncached("statvfs"), PNone.NO_VALUE);`
`374`	`374`	`posix.setAttribute(toTruffleStringUncached("geteuid"), PNone.NO_VALUE);`
	`375`	`+ posix.setAttribute(toTruffleStringUncached("getegid"), PNone.NO_VALUE);`
`375`	`376`	`}`
`376`	`377`	`}`
`377`	`378`
`@@ -611,6 +612,15 @@ long getGid(@CachedLibrary(limit = "1") PosixSupportLibrary posixLib) {`
`611`	`612`	`}`
`612`	`613`	`}`
`613`	`614`
	`615`	`+ @Builtin(name = "getegid", minNumOfPositionalArgs = 0)`
	`616`	`+ @GenerateNodeFactory`
	`617`	`+ public abstract static class GetEGidNode extends PythonBuiltinNode {`
	`618`	`+ @Specialization`
	`619`	`+ long getGid(@CachedLibrary(limit = "1") PosixSupportLibrary posixLib) {`
	`620`	`+ return posixLib.getegid(getPosixSupport());`
	`621`	`+ }`
	`622`	`+ }`
	`623`	`+`
`614`	`624`	`@Builtin(name = "getppid", minNumOfPositionalArgs = 0)`
`615`	`625`	`@GenerateNodeFactory`
`616`	`626`	`public abstract static class GetPpidNode extends PythonBuiltinNode {`
Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,10 @@ int64_t call_getgid() {`
`581`	`581`	`return getgid();`
`582`	`582`	`}`
`583`	`583`
	`584`	`+int64_t call_getegid() {`
	`585`	`+ return getegid();`
	`586`	`+}`
	`587`	`+`
`584`	`588`	`int64_t call_getppid() {`
`585`	`589`	`return getppid();`
`586`	`590`	`}`