changes from feeback 2

Author: devnexen

ext/pcntl/pcntl.c

@@ -53,6 +53,7 @@ typedef cpuset_t cpu_set_t;
 
 #if defined(HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP)
 #include <pthread/qos.h>
+PHPAPI zend_class_entry *QosClass_ce;
 #endif
 
 #ifdef HAVE_PIDFD_OPEN
@@ -69,10 +70,11 @@ typedef cpuset_t cpu_set_t;
 
 #define LONG_CONST(c) (zend_long) c
 
-#include "pcntl_arginfo.h"
-
+#include "Zend/zend_enum.h"
 #include "Zend/zend_max_execution_timer.h"
 
+#include "pcntl_arginfo.h"
+
 ZEND_DECLARE_MODULE_GLOBALS(pcntl)
 static PHP_GINIT_FUNCTION(pcntl);
 
@@ -140,6 +142,9 @@ PHP_RINIT_FUNCTION(pcntl)
 
 PHP_MINIT_FUNCTION(pcntl)
 {
+#if defined(HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP)
+	QosClass_ce = register_class_QosClass();
+#endif
 	register_pcntl_symbols(module_number);
 	orig_interrupt_function = zend_interrupt_function;
 	zend_interrupt_function = pcntl_interrupt_function;
@@ -1630,6 +1635,7 @@ PHP_FUNCTION(pcntl_getcpu)
 PHP_FUNCTION(pcntl_getqos_class)
 {
 	qos_class_t qos_class;
+	zend_object *qos_obj;
 
 	ZEND_PARSE_PARAMETERS_NONE();
 
@@ -1641,21 +1647,29 @@ PHP_FUNCTION(pcntl_getqos_class)
 		RETURN_THROWS();
 	}
 
-	RETURN_LONG((zend_long)qos_class);
+	if (UNEXPECTED(zend_enum_get_case_by_value(&qos_obj, QosClass_ce, (zend_long)qos_class, NULL, false) == FAILURE))
+	{
+		zend_throw_error(NULL, "invalid QOS value class entry %u", qos_class);
+		RETURN_THROWS();
+	}
+
+	ZVAL_COPY_OR_DUP(return_value, zend_enum_fetch_case_value(qos_obj));
 }
 
 PHP_FUNCTION(pcntl_setqos_class)
 {
-	zend_long qos_class = QOS_CLASS_DEFAULT;
+	zval *qos_obj;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_LONG(qos_class)
+		Z_PARAM_OBJECT_OF_CLASS(qos_obj, QosClass_ce)
 	ZEND_PARSE_PARAMETERS_END();
 
+	zend_long qos_class = Z_LVAL_P(zend_enum_fetch_case_value(Z_OBJ_P(qos_obj)));
+
 	if (pthread_set_qos_class_self_np((qos_class_t)qos_class, 0) != 0)
 	{
 		PCNTL_G(last_error) = errno;
-		zend_argument_value_error(1, "must be one of QOS_CLASS_USER_INTERACTIVE, QOS_CLASS_USER_INITIATED, QOS_CLASS_DEFAULT, QOS_CLASS_UTILITY and QOS_CLASS_BACKGROUND");
+		zend_argument_value_error(1, "must be one of QosClass enum entries : ::UserInteractive, ::UserInitiated, ::Default, ::Utility and ::Background");
 		RETURN_THROWS();
 	}
 }

ext/pcntl/pcntl.stub.php

@@ -905,39 +905,6 @@
 const PCNTL_ECAPMODE = UNKNOWN;
 #endif
 
-#ifdef HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP
-/**
- * @var int
- * @cvalue QOS_CLASS_USER_INTERACTIVE
- */
-const QOS_CLASS_USER_INTERACTIVE = UNKNOWN;
-/**
- * @var int
- * @cvalue QOS_CLASS_USER_INITIATED
- */
-const QOS_CLASS_USER_INITIATED = UNKNOWN;
-/**
- * @var int
- * @cvalue QOS_CLASS_DEFAULT
- */
-const QOS_CLASS_DEFAULT = UNKNOWN;
-/**
- * @var int
- * @cvalue QOS_CLASS_UTILITY
- */
-const QOS_CLASS_UTILITY = UNKNOWN;
-/**
- * @var int
- * @cvalue QOS_CLASS_BACKGROUND
- */
-const QOS_CLASS_BACKGROUND = UNKNOWN;
-/**
- * @var int
- * @cvalue QOS_CLASS_UNSPECIFIED
- */
-const QOS_CLASS_UNSPECIFIED = UNKNOWN;
-#endif
-
 function pcntl_fork(): int {}
 
 /**
@@ -1038,6 +1005,16 @@ function pcntl_getcpu(): int {}
 #endif
 
 #ifdef HAVE_PTHREAD_SET_QOS_CLASS_SELF_NP
-function pcntl_getqos_class(): int {}
-function pcntl_setqos_class(int $qos_class = QOS_CLASS_DEFAULT): void {}
+enum QosClass: int
+{
+	case UserInteractive = 0x21;
+	case UserInitiated = 0x19;
+	case Default = 0x15;
+	case Utility = 0x11;
+	case Background = 0x09;
+	case Unspecified = 0x00;
+}
+
+function pcntl_getqos_class(): QosClass {}
+function pcntl_setqos_class(QosClass $qos_class = QosClass::Default): void {}
 #endif

ext/pcntl/pcntl_arginfo.h

@@ -58,4 +58,6 @@ ZEND_TSRMLS_CACHE_EXTERN()
 ZEND_EXTERN_MODULE_GLOBALS(pcntl)
 #define PCNTL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pcntl, v)
 
+extern PHPAPI zend_class_entry *QosClass_ce;
+
 #endif	/* PHP_PCNTL_H */

ext/pcntl/php_pcntl.h

@@ -9,18 +9,18 @@ if (getenv('SKIP_REPEAT')) die("skip Not repeatable");
 ?>
 --FILE--
 <?php
-pcntl_setqos_class(QOS_CLASS_DEFAULT);
-var_dump(QOS_CLASS_DEFAULT === pcntl_getqos_class());
+pcntl_setqos_class(QosClass::Default);
+var_dump(QosClass::Default->value === pcntl_getqos_class());
 
 try {
-	pcntl_setqos_class(QOS_CLASS_UNSPECIFIED);
+	pcntl_setqos_class(QosClass::Unspecified);
 } catch (\ValueError $e) {
 	echo $e->getMessage() . PHP_EOL;
 }
-pcntl_setqos_class(QOS_CLASS_BACKGROUND);
-var_dump(QOS_CLASS_BACKGROUND === pcntl_getqos_class());
+pcntl_setqos_class(QosClass::Background);
+var_dump(QosClass::Background->value == pcntl_getqos_class());
 ?>
 --EXPECT--
 bool(true)
-pcntl_setqos_class(): Argument #1 ($qos_class) must be one of QOS_CLASS_USER_INTERACTIVE, QOS_CLASS_USER_INITIATED, QOS_CLASS_DEFAULT, QOS_CLASS_UTILITY and QOS_CLASS_BACKGROUND
+pcntl_setqos_class(): Argument #1 ($qos_class) must be one of QosClass enum entries : ::UserInteractive, ::UserInitiated, ::Default, ::Utility and ::Background
 bool(true)