Remove debug logging; increase receive buffer size to 64 KB

Author: tony-martin-aste

src/Crusse/JobServer/EventLoop.php

@@ -83,7 +83,8 @@ private function addClientSocket( $socket ) {
 
   function listen( $acceptTimeout = 60 ) {
 
-    file_put_contents( '/tmp/crusse-job-server.log', '' );
+    // Uncomment only when debugging
+    //file_put_contents( '/tmp/crusse-job-server.log', '' );
 
     @unlink( $this->serverSocketAddr );
 
@@ -192,7 +193,7 @@ private function handleReadableSockets( $sockets ) {
       if ( !$messages )
         continue;
 
-      $this->log( 'Buffer had '. count( $messages ) .' messages' );
+      //$this->log( 'Buffer had '. count( $messages ) .' messages' );
 
       foreach ( $messages as $message ) {
         foreach ( $this->callbacks as $callback ) {
@@ -223,7 +224,7 @@ private function handleWritableSockets( $sockets ) {
         throw new \Exception( 'Could not write to socket' );
       }
 
-      $this->log( 'Sent '. $sentBytes .' b to '. $socketIndex );
+      //$this->log( 'Sent '. $sentBytes .' b to '. $socketIndex );
       $this->writeBuffer[ $socketIndex ] = substr( $buffer, $sentBytes );
     }
   }
@@ -238,7 +239,7 @@ private function acceptClient() {
     }
 
     $this->addClientSocket( $socket );
-    $this->log( 'Accepted client '. ( count( $this->sockets ) - 1 ) );
+    //$this->log( 'Accepted client '. ( count( $this->sockets ) - 1 ) );
 
     return $socket;
   }
@@ -258,7 +259,7 @@ private function getMessagesFromSocket( $socket ) {
     // Populate the MessageBuffer from the socket
 
     $data = '';
-    $dataLen = socket_recv( $socket, $data, 32 * 1024, MSG_DONTWAIT );
+    $dataLen = socket_recv( $socket, $data, 64 * 1024, MSG_DONTWAIT );
 
     // There was an error
     if ( $dataLen === false ) {
@@ -274,7 +275,7 @@ private function getMessagesFromSocket( $socket ) {
       return array();
     }
 
-    $this->log( 'Recvd '. $dataLen .' b from '. $socketIndex );
+    //$this->log( 'Recvd '. $dataLen .' b from '. $socketIndex );
     $this->populateMessageBuffer( $data, $buffer );
 
     // Get finished Message objects from the MessageBuffer
@@ -291,7 +292,7 @@ private function getMessagesFromSocket( $socket ) {
       // partially) other messages' data
       if ( $overflowBytes > 0 ) {
 
-        $this->log( 'Recvd multiple messages from socket (overflow: '. $overflowBytes .' b)' );
+        //$this->log( 'Recvd multiple messages from socket (overflow: '. $overflowBytes .' b)' );
 
         $overflow = substr( $buffer->message->body, -$overflowBytes );
         $buffer->message->body .= substr( $buffer->message->body, 0, -$overflowBytes );
@@ -361,6 +362,9 @@ private function closeConnection( $socket ) {
 
   private function log( $msg, $socketIndex = 0 ) {
 
+    // Remove this only for debugging
+    return;
+
     static $id = '';
     if ( !$id )
       $id = uniqid();

tests/test.php

@@ -23,12 +23,12 @@ function generateString($length) {
 $server->addWorkerInclude( __DIR__ .'/functions.php' );
 $server->setWorkerTimeout( 2 );
 for ( $i = 0; $i < 50; $i++ )
-  $server->addJob( 'job_test', 'Job '. $i .': '. generateString( 50 ) );
+  $server->addJob( 'job_test', 'Job '. $i .': '. generateString( 100 * 250 ) );
 
 echo 'Results with callback:'. PHP_EOL . PHP_EOL;
 
 $server->getResults( function( $result, $jobNumber, $total ) {
-  echo 'Job '. $jobNumber .'/'. $total .': '. $result . PHP_EOL;
+  echo 'Job '. $jobNumber .'/'. $total . PHP_EOL;
 } );
 
 echo PHP_EOL .'Ordered results:'. PHP_EOL . PHP_EOL;
@@ -37,7 +37,7 @@ function generateString($length) {
 $server->addWorkerInclude( __DIR__ .'/functions.php' );
 $server->setWorkerTimeout( 2 );
 for ( $i = 0; $i < 50; $i++ )
-  $server->addJob( 'job_test', 'Job '. $i .': '. generateString( 50 ) );
+  $server->addJob( 'job_test', 'Job '. $i .': '. generateString( 100 * 250 ) );
 
 $time = microtime( true );
 
@@ -46,7 +46,7 @@ function generateString($length) {
 $elapsed = ( microtime( true ) - $time ) * 1000;
 $elapsedTotal = ( microtime( true ) - $timeTotal ) * 1000;
 
-echo implode( PHP_EOL, $res ) . PHP_EOL . PHP_EOL;
+echo implode( PHP_EOL, array_keys( $res ) ) . PHP_EOL . PHP_EOL;
 echo 'Finished in '. $elapsed .' ms'. PHP_EOL;
 echo 'Total '. $elapsedTotal .' ms'. PHP_EOL;