@@ -7,8 +7,6 @@ |
||
7 | 7 | use Ackintosh\Snidel\Fork\Container; |
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 | 11 | |
14 | 12 | class Snidel |
@@ -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, Config $config) |
58 | 59 | { |
@@ -66,6 +67,7 @@ discard block |
||
66 | 67 | |
67 | 68 | /** |
68 | 69 | * @param \Ackintosh\Snidel\Task |
70 | + * @param \Ackintosh\Snidel\Task\Task $task |
|
69 | 71 | * @return void |
70 | 72 | * @throws \RuntimeException |
71 | 73 | */ |
@@ -91,7 +93,7 @@ discard block |
||
91 | 93 | } |
92 | 94 | |
93 | 95 | /** |
94 | - * @return \Ackintosh\Snidel\Fork\Fork |
|
96 | + * @return \Ackintosh\Snidel\Result\Result |
|
95 | 97 | */ |
96 | 98 | private function dequeue() |
97 | 99 | { |
@@ -310,6 +312,9 @@ discard block |
||
310 | 312 | } |
311 | 313 | } |
312 | 314 | |
315 | + /** |
|
316 | + * @param string $tag |
|
317 | + */ |
|
313 | 318 | public function getCollection($tag = null) |
314 | 319 | { |
315 | 320 | if ($tag === null) { |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | if (getmypid() === $this->ownerPid) { |
148 | 148 | // owner |
149 | - $this->log->info('pid: ' . getmypid()); |
|
149 | + $this->log->info('pid: '.getmypid()); |
|
150 | 150 | $this->taskQueue = $this->queueFactory->createTaskQueue(); |
151 | 151 | $this->resultQueue = $this->queueFactory->createResultQueue(); |
152 | 152 | |
@@ -154,20 +154,20 @@ discard block |
||
154 | 154 | } else { |
155 | 155 | // master |
156 | 156 | $activeWorkerSet = new ActiveWorkerSet(); |
157 | - $this->log->info('pid: ' . $this->masterPid); |
|
157 | + $this->log->info('pid: '.$this->masterPid); |
|
158 | 158 | |
159 | 159 | // for php5.3 |
160 | 160 | $log = $this->log; |
161 | 161 | $receivedSignal = &$this->receivedSignal; |
162 | 162 | foreach ($this->signals as $sig) { |
163 | - $this->pcntl->signal($sig, function ($sig) use ($log, $activeWorkerSet, $receivedSignal) { |
|
163 | + $this->pcntl->signal($sig, function($sig) use ($log, $activeWorkerSet, $receivedSignal) { |
|
164 | 164 | $receivedSignal = $sig; |
165 | - $log->info('received signal: ' . $sig); |
|
165 | + $log->info('received signal: '.$sig); |
|
166 | 166 | |
167 | 167 | if ($activeWorkerSet->count() === 0) { |
168 | 168 | $log->info('no worker is active.'); |
169 | 169 | } else { |
170 | - $log->info('------> sending signal to workers. signal: ' . $sig); |
|
170 | + $log->info('------> sending signal to workers. signal: '.$sig); |
|
171 | 171 | $activeWorkerSet->terminate($sig); |
172 | 172 | $log->info('<------ sent signal'); |
173 | 173 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | }); |
176 | 176 | } |
177 | 177 | |
178 | - $concurrency = (int)$this->config->get('concurrency'); |
|
178 | + $concurrency = (int) $this->config->get('concurrency'); |
|
179 | 179 | for ($i = 0; $i < $concurrency; $i++) { |
180 | 180 | $activeWorkerSet->add($this->forkWorker()); |
181 | 181 | } |
@@ -212,17 +212,17 @@ discard block |
||
212 | 212 | |
213 | 213 | if (getmypid() === $this->masterPid) { |
214 | 214 | // master |
215 | - $this->log->info('forked worker. pid: ' . $worker->getPid()); |
|
215 | + $this->log->info('forked worker. pid: '.$worker->getPid()); |
|
216 | 216 | return $worker; |
217 | 217 | } else { |
218 | 218 | // worker |
219 | 219 | // @codeCoverageIgnoreStart |
220 | - $this->log->info('has forked. pid: ' . getmypid()); |
|
220 | + $this->log->info('has forked. pid: '.getmypid()); |
|
221 | 221 | |
222 | 222 | // for php5.3 |
223 | 223 | $receivedSignal = &$this->receivedSignal; |
224 | 224 | foreach ($this->signals as $sig) { |
225 | - $this->pcntl->signal($sig, function ($sig) use ($receivedSignal) { |
|
225 | + $this->pcntl->signal($sig, function($sig) use ($receivedSignal) { |
|
226 | 226 | $receivedSignal = $sig; |
227 | 227 | exit; |
228 | 228 | }, false); |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | $worker->setTaskQueue($this->queueFactory->createTaskQueue()); |
232 | 232 | $worker->setResultQueue($this->queueFactory->createResultQueue()); |
233 | 233 | |
234 | - register_shutdown_function(function () use ($worker, $receivedSignal) { |
|
234 | + register_shutdown_function(function() use ($worker, $receivedSignal) { |
|
235 | 235 | if ($worker->isFailedToEnqueueResult() && $receivedSignal === null) { |
236 | 236 | $worker->error(); |
237 | 237 | } |
@@ -267,14 +267,14 @@ discard block |
||
267 | 267 | */ |
268 | 268 | public function sendSignalToMaster($sig = SIGTERM) |
269 | 269 | { |
270 | - $this->log->info('----> sending signal to master. signal: ' . $sig); |
|
270 | + $this->log->info('----> sending signal to master. signal: '.$sig); |
|
271 | 271 | posix_kill($this->masterPid, $sig); |
272 | 272 | $this->log->info('<---- sent signal.'); |
273 | 273 | |
274 | 274 | $this->log->info('----> waiting for master shutdown.'); |
275 | 275 | $status = null; |
276 | 276 | $this->pcntl->waitpid($this->masterPid, $status); |
277 | - $this->log->info('<---- master shutdown. status: ' . $status); |
|
277 | + $this->log->info('<---- master shutdown. status: '.$status); |
|
278 | 278 | $this->masterPid = null; |
279 | 279 | } |
280 | 280 |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -declare(ticks=1); |
|
2 | +declare(ticks = 1); |
|
3 | 3 | |
4 | 4 | namespace Ackintosh\Snidel; |
5 | 5 |