@@ -49,7 +49,7 @@ |
||
49 | 49 | $type, |
50 | 50 | $pid, |
51 | 51 | ($this->ownerPid === $pid) ? 'p' : 'c', |
52 | - $message . PHP_EOL |
|
52 | + $message.PHP_EOL |
|
53 | 53 | ) |
54 | 54 | ); |
55 | 55 | } |
@@ -50,15 +50,15 @@ |
||
50 | 50 | } |
51 | 51 | $pid = getmypid(); |
52 | 52 | switch (true) { |
53 | - case $this->ownerPid === $pid: |
|
54 | - $role = 'owner'; |
|
55 | - break; |
|
56 | - case $this->masterPid === $pid: |
|
57 | - $role = 'master'; |
|
58 | - break; |
|
59 | - default: |
|
60 | - $role = 'worker'; |
|
61 | - break; |
|
53 | + case $this->ownerPid === $pid: |
|
54 | + $role = 'owner'; |
|
55 | + break; |
|
56 | + case $this->masterPid === $pid: |
|
57 | + $role = 'master'; |
|
58 | + break; |
|
59 | + default: |
|
60 | + $role = 'worker'; |
|
61 | + break; |
|
62 | 62 | } |
63 | 63 | fputs( |
64 | 64 | $this->destination, |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public function generate() |
28 | 28 | { |
29 | - $pathname = '/tmp/' . $this->prefix . $this->ownerPid; |
|
29 | + $pathname = '/tmp/'.$this->prefix.$this->ownerPid; |
|
30 | 30 | if (!file_exists($pathname)) { |
31 | 31 | touch($pathname); |
32 | 32 | } |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function delete() |
54 | 54 | { |
55 | - if (file_exists('/tmp/' . $this->prefix . $this->ownerPid)) { |
|
56 | - unlink('/tmp/' . $this->prefix . $this->ownerPid); |
|
55 | + if (file_exists('/tmp/'.$this->prefix.$this->ownerPid)) { |
|
56 | + unlink('/tmp/'.$this->prefix.$this->ownerPid); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | public function toArray() |
27 | 27 | { |
28 | 28 | return array_map( |
29 | - function ($result) { |
|
29 | + function($result) { |
|
30 | 30 | return $result->getReturn(); |
31 | 31 | }, |
32 | 32 | $this->results |
@@ -149,24 +149,24 @@ discard block |
||
149 | 149 | |
150 | 150 | if (getmypid() === $this->ownerPid) { |
151 | 151 | // owner |
152 | - $this->log->info('pid: ' . getmypid()); |
|
152 | + $this->log->info('pid: '.getmypid()); |
|
153 | 153 | |
154 | 154 | return $this->masterPid; |
155 | 155 | } else { |
156 | 156 | // master |
157 | 157 | $taskQueue = new TaskQueue($this->ownerPid); |
158 | 158 | $activeWorkerSet = new ActiveWorkerSet(); |
159 | - $this->log->info('pid: ' . $this->masterPid); |
|
159 | + $this->log->info('pid: '.$this->masterPid); |
|
160 | 160 | |
161 | 161 | $log = $this->log; |
162 | 162 | foreach ($this->signals as $sig) { |
163 | - $this->pcntl->signal($sig, function ($sig) use ($log, $activeWorkerSet) { |
|
164 | - $log->info('received signal: ' . $sig); |
|
163 | + $this->pcntl->signal($sig, function($sig) use ($log, $activeWorkerSet) { |
|
164 | + $log->info('received signal: '.$sig); |
|
165 | 165 | |
166 | 166 | if ($activeWorkerSet->count() === 0) { |
167 | 167 | $log->info('no worker is active.'); |
168 | 168 | } else { |
169 | - $log->info('------> sending signal to workers. signal: ' . $sig); |
|
169 | + $log->info('------> sending signal to workers. signal: '.$sig); |
|
170 | 170 | $activeWorkerSet->terminate($sig); |
171 | 171 | $log->info('<------ sent signal'); |
172 | 172 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | } |
176 | 176 | |
177 | 177 | while ($task = $taskQueue->dequeue()) { |
178 | - $this->log->info('dequeued task #' . $taskQueue->dequeuedCount()); |
|
178 | + $this->log->info('dequeued task #'.$taskQueue->dequeuedCount()); |
|
179 | 179 | if ($activeWorkerSet->count() >= $this->concurrency) { |
180 | 180 | $status = null; |
181 | 181 | $workerPid = $this->pcntl->waitpid(-1, $status); |
@@ -209,11 +209,11 @@ discard block |
||
209 | 209 | |
210 | 210 | if (getmypid() === $this->masterPid) { |
211 | 211 | // master |
212 | - $this->log->info('forked worker. pid: ' . $worker->getPid()); |
|
212 | + $this->log->info('forked worker. pid: '.$worker->getPid()); |
|
213 | 213 | return $worker; |
214 | 214 | } else { |
215 | 215 | // worker |
216 | - $this->log->info('has forked. pid: ' . getmypid()); |
|
216 | + $this->log->info('has forked. pid: '.getmypid()); |
|
217 | 217 | // @codeCoverageIgnoreStart |
218 | 218 | |
219 | 219 | foreach ($this->signals as $sig) { |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | $worker->setResultQueue(new ResultQueue($this->ownerPid)); |
224 | 224 | |
225 | 225 | $resultHasQueued = false; |
226 | - register_shutdown_function(function () use (&$resultHasQueued, $worker) { |
|
226 | + register_shutdown_function(function() use (&$resultHasQueued, $worker) { |
|
227 | 227 | if (!$resultHasQueued) { |
228 | 228 | $worker->error(); |
229 | 229 | } |
@@ -260,13 +260,13 @@ discard block |
||
260 | 260 | */ |
261 | 261 | public function sendSignalToMaster($sig = SIGTERM) |
262 | 262 | { |
263 | - $this->log->info('----> sending signal to master. signal: ' . $sig); |
|
263 | + $this->log->info('----> sending signal to master. signal: '.$sig); |
|
264 | 264 | posix_kill($this->masterPid, $sig); |
265 | 265 | $this->log->info('<---- sent signal.'); |
266 | 266 | |
267 | 267 | $status = null; |
268 | 268 | $this->pcntl->waitpid($this->masterPid, $status); |
269 | - $this->log->info('. status: ' . $status); |
|
269 | + $this->log->info('. status: '.$status); |
|
270 | 270 | $this->masterPid = null; |
271 | 271 | } |
272 | 272 |
@@ -53,6 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | /** |
55 | 55 | * @param int $ownerPid |
56 | + * @param \Ackintosh\Snidel\Log $log |
|
56 | 57 | */ |
57 | 58 | public function __construct($ownerPid, $log, $concurrency = 5) |
58 | 59 | { |
@@ -68,6 +69,7 @@ discard block |
||
68 | 69 | |
69 | 70 | /** |
70 | 71 | * @param \Ackintosh\Snidel\Task |
72 | + * @param \Ackintosh\Snidel\Task\Task $task |
|
71 | 73 | * @return void |
72 | 74 | * @throws \RuntimeException |
73 | 75 | */ |
@@ -89,7 +91,7 @@ discard block |
||
89 | 91 | } |
90 | 92 | |
91 | 93 | /** |
92 | - * @return \Ackintosh\Snidel\Fork\Fork |
|
94 | + * @return Result |
|
93 | 95 | */ |
94 | 96 | private function dequeue() |
95 | 97 | { |
@@ -293,6 +295,9 @@ discard block |
||
293 | 295 | } |
294 | 296 | } |
295 | 297 | |
298 | + /** |
|
299 | + * @param string $tag |
|
300 | + */ |
|
296 | 301 | public function getCollection($tag = null) |
297 | 302 | { |
298 | 303 | if ($tag === null) { |
@@ -335,7 +340,7 @@ discard block |
||
335 | 340 | } |
336 | 341 | |
337 | 342 | /** |
338 | - * @return \Ackintosh\Sniden\Error |
|
343 | + * @return Error |
|
339 | 344 | */ |
340 | 345 | public function getError() |
341 | 346 | { |
@@ -9,7 +9,6 @@ |
||
9 | 9 | use Ackintosh\Snidel\Result\Queue as ResultQueue; |
10 | 10 | use Ackintosh\Snidel\Result\Collection; |
11 | 11 | use Ackintosh\Snidel\Error; |
12 | -use Ackintosh\Snidel\Exception\SharedMemoryControlException; |
|
13 | 12 | use Ackintosh\Snidel\Worker; |
14 | 13 | use Ackintosh\Snidel\ActiveWorkerSet; |
15 | 14 |
@@ -60,8 +60,8 @@ discard block |
||
60 | 60 | foreach ($this->signals as $sig) { |
61 | 61 | $this->pcntl->signal( |
62 | 62 | $sig, |
63 | - function ($sig) use($log, $self) { |
|
64 | - $log->info('received signal. signo: ' . $sig); |
|
63 | + function($sig) use($log, $self) { |
|
64 | + $log->info('received signal. signo: '.$sig); |
|
65 | 65 | $self->setReceivedSignal($sig); |
66 | 66 | |
67 | 67 | $log->info('--> sending a signal " to children.'); |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | ); |
74 | 74 | } |
75 | 75 | |
76 | - $this->log->info('parent pid: ' . $this->ownerPid); |
|
76 | + $this->log->info('parent pid: '.$this->ownerPid); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | throw $e; |
112 | 112 | } |
113 | 113 | |
114 | - $this->log->info('queued task #' . $this->container->queuedCount()); |
|
114 | + $this->log->info('queued task #'.$this->container->queuedCount()); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $this->wait(); |
155 | 155 | } |
156 | 156 | if ($tag !== null && !$this->container->hasTag($tag)) { |
157 | - throw new \InvalidArgumentException('unknown tag: ' . $tag); |
|
157 | + throw new \InvalidArgumentException('unknown tag: '.$tag); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | return $this->container->getCollection($tag); |
@@ -7,10 +7,7 @@ |
||
7 | 7 | use Ackintosh\Snidel\Result\Result; |
8 | 8 | use Ackintosh\Snidel\Log; |
9 | 9 | use Ackintosh\Snidel\Pcntl; |
10 | -use Ackintosh\Snidel\DataRepository; |
|
11 | -use Ackintosh\Snidel\MapContainer; |
|
12 | 10 | use Ackintosh\Snidel\Task\Task; |
13 | -use Ackintosh\Snidel\Exception\SharedMemoryControlException; |
|
14 | 11 | |
15 | 12 | class Snidel |
16 | 13 | { |