From 54810f1d673b543a11ed8cea1b76a83cdce0918a Mon Sep 17 00:00:00 2001 From: Aaron Piotrowski Date: Wed, 20 Jul 2016 09:23:50 -0500 Subject: [PATCH] Update composer and dir name for Amp --- composer.json | 20 ++++++++++--------- {src => lib}/Context.php | 0 {src => lib}/Exception/ChannelException.php | 0 {src => lib}/Exception/Error.php | 0 {src => lib}/Exception/Exception.php | 0 {src => lib}/Exception/ForkException.php | 0 .../Exception/LockAlreadyReleasedError.php | 0 {src => lib}/Exception/MutexException.php | 0 {src => lib}/Exception/PanicError.php | 0 {src => lib}/Exception/ProcessException.php | 0 {src => lib}/Exception/SemaphoreException.php | 0 .../Exception/SerializationException.php | 0 .../Exception/SharedMemoryException.php | 0 {src => lib}/Exception/StatusError.php | 0 .../Exception/SynchronizationError.php | 0 {src => lib}/Exception/TaskException.php | 0 {src => lib}/Exception/ThreadException.php | 0 {src => lib}/Exception/Throwable.php | 0 {src => lib}/Exception/WorkerException.php | 0 {src => lib}/Forking/Fork.php | 0 {src => lib}/Process.php | 0 {src => lib}/Process/ChannelledProcess.php | 0 {src => lib}/Process/Process.php | 0 {src => lib}/Strand.php | 0 {src => lib}/Sync/Channel.php | 0 {src => lib}/Sync/ChannelledStream.php | 0 {src => lib}/Sync/FileMutex.php | 0 {src => lib}/Sync/Internal/ExitFailure.php | 0 {src => lib}/Sync/Internal/ExitStatus.php | 0 {src => lib}/Sync/Internal/ExitSuccess.php | 0 {src => lib}/Sync/Lock.php | 0 {src => lib}/Sync/Mutex.php | 0 {src => lib}/Sync/Parcel.php | 0 {src => lib}/Sync/PosixSemaphore.php | 0 {src => lib}/Sync/Semaphore.php | 0 {src => lib}/Sync/SharedMemoryParcel.php | 0 {src => lib}/Sync/Synchronizable.php | 0 {src => lib}/Threading/Internal/Mutex.php | 0 {src => lib}/Threading/Internal/Semaphore.php | 0 {src => lib}/Threading/Internal/Storage.php | 0 {src => lib}/Threading/Internal/Thread.php | 0 {src => lib}/Threading/Mutex.php | 0 {src => lib}/Threading/Parcel.php | 0 {src => lib}/Threading/Semaphore.php | 0 {src => lib}/Threading/Thread.php | 0 {src => lib}/Worker/AbstractWorker.php | 0 {src => lib}/Worker/BasicEnvironment.php | 0 {src => lib}/Worker/DefaultPool.php | 0 {src => lib}/Worker/DefaultWorkerFactory.php | 0 {src => lib}/Worker/Environment.php | 0 {src => lib}/Worker/Internal/PooledWorker.php | 0 {src => lib}/Worker/Internal/TaskFailure.php | 0 {src => lib}/Worker/Internal/TaskRunner.php | 0 {src => lib}/Worker/Pool.php | 0 {src => lib}/Worker/Task.php | 0 {src => lib}/Worker/Worker.php | 0 {src => lib}/Worker/WorkerFactory.php | 0 {src => lib}/Worker/WorkerFork.php | 0 {src => lib}/Worker/WorkerProcess.php | 0 {src => lib}/Worker/WorkerThread.php | 0 {src => lib}/Worker/functions.php | 0 61 files changed, 11 insertions(+), 9 deletions(-) rename {src => lib}/Context.php (100%) rename {src => lib}/Exception/ChannelException.php (100%) rename {src => lib}/Exception/Error.php (100%) rename {src => lib}/Exception/Exception.php (100%) rename {src => lib}/Exception/ForkException.php (100%) rename {src => lib}/Exception/LockAlreadyReleasedError.php (100%) rename {src => lib}/Exception/MutexException.php (100%) rename {src => lib}/Exception/PanicError.php (100%) rename {src => lib}/Exception/ProcessException.php (100%) rename {src => lib}/Exception/SemaphoreException.php (100%) rename {src => lib}/Exception/SerializationException.php (100%) rename {src => lib}/Exception/SharedMemoryException.php (100%) rename {src => lib}/Exception/StatusError.php (100%) rename {src => lib}/Exception/SynchronizationError.php (100%) rename {src => lib}/Exception/TaskException.php (100%) rename {src => lib}/Exception/ThreadException.php (100%) rename {src => lib}/Exception/Throwable.php (100%) rename {src => lib}/Exception/WorkerException.php (100%) rename {src => lib}/Forking/Fork.php (100%) rename {src => lib}/Process.php (100%) rename {src => lib}/Process/ChannelledProcess.php (100%) rename {src => lib}/Process/Process.php (100%) rename {src => lib}/Strand.php (100%) rename {src => lib}/Sync/Channel.php (100%) rename {src => lib}/Sync/ChannelledStream.php (100%) rename {src => lib}/Sync/FileMutex.php (100%) rename {src => lib}/Sync/Internal/ExitFailure.php (100%) rename {src => lib}/Sync/Internal/ExitStatus.php (100%) rename {src => lib}/Sync/Internal/ExitSuccess.php (100%) rename {src => lib}/Sync/Lock.php (100%) rename {src => lib}/Sync/Mutex.php (100%) rename {src => lib}/Sync/Parcel.php (100%) rename {src => lib}/Sync/PosixSemaphore.php (100%) rename {src => lib}/Sync/Semaphore.php (100%) rename {src => lib}/Sync/SharedMemoryParcel.php (100%) rename {src => lib}/Sync/Synchronizable.php (100%) rename {src => lib}/Threading/Internal/Mutex.php (100%) rename {src => lib}/Threading/Internal/Semaphore.php (100%) rename {src => lib}/Threading/Internal/Storage.php (100%) rename {src => lib}/Threading/Internal/Thread.php (100%) rename {src => lib}/Threading/Mutex.php (100%) rename {src => lib}/Threading/Parcel.php (100%) rename {src => lib}/Threading/Semaphore.php (100%) rename {src => lib}/Threading/Thread.php (100%) rename {src => lib}/Worker/AbstractWorker.php (100%) rename {src => lib}/Worker/BasicEnvironment.php (100%) rename {src => lib}/Worker/DefaultPool.php (100%) rename {src => lib}/Worker/DefaultWorkerFactory.php (100%) rename {src => lib}/Worker/Environment.php (100%) rename {src => lib}/Worker/Internal/PooledWorker.php (100%) rename {src => lib}/Worker/Internal/TaskFailure.php (100%) rename {src => lib}/Worker/Internal/TaskRunner.php (100%) rename {src => lib}/Worker/Pool.php (100%) rename {src => lib}/Worker/Task.php (100%) rename {src => lib}/Worker/Worker.php (100%) rename {src => lib}/Worker/WorkerFactory.php (100%) rename {src => lib}/Worker/WorkerFork.php (100%) rename {src => lib}/Worker/WorkerProcess.php (100%) rename {src => lib}/Worker/WorkerThread.php (100%) rename {src => lib}/Worker/functions.php (100%) diff --git a/composer.json b/composer.json index 74aee5d..d2d1152 100755 --- a/composer.json +++ b/composer.json @@ -1,17 +1,19 @@ { - "name": "icicleio/concurrent", - "description": "Concurrency component for Icicle.", + "name": "amphp/concurrent", + "description": "Concurrency component for Amp.", "keywords": [ "asynchronous", "async", - "stream" + "concurrent", + "multi-threading", + "multi-processing" ], - "homepage": "http://icicle.io", + "homepage": "https://github.com/amphp/concurrent", "license": "MIT", "authors": [ { "name": "Aaron Piotrowski", - "email": "aaron@icicle.io" + "email": "aaron@trowski.com" }, { "name": "Stephen Coakley", @@ -19,10 +21,10 @@ } ], "require": { - "icicleio/icicle": "^2.0", - "icicleio/stream": "^2.0" + "amphp/amp": "^2.0" }, "require-dev": { + "amphp/loop": "dev-master", "phpunit/phpunit": "^5.0" }, "minimum-stability": "dev", @@ -39,10 +41,10 @@ }, "autoload": { "psr-4": { - "Icicle\\Concurrent\\": "src" + "Icicle\\Concurrent\\": "lib" }, "files": [ - "src/Worker/functions.php" + "lib/Worker/functions.php" ] }, "autoload-dev": { diff --git a/src/Context.php b/lib/Context.php similarity index 100% rename from src/Context.php rename to lib/Context.php diff --git a/src/Exception/ChannelException.php b/lib/Exception/ChannelException.php similarity index 100% rename from src/Exception/ChannelException.php rename to lib/Exception/ChannelException.php diff --git a/src/Exception/Error.php b/lib/Exception/Error.php similarity index 100% rename from src/Exception/Error.php rename to lib/Exception/Error.php diff --git a/src/Exception/Exception.php b/lib/Exception/Exception.php similarity index 100% rename from src/Exception/Exception.php rename to lib/Exception/Exception.php diff --git a/src/Exception/ForkException.php b/lib/Exception/ForkException.php similarity index 100% rename from src/Exception/ForkException.php rename to lib/Exception/ForkException.php diff --git a/src/Exception/LockAlreadyReleasedError.php b/lib/Exception/LockAlreadyReleasedError.php similarity index 100% rename from src/Exception/LockAlreadyReleasedError.php rename to lib/Exception/LockAlreadyReleasedError.php diff --git a/src/Exception/MutexException.php b/lib/Exception/MutexException.php similarity index 100% rename from src/Exception/MutexException.php rename to lib/Exception/MutexException.php diff --git a/src/Exception/PanicError.php b/lib/Exception/PanicError.php similarity index 100% rename from src/Exception/PanicError.php rename to lib/Exception/PanicError.php diff --git a/src/Exception/ProcessException.php b/lib/Exception/ProcessException.php similarity index 100% rename from src/Exception/ProcessException.php rename to lib/Exception/ProcessException.php diff --git a/src/Exception/SemaphoreException.php b/lib/Exception/SemaphoreException.php similarity index 100% rename from src/Exception/SemaphoreException.php rename to lib/Exception/SemaphoreException.php diff --git a/src/Exception/SerializationException.php b/lib/Exception/SerializationException.php similarity index 100% rename from src/Exception/SerializationException.php rename to lib/Exception/SerializationException.php diff --git a/src/Exception/SharedMemoryException.php b/lib/Exception/SharedMemoryException.php similarity index 100% rename from src/Exception/SharedMemoryException.php rename to lib/Exception/SharedMemoryException.php diff --git a/src/Exception/StatusError.php b/lib/Exception/StatusError.php similarity index 100% rename from src/Exception/StatusError.php rename to lib/Exception/StatusError.php diff --git a/src/Exception/SynchronizationError.php b/lib/Exception/SynchronizationError.php similarity index 100% rename from src/Exception/SynchronizationError.php rename to lib/Exception/SynchronizationError.php diff --git a/src/Exception/TaskException.php b/lib/Exception/TaskException.php similarity index 100% rename from src/Exception/TaskException.php rename to lib/Exception/TaskException.php diff --git a/src/Exception/ThreadException.php b/lib/Exception/ThreadException.php similarity index 100% rename from src/Exception/ThreadException.php rename to lib/Exception/ThreadException.php diff --git a/src/Exception/Throwable.php b/lib/Exception/Throwable.php similarity index 100% rename from src/Exception/Throwable.php rename to lib/Exception/Throwable.php diff --git a/src/Exception/WorkerException.php b/lib/Exception/WorkerException.php similarity index 100% rename from src/Exception/WorkerException.php rename to lib/Exception/WorkerException.php diff --git a/src/Forking/Fork.php b/lib/Forking/Fork.php similarity index 100% rename from src/Forking/Fork.php rename to lib/Forking/Fork.php diff --git a/src/Process.php b/lib/Process.php similarity index 100% rename from src/Process.php rename to lib/Process.php diff --git a/src/Process/ChannelledProcess.php b/lib/Process/ChannelledProcess.php similarity index 100% rename from src/Process/ChannelledProcess.php rename to lib/Process/ChannelledProcess.php diff --git a/src/Process/Process.php b/lib/Process/Process.php similarity index 100% rename from src/Process/Process.php rename to lib/Process/Process.php diff --git a/src/Strand.php b/lib/Strand.php similarity index 100% rename from src/Strand.php rename to lib/Strand.php diff --git a/src/Sync/Channel.php b/lib/Sync/Channel.php similarity index 100% rename from src/Sync/Channel.php rename to lib/Sync/Channel.php diff --git a/src/Sync/ChannelledStream.php b/lib/Sync/ChannelledStream.php similarity index 100% rename from src/Sync/ChannelledStream.php rename to lib/Sync/ChannelledStream.php diff --git a/src/Sync/FileMutex.php b/lib/Sync/FileMutex.php similarity index 100% rename from src/Sync/FileMutex.php rename to lib/Sync/FileMutex.php diff --git a/src/Sync/Internal/ExitFailure.php b/lib/Sync/Internal/ExitFailure.php similarity index 100% rename from src/Sync/Internal/ExitFailure.php rename to lib/Sync/Internal/ExitFailure.php diff --git a/src/Sync/Internal/ExitStatus.php b/lib/Sync/Internal/ExitStatus.php similarity index 100% rename from src/Sync/Internal/ExitStatus.php rename to lib/Sync/Internal/ExitStatus.php diff --git a/src/Sync/Internal/ExitSuccess.php b/lib/Sync/Internal/ExitSuccess.php similarity index 100% rename from src/Sync/Internal/ExitSuccess.php rename to lib/Sync/Internal/ExitSuccess.php diff --git a/src/Sync/Lock.php b/lib/Sync/Lock.php similarity index 100% rename from src/Sync/Lock.php rename to lib/Sync/Lock.php diff --git a/src/Sync/Mutex.php b/lib/Sync/Mutex.php similarity index 100% rename from src/Sync/Mutex.php rename to lib/Sync/Mutex.php diff --git a/src/Sync/Parcel.php b/lib/Sync/Parcel.php similarity index 100% rename from src/Sync/Parcel.php rename to lib/Sync/Parcel.php diff --git a/src/Sync/PosixSemaphore.php b/lib/Sync/PosixSemaphore.php similarity index 100% rename from src/Sync/PosixSemaphore.php rename to lib/Sync/PosixSemaphore.php diff --git a/src/Sync/Semaphore.php b/lib/Sync/Semaphore.php similarity index 100% rename from src/Sync/Semaphore.php rename to lib/Sync/Semaphore.php diff --git a/src/Sync/SharedMemoryParcel.php b/lib/Sync/SharedMemoryParcel.php similarity index 100% rename from src/Sync/SharedMemoryParcel.php rename to lib/Sync/SharedMemoryParcel.php diff --git a/src/Sync/Synchronizable.php b/lib/Sync/Synchronizable.php similarity index 100% rename from src/Sync/Synchronizable.php rename to lib/Sync/Synchronizable.php diff --git a/src/Threading/Internal/Mutex.php b/lib/Threading/Internal/Mutex.php similarity index 100% rename from src/Threading/Internal/Mutex.php rename to lib/Threading/Internal/Mutex.php diff --git a/src/Threading/Internal/Semaphore.php b/lib/Threading/Internal/Semaphore.php similarity index 100% rename from src/Threading/Internal/Semaphore.php rename to lib/Threading/Internal/Semaphore.php diff --git a/src/Threading/Internal/Storage.php b/lib/Threading/Internal/Storage.php similarity index 100% rename from src/Threading/Internal/Storage.php rename to lib/Threading/Internal/Storage.php diff --git a/src/Threading/Internal/Thread.php b/lib/Threading/Internal/Thread.php similarity index 100% rename from src/Threading/Internal/Thread.php rename to lib/Threading/Internal/Thread.php diff --git a/src/Threading/Mutex.php b/lib/Threading/Mutex.php similarity index 100% rename from src/Threading/Mutex.php rename to lib/Threading/Mutex.php diff --git a/src/Threading/Parcel.php b/lib/Threading/Parcel.php similarity index 100% rename from src/Threading/Parcel.php rename to lib/Threading/Parcel.php diff --git a/src/Threading/Semaphore.php b/lib/Threading/Semaphore.php similarity index 100% rename from src/Threading/Semaphore.php rename to lib/Threading/Semaphore.php diff --git a/src/Threading/Thread.php b/lib/Threading/Thread.php similarity index 100% rename from src/Threading/Thread.php rename to lib/Threading/Thread.php diff --git a/src/Worker/AbstractWorker.php b/lib/Worker/AbstractWorker.php similarity index 100% rename from src/Worker/AbstractWorker.php rename to lib/Worker/AbstractWorker.php diff --git a/src/Worker/BasicEnvironment.php b/lib/Worker/BasicEnvironment.php similarity index 100% rename from src/Worker/BasicEnvironment.php rename to lib/Worker/BasicEnvironment.php diff --git a/src/Worker/DefaultPool.php b/lib/Worker/DefaultPool.php similarity index 100% rename from src/Worker/DefaultPool.php rename to lib/Worker/DefaultPool.php diff --git a/src/Worker/DefaultWorkerFactory.php b/lib/Worker/DefaultWorkerFactory.php similarity index 100% rename from src/Worker/DefaultWorkerFactory.php rename to lib/Worker/DefaultWorkerFactory.php diff --git a/src/Worker/Environment.php b/lib/Worker/Environment.php similarity index 100% rename from src/Worker/Environment.php rename to lib/Worker/Environment.php diff --git a/src/Worker/Internal/PooledWorker.php b/lib/Worker/Internal/PooledWorker.php similarity index 100% rename from src/Worker/Internal/PooledWorker.php rename to lib/Worker/Internal/PooledWorker.php diff --git a/src/Worker/Internal/TaskFailure.php b/lib/Worker/Internal/TaskFailure.php similarity index 100% rename from src/Worker/Internal/TaskFailure.php rename to lib/Worker/Internal/TaskFailure.php diff --git a/src/Worker/Internal/TaskRunner.php b/lib/Worker/Internal/TaskRunner.php similarity index 100% rename from src/Worker/Internal/TaskRunner.php rename to lib/Worker/Internal/TaskRunner.php diff --git a/src/Worker/Pool.php b/lib/Worker/Pool.php similarity index 100% rename from src/Worker/Pool.php rename to lib/Worker/Pool.php diff --git a/src/Worker/Task.php b/lib/Worker/Task.php similarity index 100% rename from src/Worker/Task.php rename to lib/Worker/Task.php diff --git a/src/Worker/Worker.php b/lib/Worker/Worker.php similarity index 100% rename from src/Worker/Worker.php rename to lib/Worker/Worker.php diff --git a/src/Worker/WorkerFactory.php b/lib/Worker/WorkerFactory.php similarity index 100% rename from src/Worker/WorkerFactory.php rename to lib/Worker/WorkerFactory.php diff --git a/src/Worker/WorkerFork.php b/lib/Worker/WorkerFork.php similarity index 100% rename from src/Worker/WorkerFork.php rename to lib/Worker/WorkerFork.php diff --git a/src/Worker/WorkerProcess.php b/lib/Worker/WorkerProcess.php similarity index 100% rename from src/Worker/WorkerProcess.php rename to lib/Worker/WorkerProcess.php diff --git a/src/Worker/WorkerThread.php b/lib/Worker/WorkerThread.php similarity index 100% rename from src/Worker/WorkerThread.php rename to lib/Worker/WorkerThread.php diff --git a/src/Worker/functions.php b/lib/Worker/functions.php similarity index 100% rename from src/Worker/functions.php rename to lib/Worker/functions.php