From 55678558d984a68c75228e1899cef23a8b2782ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Jan 2019 09:23:13 +0100 Subject: Update to 3.2.0 (stable) raise minimal PHP version to 7.2 sources from github open https://github.com/krakjoe/pthreads/pull/913 file list --- 913.patch | 62 ++++ PHPINFO | 4 + REFLECTION | 802 ++++++++++++++++++++++++++++++------------------- php-pecl-pthreads.spec | 54 ++-- 4 files changed, 587 insertions(+), 335 deletions(-) create mode 100644 913.patch create mode 100644 PHPINFO diff --git a/913.patch b/913.patch new file mode 100644 index 0000000..f118f21 --- /dev/null +++ b/913.patch @@ -0,0 +1,62 @@ +From 951492153f3ee11dd82dfce9416a5f32514514f1 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 3 Jan 2019 09:00:31 +0100 +Subject: [PATCH] refresh file list + +--- + package.xml | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/package.xml b/package.xml +index 4c7b48e9..3f540e75 100644 +--- a/package.xml ++++ b/package.xml +@@ -133,8 +133,8 @@ + + + +- + ++ + + + +@@ -157,6 +157,7 @@ + + + ++ + + + +@@ -167,8 +168,8 @@ + + + +- +- ++ ++ + + + +@@ -216,8 +217,9 @@ + + + +- ++ + ++ + + + +@@ -267,8 +269,6 @@ + + + +- +- + + + diff --git a/PHPINFO b/PHPINFO new file mode 100644 index 0000000..655e510 --- /dev/null +++ b/PHPINFO @@ -0,0 +1,4 @@ + +pthreads + +Version => 3.2.0 diff --git a/REFLECTION b/REFLECTION index 7cbc8b4..2cf98dc 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,6 +1,6 @@ -Extension [ extension #125 pthreads version 2.0.10 ] { +Extension [ extension #130 pthreads version 3.2.0 ] { - - Constants [10] { + - Constants [9] { Constant [ integer PTHREADS_INHERIT_ALL ] { 1118481 } Constant [ integer PTHREADS_INHERIT_NONE ] { 0 } Constant [ integer PTHREADS_INHERIT_INI ] { 1 } @@ -10,11 +10,10 @@ Extension [ extension #125 pthreads version 2.0.10 ] { Constant [ integer PTHREADS_INHERIT_INCLUDES ] { 65536 } Constant [ integer PTHREADS_INHERIT_COMMENTS ] { 1048576 } Constant [ integer PTHREADS_ALLOW_HEADERS ] { 268435456 } - Constant [ integer PTHREADS_ALLOW_GLOBALS ] { 16777216 } } - - Classes [8] { - Class [ class Threaded implements Traversable, Countable ] { + - Classes [7] { + Interface [ interface Collectable ] { - Constants [0] { } @@ -22,20 +21,35 @@ Extension [ extension #125 pthreads version 2.0.10 ] { - Static properties [0] { } - - Static methods [2] { - Method [ static public method extend ] { + - Static methods [0] { + } - - Parameters [1] { - Parameter #0 [ $class ] + - Properties [0] { + } + + - Methods [1] { + Method [ abstract public method isGarbage ] { + + - Parameters [0] { } + - Return [ boolean ] } + } + } - Method [ static public method from ] { + Class [ class Threaded implements Traversable, Collectable ] { - - Parameters [3] { - Parameter #0 [ Closure $run ] - Parameter #1 [ Closure or NULL $construct ] - Parameter #2 [ $args ] + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [1] { + Method [ static public method extend ] { + + - Parameters [1] { + Parameter #0 [ $class ] } } } @@ -43,7 +57,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { - Properties [0] { } - - Methods [15] { + - Methods [16] { Method [ public method run ] { - Parameters [0] { @@ -53,7 +67,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { Method [ public method wait ] { - Parameters [1] { - Parameter #0 [ $timeout ] + Parameter #0 [ integer $timeout ] } } @@ -63,13 +77,13 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method isRunning ] { + Method [ public method notifyOne ] { - Parameters [0] { } } - Method [ public method isWaiting ] { + Method [ public method isRunning ] { - Parameters [0] { } @@ -81,60 +95,67 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method getTerminationInfo ] { + Method [ public method synchronized ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $function ] } } - Method [ public method synchronized ] { + Method [ public method merge ] { - - Parameters [1] { - Parameter #0 [ $function ] + - Parameters [2] { + Parameter #0 [ $from ] + Parameter #1 [ $overwrite ] } } - Method [ public method lock ] { + Method [ public method shift ] { - Parameters [0] { } } - Method [ public method unlock ] { + Method [ public method chunk ] { + + - Parameters [2] { + Parameter #0 [ $size ] + Parameter #1 [ $preserve ] + } + } + + Method [ public method pop ] { - Parameters [0] { } } - Method [ public method merge ] { + Method [ public method count ] { - - Parameters [2] { - Parameter #0 [ $from ] - Parameter #1 [ $overwrite ] + - Parameters [0] { } } - Method [ public method shift ] { + Method [ public method isGarbage ] { - Parameters [0] { } + - Return [ boolean ] } - Method [ public method chunk ] { + Method [ public method addRef ] { - - Parameters [2] { - Parameter #0 [ $size ] - Parameter #1 [ $preserve ] + - Parameters [0] { } } - Method [ public method pop ] { + Method [ public method delRef ] { - Parameters [0] { } } - Method [ public method count ] { + Method [ public method getRefCount ] { - Parameters [0] { } @@ -142,7 +163,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Class [ class Threaded implements Traversable, Countable ] { + Class [ class Volatile extends Threaded implements Collectable, Traversable ] { - Constants [0] { } @@ -150,119 +171,117 @@ Extension [ extension #125 pthreads version 2.0.10 ] { - Static properties [0] { } - - Static methods [2] { - Method [ static public method extend ] { + - Static methods [1] { + Method [ static public method extend ] { - Parameters [1] { Parameter #0 [ $class ] } } - - Method [ static public method from ] { - - - Parameters [3] { - Parameter #0 [ Closure $run ] - Parameter #1 [ Closure or NULL $construct ] - Parameter #2 [ $args ] - } - } } - Properties [0] { } - - Methods [15] { - Method [ public method run ] { + - Methods [16] { + Method [ public method run ] { - Parameters [0] { } } - Method [ public method wait ] { + Method [ public method wait ] { - Parameters [1] { - Parameter #0 [ $timeout ] + Parameter #0 [ integer $timeout ] } } - Method [ public method notify ] { + Method [ public method notify ] { - Parameters [0] { } } - Method [ public method isRunning ] { + Method [ public method notifyOne ] { - Parameters [0] { } } - Method [ public method isWaiting ] { + Method [ public method isRunning ] { - Parameters [0] { } } - Method [ public method isTerminated ] { + Method [ public method isTerminated ] { - Parameters [0] { } } - Method [ public method getTerminationInfo ] { + Method [ public method synchronized ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $function ] } } - Method [ public method synchronized ] { + Method [ public method merge ] { - - Parameters [1] { - Parameter #0 [ $function ] + - Parameters [2] { + Parameter #0 [ $from ] + Parameter #1 [ $overwrite ] } } - Method [ public method lock ] { + Method [ public method shift ] { - Parameters [0] { } } - Method [ public method unlock ] { + Method [ public method chunk ] { + + - Parameters [2] { + Parameter #0 [ $size ] + Parameter #1 [ $preserve ] + } + } + + Method [ public method pop ] { - Parameters [0] { } } - Method [ public method merge ] { + Method [ public method count ] { - - Parameters [2] { - Parameter #0 [ $from ] - Parameter #1 [ $overwrite ] + - Parameters [0] { } } - Method [ public method shift ] { + Method [ public method isGarbage ] { - Parameters [0] { } + - Return [ boolean ] } - Method [ public method chunk ] { + Method [ public method addRef ] { - - Parameters [2] { - Parameter #0 [ $size ] - Parameter #1 [ $preserve ] + - Parameters [0] { } } - Method [ public method pop ] { + Method [ public method delRef ] { - Parameters [0] { } } - Method [ public method count ] { + Method [ public method getRefCount ] { - Parameters [0] { } @@ -270,7 +289,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Class [ class Thread extends Threaded implements Countable, Traversable ] { + Class [ class Thread extends Threaded implements Collectable, Traversable ] { - Constants [0] { } @@ -278,7 +297,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { - Static properties [0] { } - - Static methods [5] { + - Static methods [3] { Method [ static public method getCurrentThreadId ] { - Parameters [0] { @@ -291,39 +310,22 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ static public method globally ] { - - - Parameters [2] { - Parameter #0 [ $block ] - Parameter #1 [ $args ] - } - } - Method [ static public method extend ] { - Parameters [1] { Parameter #0 [ $class ] } } - - Method [ static public method from ] { - - - Parameters [3] { - Parameter #0 [ Closure $run ] - Parameter #1 [ Closure or NULL $construct ] - Parameter #2 [ $args ] - } - } } - Properties [0] { } - - Methods [23] { + - Methods [22] { Method [ public method start ] { - Parameters [1] { - Parameter #0 [ $options ] + Parameter #0 [ integer $options ] } } @@ -333,12 +335,6 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method detach ] { - - - Parameters [0] { - } - } - Method [ public method isStarted ] { - Parameters [0] { @@ -363,12 +359,6 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method kill ] { - - - Parameters [0] { - } - } - Method [ public method run ] { - Parameters [0] { @@ -378,7 +368,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { Method [ public method wait ] { - Parameters [1] { - Parameter #0 [ $timeout ] + Parameter #0 [ integer $timeout ] } } @@ -388,13 +378,13 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method isRunning ] { + Method [ public method notifyOne ] { - Parameters [0] { } } - Method [ public method isWaiting ] { + Method [ public method isRunning ] { - Parameters [0] { } @@ -406,60 +396,67 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method getTerminationInfo ] { + Method [ public method synchronized ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $function ] } } - Method [ public method synchronized ] { + Method [ public method merge ] { - - Parameters [1] { - Parameter #0 [ $function ] + - Parameters [2] { + Parameter #0 [ $from ] + Parameter #1 [ $overwrite ] } } - Method [ public method lock ] { + Method [ public method shift ] { - Parameters [0] { } } - Method [ public method unlock ] { + Method [ public method chunk ] { + + - Parameters [2] { + Parameter #0 [ $size ] + Parameter #1 [ $preserve ] + } + } + + Method [ public method pop ] { - Parameters [0] { } } - Method [ public method merge ] { + Method [ public method count ] { - - Parameters [2] { - Parameter #0 [ $from ] - Parameter #1 [ $overwrite ] + - Parameters [0] { } } - Method [ public method shift ] { + Method [ public method isGarbage ] { - Parameters [0] { } + - Return [ boolean ] } - Method [ public method chunk ] { + Method [ public method addRef ] { - - Parameters [2] { - Parameter #0 [ $size ] - Parameter #1 [ $preserve ] + - Parameters [0] { } } - Method [ public method pop ] { + Method [ public method delRef ] { - Parameters [0] { } } - Method [ public method count ] { + Method [ public method getRefCount ] { - Parameters [0] { } @@ -467,7 +464,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Class [ class Worker extends Thread implements Traversable, Countable ] { + Class [ class Worker extends Thread implements Traversable, Collectable ] { - Constants [0] { } @@ -475,7 +472,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { - Static properties [0] { } - - Static methods [5] { + - Static methods [3] { Method [ static public method getCurrentThreadId ] { - Parameters [0] { @@ -488,29 +485,12 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ static public method globally ] { - - - Parameters [2] { - Parameter #0 [ $block ] - Parameter #1 [ $args ] - } - } - Method [ static public method extend ] { - Parameters [1] { Parameter #0 [ $class ] } } - - Method [ static public method from ] { - - - Parameters [3] { - Parameter #0 [ Closure $run ] - Parameter #1 [ Closure or NULL $construct ] - Parameter #2 [ $args ] - } - } } - Properties [0] { @@ -526,14 +506,13 @@ Extension [ extension #125 pthreads version 2.0.10 ] { Method [ public method stack ] { - Parameters [1] { - Parameter #0 [ &$work ] + Parameter #0 [ Threaded $work ] } } Method [ public method unstack ] { - - Parameters [1] { - Parameter #0 [ &$work ] + - Parameters [0] { } } @@ -549,26 +528,28 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method isWorking ] { + Method [ public method collect ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ callable $function ] } } - Method [ public method start ] { + Method [ public method collector ] { - Parameters [1] { - Parameter #0 [ $options ] + Parameter #0 [ Collectable $collectable ] } } - Method [ public method join ] { + Method [ public method start ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ integer $options ] } } - Method [ public method detach ] { + Method [ public method join ] { - Parameters [0] { } @@ -598,12 +579,6 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method kill ] { - - - Parameters [0] { - } - } - Method [ public method run ] { - Parameters [0] { @@ -613,7 +588,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { Method [ public method wait ] { - Parameters [1] { - Parameter #0 [ $timeout ] + Parameter #0 [ integer $timeout ] } } @@ -623,13 +598,13 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method isRunning ] { + Method [ public method notifyOne ] { - Parameters [0] { } } - Method [ public method isWaiting ] { + Method [ public method isRunning ] { - Parameters [0] { } @@ -641,60 +616,67 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method getTerminationInfo ] { + Method [ public method synchronized ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $function ] } } - Method [ public method synchronized ] { + Method [ public method merge ] { - - Parameters [1] { - Parameter #0 [ $function ] + - Parameters [2] { + Parameter #0 [ $from ] + Parameter #1 [ $overwrite ] } } - Method [ public method lock ] { + Method [ public method shift ] { - Parameters [0] { } } - Method [ public method unlock ] { + Method [ public method chunk ] { + + - Parameters [2] { + Parameter #0 [ $size ] + Parameter #1 [ $preserve ] + } + } + + Method [ public method pop ] { - Parameters [0] { } } - Method [ public method merge ] { + Method [ public method count ] { - - Parameters [2] { - Parameter #0 [ $from ] - Parameter #1 [ $overwrite ] + - Parameters [0] { } } - Method [ public method shift ] { + Method [ public method isGarbage ] { - Parameters [0] { } + - Return [ boolean ] } - Method [ public method chunk ] { + Method [ public method addRef ] { - - Parameters [2] { - Parameter #0 [ $size ] - Parameter #1 [ $preserve ] + - Parameters [0] { } } - Method [ public method pop ] { + Method [ public method delRef ] { - Parameters [0] { } } - Method [ public method count ] { + Method [ public method getRefCount ] { - Parameters [0] { } @@ -702,7 +684,7 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Class [ class Mutex ] { + Class [ class Pool ] { - Constants [0] { } @@ -710,49 +692,57 @@ Extension [ extension #125 pthreads version 2.0.10 ] { - Static properties [0] { } - - Static methods [5] { - Method [ final static public method create ] { + - Static methods [0] { + } + + - Properties [5] { + Property [ protected $size ] + Property [ protected $class ] + Property [ protected $workers ] + Property [ protected $ctor ] + Property [ protected $last ] + } + + - Methods [6] { + Method [ public method __construct ] { - - Parameters [1] { - Parameter #0 [ $lock ] + - Parameters [3] { + Parameter #0 [ integer $size ] + Parameter #1 [ string $class ] + Parameter #2 [ array $ctor ] } } - Method [ final static public method lock ] { + Method [ public method resize ] { - Parameters [1] { - Parameter #0 [ $mutex ] + Parameter #0 [ integer $size ] } } - Method [ final static public method trylock ] { + Method [ public method submit ] { - Parameters [1] { - Parameter #0 [ $mutex ] + Parameter #0 [ Threaded $task ] } } - Method [ final static public method unlock ] { + Method [ public method submitTo ] { - Parameters [2] { - Parameter #0 [ $mutex ] - Parameter #1 [ $destroy ] + Parameter #0 [ integer $worker ] + Parameter #1 [ Threaded $task ] } } - Method [ final static public method destroy ] { + Method [ public method collect ] { - Parameters [1] { - Parameter #0 [ $mutex ] + Parameter #0 [ callable $collector ] } } - } - - Properties [0] { - } - - - Methods [1] { - Method [ final public method __construct ] { + Method [ public method shutdown ] { - Parameters [0] { } @@ -760,166 +750,386 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Class [ class Cond ] { - - - Constants [0] { + Class [ class Socket extends Threaded implements Collectable, Traversable ] { + + - Constants [146] { + Constant [ public integer AF_UNIX ] { 1 } + Constant [ public integer AF_INET ] { 2 } + Constant [ public integer AF_INET6 ] { 10 } + Constant [ public integer SOCK_STREAM ] { 1 } + Constant [ public integer SOCK_DGRAM ] { 2 } + Constant [ public integer SOCK_RAW ] { 3 } + Constant [ public integer SOCK_SEQPACKET ] { 5 } + Constant [ public integer SOCK_RDM ] { 4 } + Constant [ public integer SO_DEBUG ] { 1 } + Constant [ public integer SO_REUSEADDR ] { 2 } + Constant [ public integer SO_REUSEPORT ] { 15 } + Constant [ public integer SO_KEEPALIVE ] { 9 } + Constant [ public integer SO_DONTROUTE ] { 5 } + Constant [ public integer SO_LINGER ] { 13 } + Constant [ public integer SO_BROADCAST ] { 6 } + Constant [ public integer SO_OOBINLINE ] { 10 } + Constant [ public integer SO_SNDBUF ] { 7 } + Constant [ public integer SO_RCVBUF ] { 8 } + Constant [ public integer SO_SNDLOWAT ] { 19 } + Constant [ public integer SO_RCVLOWAT ] { 18 } + Constant [ public integer SO_SNDTIMEO ] { 21 } + Constant [ public integer SO_RCVTIMEO ] { 20 } + Constant [ public integer SO_TYPE ] { 3 } + Constant [ public integer SO_ERROR ] { 4 } + Constant [ public integer SO_BINDTODEVICE ] { 25 } + Constant [ public integer SOMAXCONN ] { 128 } + Constant [ public integer TCP_NODELAY ] { 1 } + Constant [ public integer NORMAL_READ ] { 1 } + Constant [ public integer BINARY_READ ] { 2 } + Constant [ public integer SOL_SOCKET ] { 1 } + Constant [ public integer SOL_TCP ] { 6 } + Constant [ public integer SOL_UDP ] { 17 } + Constant [ public integer MSG_OOB ] { 1 } + Constant [ public integer MSG_WAITALL ] { 256 } + Constant [ public integer MSG_CTRUNC ] { 8 } + Constant [ public integer MSG_TRUNC ] { 32 } + Constant [ public integer MSG_PEEK ] { 2 } + Constant [ public integer MSG_DONTROUTE ] { 4 } + Constant [ public integer MSG_EOR ] { 128 } + Constant [ public integer MSG_CONFIRM ] { 2048 } + Constant [ public integer MSG_ERRQUEUE ] { 8192 } + Constant [ public integer MSG_NOSIGNAL ] { 16384 } + Constant [ public integer MSG_MORE ] { 32768 } + Constant [ public integer MSG_WAITFORONE ] { 65536 } + Constant [ public integer MSG_CMSG_CLOEXEC ] { 1073741824 } + Constant [ public integer EPERM ] { 1 } + Constant [ public integer ENOENT ] { 2 } + Constant [ public integer EINTR ] { 4 } + Constant [ public integer EIO ] { 5 } + Constant [ public integer ENXIO ] { 6 } + Constant [ public integer E2BIG ] { 7 } + Constant [ public integer EBADF ] { 9 } + Constant [ public integer EAGAIN ] { 11 } + Constant [ public integer ENOMEM ] { 12 } + Constant [ public integer EACCES ] { 13 } + Constant [ public integer EFAULT ] { 14 } + Constant [ public integer ENOTBLK ] { 15 } + Constant [ public integer EBUSY ] { 16 } + Constant [ public integer EEXIST ] { 17 } + Constant [ public integer EXDEV ] { 18 } + Constant [ public integer ENODEV ] { 19 } + Constant [ public integer ENOTDIR ] { 20 } + Constant [ public integer EISDIR ] { 21 } + Constant [ public integer EINVAL ] { 22 } + Constant [ public integer ENFILE ] { 23 } + Constant [ public integer EMFILE ] { 24 } + Constant [ public integer ENOTTY ] { 25 } + Constant [ public integer ENOSPC ] { 28 } + Constant [ public integer ESPIPE ] { 29 } + Constant [ public integer EROFS ] { 30 } + Constant [ public integer EMLINK ] { 31 } + Constant [ public integer EPIPE ] { 32 } + Constant [ public integer ENAMETOOLONG ] { 36 } + Constant [ public integer ENOLCK ] { 37 } + Constant [ public integer ENOSYS ] { 38 } + Constant [ public integer ENOTEMPTY ] { 39 } + Constant [ public integer ELOOP ] { 40 } + Constant [ public integer EWOULDBLOCK ] { 11 } + Constant [ public integer ENOMSG ] { 42 } + Constant [ public integer EIDRM ] { 43 } + Constant [ public integer ECHRNG ] { 44 } + Constant [ public integer EL2NSYNC ] { 45 } + Constant [ public integer EL3HLT ] { 46 } + Constant [ public integer EL3RST ] { 47 } + Constant [ public integer ELNRNG ] { 48 } + Constant [ public integer EUNATCH ] { 49 } + Constant [ public integer ENOCSI ] { 50 } + Constant [ public integer EL2HLT ] { 51 } + Constant [ public integer EBADE ] { 52 } + Constant [ public integer EBADR ] { 53 } + Constant [ public integer EXFULL ] { 54 } + Constant [ public integer ENOANO ] { 55 } + Constant [ public integer EBADRQC ] { 56 } + Constant [ public integer EBADSLT ] { 57 } + Constant [ public integer ENOSTR ] { 60 } + Constant [ public integer ENODATA ] { 61 } + Constant [ public integer ETIME ] { 62 } + Constant [ public integer ENOSR ] { 63 } + Constant [ public integer ENONET ] { 64 } + Constant [ public integer EREMOTE ] { 66 } + Constant [ public integer ENOLINK ] { 67 } + Constant [ public integer EADV ] { 68 } + Constant [ public integer ESRMNT ] { 69 } + Constant [ public integer ECOMM ] { 70 } + Constant [ public integer EPROTO ] { 71 } + Constant [ public integer EMULTIHOP ] { 72 } + Constant [ public integer EBADMSG ] { 74 } + Constant [ public integer ENOTUNIQ ] { 76 } + Constant [ public integer EBADFD ] { 77 } + Constant [ public integer EREMCHG ] { 78 } + Constant [ public integer ERESTART ] { 85 } + Constant [ public integer ESTRPIPE ] { 86 } + Constant [ public integer EUSERS ] { 87 } + Constant [ public integer ENOTSOCK ] { 88 } + Constant [ public integer EDESTADDRREQ ] { 89 } + Constant [ public integer EMSGSIZE ] { 90 } + Constant [ public integer EPROTOTYPE ] { 91 } + Constant [ public integer ENOPROTOOPT ] { 92 } + Constant [ public integer EPROTONOSUPPORT ] { 93 } + Constant [ public integer ESOCKTNOSUPPORT ] { 94 } + Constant [ public integer EOPNOTSUPP ] { 95 } + Constant [ public integer EPFNOSUPPORT ] { 96 } + Constant [ public integer EAFNOSUPPORT ] { 97 } + Constant [ public integer EADDRINUSE ] { 98 } + Constant [ public integer EADDRNOTAVAIL ] { 99 } + Constant [ public integer ENETDOWN ] { 100 } + Constant [ public integer ENETUNREACH ] { 101 } + Constant [ public integer ENETRESET ] { 102 } + Constant [ public integer ECONNABORTED ] { 103 } + Constant [ public integer ECONNRESET ] { 104 } + Constant [ public integer ENOBUFS ] { 105 } + Constant [ public integer EISCONN ] { 106 } + Constant [ public integer ENOTCONN ] { 107 } + Constant [ public integer ESHUTDOWN ] { 108 } + Constant [ public integer ETOOMANYREFS ] { 109 } + Constant [ public integer ETIMEDOUT ] { 110 } + Constant [ public integer ECONNREFUSED ] { 111 } + Constant [ public integer EHOSTDOWN ] { 112 } + Constant [ public integer EHOSTUNREACH ] { 113 } + Constant [ public integer EALREADY ] { 114 } + Constant [ public integer EINPROGRESS ] { 115 } + Constant [ public integer EISNAM ] { 120 } + Constant [ public integer EREMOTEIO ] { 121 } + Constant [ public integer EDQUOT ] { 122 } + Constant [ public integer ENOMEDIUM ] { 123 } + Constant [ public integer EMEDIUMTYPE ] { 124 } } - Static properties [0] { } - - Static methods [5] { - Method [ final static public method create ] { + - Static methods [3] { + Method [ static public method select ] { - - Parameters [0] { + - Parameters [6] { + Parameter #0 [ array or NULL &$read ] + Parameter #1 [ array or NULL &$write ] + Parameter #2 [ array or NULL &$except ] + Parameter #3 [ integer or NULL $sec ] + Parameter #4 [ integer $usec ] + Parameter #5 [ integer or NULL &$error ] + } + } + + Method [ static public method strerror ] { + + - Parameters [1] { + Parameter #0 [ integer $error ] } + - Return [ string or NULL ] } - Method [ final static public method signal ] { + Method [ static public method extend ] { - Parameters [1] { - Parameter #0 [ $condition ] + Parameter #0 [ $class ] + } + } + } + + - Properties [0] { + } + + - Methods [34] { + Method [ public method __construct ] { + + - Parameters [3] { + Parameter #0 [ integer $domain ] + Parameter #1 [ integer $type ] + Parameter #2 [ integer $protocol ] } } - Method [ final static public method wait ] { + Method [ public method setOption ] { - Parameters [3] { - Parameter #0 [ $condition ] - Parameter #1 [ $mutex ] - Parameter #2 [ $timeout ] + Parameter #0 [ integer $level ] + Parameter #1 [ integer $name ] + Parameter #2 [ integer $value ] + } + - Return [ boolean ] + } + + Method [ public method getOption ] { + + - Parameters [2] { + Parameter #0 [ integer $level ] + Parameter #1 [ integer $name ] } + - Return [ integer ] } - Method [ final static public method broadcast ] { + Method [ public method bind ] { + + - Parameters [2] { + Parameter #0 [ string $host ] + Parameter #1 [ integer $port ] + } + - Return [ boolean ] + } + + Method [ public method listen ] { - Parameters [1] { - Parameter #0 [ $condition ] + Parameter #0 [ integer $backlog ] } + - Return [ boolean ] } - Method [ final static public method destroy ] { + Method [ public method accept ] { - Parameters [1] { - Parameter #0 [ $condition ] + Parameter #0 [ $class ] } } - } - - Properties [0] { - } + Method [ public method connect ] { - - Methods [1] { - Method [ final public method __construct ] { + - Parameters [2] { + Parameter #0 [ string $host ] + Parameter #1 [ integer $port ] + } + - Return [ boolean ] + } - - Parameters [0] { + Method [ public method read ] { + + - Parameters [3] { + Parameter #0 [ integer $length ] + Parameter #1 [ integer $flags ] + Parameter #2 [ integer $type ] } } - } - } - Class [ class Collectable extends Threaded implements Countable, Traversable ] { + Method [ public method write ] { - - Constants [0] { - } + - Parameters [2] { + Parameter #0 [ string $buffer ] + Parameter #1 [ integer $length ] + } + } - - Static properties [0] { - } + Method [ public method send ] { - - Static methods [2] { - Method [ static public method extend ] { + - Parameters [3] { + Parameter #0 [ string $buffer ] + Parameter #1 [ integer $length ] + Parameter #2 [ integer $flags ] + } + } - - Parameters [1] { - Parameter #0 [ $class ] + Method [ public method recvfrom ] { + + - Parameters [5] { + Parameter #0 [ string or NULL &$buffer ] + Parameter #1 [ integer $length ] + Parameter #2 [ integer $flags ] + Parameter #3 [ string or NULL &$name ] + Parameter #4 [ integer or NULL &$port ] } } - Method [ static public method from ] { + Method [ public method sendto ] { - - Parameters [3] { - Parameter #0 [ Closure $run ] - Parameter #1 [ Closure or NULL $construct ] - Parameter #2 [ $args ] + - Parameters [5] { + Parameter #0 [ string $buffer ] + Parameter #1 [ integer $length ] + Parameter #2 [ integer $flags ] + Parameter #3 [ string $addr ] + Parameter #4 [ integer $port ] } } - } - - Properties [1] { - Property [ protected $garbage ] - } + Method [ public method setBlocking ] { + + - Parameters [1] { + Parameter #0 [ boolean $blocking ] + } + - Return [ boolean ] + } - - Methods [17] { - Method [ public method isGarbage ] { + Method [ public method getPeerName ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ boolean $port ] } + - Return [ array ] } - Method [ public method setGarbage ] { + Method [ public method getSockName ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ boolean $port ] } + - Return [ array ] } - Method [ public method run ] { + Method [ public method close ] { - Parameters [0] { } } - Method [ public method wait ] { + Method [ public method getLastError ] { - Parameters [1] { - Parameter #0 [ $timeout ] + Parameter #0 [ boolean $clear ] } } - Method [ public method notify ] { + Method [ public method clearError ] { - Parameters [0] { } } - Method [ public method isRunning ] { + Method [ public method run ] { - Parameters [0] { } } - Method [ public method isWaiting ] { + Method [ public method wait ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ integer $timeout ] } } - Method [ public method isTerminated ] { + Method [ public method notify ] { - Parameters [0] { } } - Method [ public method getTerminationInfo ] { + Method [ public method notifyOne ] { - Parameters [0] { } } - Method [ public method synchronized ] { + Method [ public method isRunning ] { - - Parameters [1] { - Parameter #0 [ $function ] + - Parameters [0] { } } - Method [ public method lock ] { + Method [ public method isTerminated ] { - Parameters [0] { } } - Method [ public method unlock ] { + Method [ public method synchronized ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ $function ] } } @@ -951,74 +1161,32 @@ Extension [ extension #125 pthreads version 2.0.10 ] { } } - Method [ public method count ] { + Method [ public method count ] { - Parameters [0] { } } - } - } - - Class [ class Pool ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - Static methods [0] { - } - - - Properties [6] { - Property [ protected $size ] - Property [ protected $class ] - Property [ protected $workers ] - Property [ protected $work ] - Property [ protected $ctor ] - Property [ protected $last ] - } - - - Methods [6] { - Method [ public method __construct ] { + Method [ public method isGarbage ] { - - Parameters [3] { - Parameter #0 [ $size ] - Parameter #1 [ $class ] - Parameter #2 [ $ctor ] - } - } - - Method [ public method resize ] { - - - Parameters [1] { - Parameter #0 [ $size ] - } - } - - Method [ public method submit ] { - - - Parameters [1] { - Parameter #0 [ $task ] + - Parameters [0] { } + - Return [ boolean ] } - Method [ public method submitTo ] { + Method [ public method addRef ] { - - Parameters [2] { - Parameter #0 [ $worker ] - Parameter #1 [ $task ] + - Parameters [0] { } } - Method [ public method collect ] { + Method [ public method delRef ] { - - Parameters [1] { - Parameter #0 [ $collector ] + - Parameters [0] { } } - Method [ public method shutdown ] { + Method [ public method getRefCount ] { - Parameters [0] { } diff --git a/php-pecl-pthreads.spec b/php-pecl-pthreads.spec index d95c72d..d9d5e3a 100644 --- a/php-pecl-pthreads.spec +++ b/php-pecl-pthreads.spec @@ -8,20 +8,26 @@ # %{?scl: %scl_package php-pecl-pthreads} +%global gh_commit 0c1d9bc96752a8ecba5f024a2288abd05a802546 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner krakjoe +%global gh_project pthreads + %global pecl_name pthreads %global ini_name 40-%{pecl_name}.ini Summary: Threading API Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 3.1.6 +Version: 3.2.0 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP -Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +#Source0: http://pecl.php.net/get/%%{pecl_name}-%%{version}.tgz +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz + +Patch0: https://patch-diff.githubusercontent.com/raw/krakjoe/pthreads/pull/913.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{?scl_prefix}php-zts-devel > 7 +BuildRequires: %{?scl_prefix}php-zts-devel > 7.2 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -37,16 +43,20 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} Obsoletes: php70u-pecl-%{pecl_name} <= %{version} Obsoletes: php70w-pecl-%{pecl_name} <= %{version} +Obsoletes: php71u-pecl-%{pecl_name} <= %{version} +Obsoletes: php71w-pecl-%{pecl_name} <= %{version} +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.3" +Obsoletes: php73u-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -68,6 +78,11 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c +mv %{gh_project}-%{gh_commit} %{pecl_name}-%{version} +cd %{pecl_name}-%{version} +%patch0 -p1 +cd .. +mv %{pecl_name}-%{version}/package.xml . # Don't install/register tests sed -e 's/role="test"/role="src"/' \ @@ -92,6 +107,8 @@ EOF %build +%{?dtsenable} + cd %{pecl_name}-%{version} %{_bindir}/zts-phpize %configure \ @@ -100,10 +117,9 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} -make -C %{pecl_name}-%{version} \ - install INSTALL_ROOT=%{buildroot} +make -C %{pecl_name}-%{version} install INSTALL_ROOT=%{buildroot} # install config file install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} @@ -119,7 +135,7 @@ do sed -e 's/\r//' -i $i done -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -153,17 +169,13 @@ rm tests/trait-alias-bug.phpt : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \ TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +SKIP_ONLINE_TESTS=1 \ NO_INTERACTION=1 \ REPORT_EXIT_STATUS=1 \ %{_bindir}/zts-php -n run-tests.php --show-diff -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license %{pecl_name}-%{version}/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -173,6 +185,12 @@ rm -rf %{buildroot} %changelog +* Thu Jan 3 2019 Remi Collet - 3.2.0-1 +- Update to 3.2.0 (stable) +- raise minimal PHP version to 7.2 +- sources from github +- open https://github.com/krakjoe/pthreads/pull/913 file list + * Sat Feb 13 2016 Remi Collet - 3.1.6-1 - Update to 3.1.6 (stable) -- cgit