From: Roland Häder Date: Fri, 18 May 2012 21:27:29 +0000 (+0000) Subject: More debugging, ignore *.serialized in node_list X-Git-Url: https://git.mxchange.org/?p=hub.git;a=commitdiff_plain;h=006066c5c265de0938f19e518e64dd789b6d2de5;ds=sidebyside More debugging, ignore *.serialized in node_list --- diff --git a/.gitignore b/.gitignore index 0b7f63a19..dff3b9906 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /.settings application/hub/config-local.php db/node_data/*.serialized +db/node_list/*.serialized db/node_states/*.serialized db/peer_states/*.serialized docs/warn.log diff --git a/application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php b/application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php index 4c9f2f499..4a1a6b21a 100644 --- a/application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php +++ b/application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php @@ -147,7 +147,7 @@ class PeerStateLookupDatabaseWrapper extends BaseDatabaseWrapper implements Look $dataSetInstance->addCriteria(self::DB_COLUMN_PEER_SESSION_ID, $packageData[NetworkPackage::PACKAGE_DATA_SENDER]); // Get peer name - if (!@socket_getpeername($socketResource, $peerName, $peerPort)) { + if (!socket_getpeername($socketResource, $peerName, $peerPort)) { // Get last error $lastError = socket_last_error($socketResource); @@ -220,7 +220,7 @@ class PeerStateLookupDatabaseWrapper extends BaseDatabaseWrapper implements Look */ public function purgeOldEntriesBySocketResource ($socketResource) { // Get peer name - if (!@socket_getpeername($socketResource, $peerName, $peerPort)) { + if (!socket_getpeername($socketResource, $peerName, $peerPort)) { // Get last error $lastError = socket_last_error($socketResource); diff --git a/application/hub/main/handler/network/class_BaseRawDataHandler.php b/application/hub/main/handler/network/class_BaseRawDataHandler.php index 16c7c15e3..9a3cc31b8 100644 --- a/application/hub/main/handler/network/class_BaseRawDataHandler.php +++ b/application/hub/main/handler/network/class_BaseRawDataHandler.php @@ -153,7 +153,6 @@ class BaseRawDataHandler extends BaseHandler { $ownAddress = Registry::getRegistry()->getInstance('node')->getAddressPort($this); // Does it match? - // @TODO Numeric or alpha-numeric index? $matches = ($ownAddress === $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT]); // Return result diff --git a/application/hub/main/handler/network/tcp/class_TcpRawDataHandler.php b/application/hub/main/handler/network/tcp/class_TcpRawDataHandler.php index 6c6e5ff4a..36b883d6b 100644 --- a/application/hub/main/handler/network/tcp/class_TcpRawDataHandler.php +++ b/application/hub/main/handler/network/tcp/class_TcpRawDataHandler.php @@ -69,17 +69,17 @@ class TcpRawDataHandler extends BaseRawDataHandler implements Networkable { $decodedData = false; // Debug message - //* NOISY-DEBUG: */ $this->debugOutput('HANDLER: Handling TCP package from peer ' . $resource); + /* NOISY-DEBUG: */ $this->debugOutput('TCP-HANDLER: Handling TCP package from peer ' . $resource . ',last error=' . socket_strerror(socket_last_error($resource))); /* * Read the raw data from socket. If you change PHP_BINARY_READ to - * PHP_NORMAL_READ, this line will endless block. We only have - * simultanous threads and no real threads. + * PHP_NORMAL_READ, this line will endless block. This script does only + * provide simultanous threads, not real. */ $rawData = socket_read($resource, $this->getConfigInstance()->getConfigEntry('tcp_buffer_length'), PHP_BINARY_READ); // Debug output of read data length - //* NOISY-DEBUG: */ $this->debugOutput('TCP-HANDLER: rawData[]=' . strlen($rawData)); + /* NOISY-DEBUG: */ $this->debugOutput('TCP-HANDLER: rawData[' . gettype($rawData) . ']=' . strlen($rawData) . ',resource=' . $resource . ',error=' . socket_strerror(socket_last_error($resource))); // Is it valid? if (($rawData === false) || (socket_last_error($resource) > 0)) { @@ -90,9 +90,8 @@ class TcpRawDataHandler extends BaseRawDataHandler implements Networkable { $this->setErrorCode(self::SOCKET_ERROR_EMPTY_DATA); } else { /* - * Low-level checks of the raw data went all fine, we can now - * decode the raw data. This may still fail because of invalid - * encoded data. + * Low-level checks of the raw data went all fine, now decode the + * raw data. This may still fail because of invalid encoded data. */ $decodedData = $this->getInputStreamInstance()->streamData($rawData); } diff --git a/application/hub/main/helper/connection/class_BaseConnectionHelper.php b/application/hub/main/helper/connection/class_BaseConnectionHelper.php index d180499e5..6fa2861b0 100644 --- a/application/hub/main/helper/connection/class_BaseConnectionHelper.php +++ b/application/hub/main/helper/connection/class_BaseConnectionHelper.php @@ -406,10 +406,10 @@ class BaseConnectionHelper extends BaseHubHelper implements Registerable, Protoc //* NOISY-DEBUG: */ $this->debugOutput('CONNECTION: Sending out ' . strlen($encodedData) . ' bytes,bufferSize=' . $bufferSize . ',diff=' . $this->diff); if ($this->diff >= 0) { // Send all out (encodedData is smaller than or equal buffer size) - $sentBytes = @socket_write($socketResource, $encodedData, ($bufferSize - $this->diff)); + $sentBytes = socket_write($socketResource, $encodedData, ($bufferSize - $this->diff)); } else { // Send buffer size out - $sentBytes = @socket_write($socketResource, $encodedData, $bufferSize); + $sentBytes = socket_write($socketResource, $encodedData, $bufferSize); } // If there was an error, we don't continue here diff --git a/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php b/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php index f7efa68d6..8603b693c 100644 --- a/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php +++ b/application/hub/main/helper/connection/tcp/class_TcpConnectionHelper.php @@ -149,7 +149,7 @@ class TcpConnectionHelper extends BaseConnectionHelper implements ConnectionHelp socket_clear_error($this->getSocketResource()); // Call the shutdown function on the currently set socket - if (!@socket_shutdown($this->getSocketResource())) { + if (!socket_shutdown($this->getSocketResource())) { // Could not shutdown socket, this is fine if e.g. the other side is not connected, so analyse it if (socket_last_error($this->getSocketResource()) != 107) { // Something bad happened while we shutdown a socket diff --git a/application/hub/main/listener/tcp/class_TcpListener.php b/application/hub/main/listener/tcp/class_TcpListener.php index 1a5797366..2f6a3224a 100644 --- a/application/hub/main/listener/tcp/class_TcpListener.php +++ b/application/hub/main/listener/tcp/class_TcpListener.php @@ -259,7 +259,7 @@ class TcpListener extends BaseListener implements Listenable { // Handle it here, if not main socket if ($currentSocket != $this->getSocketResource()) { // ... or else it will raise warnings like 'Transport endpoint is not connected' - //* NOISY-DEBUG: */ $this->debugOutput('TCP-LISTENER: currentSocket=' . $currentSocket); + //* NOISY-DEBUG: */ $this->debugOutput('TCP-LISTENER: currentSocket=' . $currentSocket . ',server=' . $this->getSocketResource()); $this->getHandlerInstance()->processRawDataFromResource($currentSocket); } // END - if diff --git a/application/hub/main/listener/udp/class_UdpListener.php b/application/hub/main/listener/udp/class_UdpListener.php index 47dd7f9cf..5a26b7f3d 100644 --- a/application/hub/main/listener/udp/class_UdpListener.php +++ b/application/hub/main/listener/udp/class_UdpListener.php @@ -152,7 +152,7 @@ class UdpListener extends BaseListener implements Listenable { */ public function doListen() { // Read a package and determine the peer - $amount = @socket_recvfrom($this->getSocketResource(), $pkt, 1500, 0, $peer, $port); + $amount = @socket_recvfrom($this->getSocketResource(), $rawData, $this->getConfigInstance()->getConfigEntry('udp_buffer_length'), MSG_DONTWAIT, $peer, $port); // Get last error $lastError = socket_last_error($this->getSocketResource()); @@ -163,7 +163,7 @@ class UdpListener extends BaseListener implements Listenable { * This (resource temporary unavailable) can be safely ignored on * "listening" UDP ports. If we don't clear the error here, our UDP * "listener" won't read any packages except if the UDP sender - * starts the transmission before this "listener came up... + * starts the transmission before this "listener" came up... */ socket_clear_error($this->getSocketResource()); @@ -175,13 +175,13 @@ class UdpListener extends BaseListener implements Listenable { // Skip further processing return; - } elseif ((empty($pkt)) || (trim($peer) == '')) { + } elseif ((empty($rawData)) || (trim($peer) == '')) { // Zero sized packages/peer names are usual in non-blocking mode return; } // END - if // Debug only - $this->debugOutput('UDP-LISTENER: Handling UDP package with size ' . strlen($pkt) . ' from peer ' . $peer . ':' . $port); + $this->debugOutput('UDP-LISTENER: Handling UDP package with size ' . strlen($rawData) . ' from peer ' . $peer . ':' . $port); } /** diff --git a/application/hub/main/package/class_NetworkPackage.php b/application/hub/main/package/class_NetworkPackage.php index 531276919..dbb598c01 100644 --- a/application/hub/main/package/class_NetworkPackage.php +++ b/application/hub/main/package/class_NetworkPackage.php @@ -824,7 +824,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R * Also make sure the error code is SOCKET_ERROR_UNHANDLED because we * only want to handle unhandled packages here. */ - /* NOISY-DEBUG: */ $this->debugOutput('NETWORK-PACKAGE: errorCode=' . $decodedData[BaseRawDataHandler::PACKAGE_ERROR_CODE]); + /* NOISY-DEBUG: */ $this->debugOutput('NETWORK-PACKAGE: errorCode=' . $decodedData[BaseRawDataHandler::PACKAGE_ERROR_CODE] . '(' . BaseRawDataHandler::SOCKET_ERROR_UNHANDLED . ')'); assert($decodedData[BaseRawDataHandler::PACKAGE_ERROR_CODE] == BaseRawDataHandler::SOCKET_ERROR_UNHANDLED); // Remove the last chunk SEPARATOR (because it is being added and we don't need it) diff --git a/application/hub/main/pools/peer/class_DefaultPeerPool.php b/application/hub/main/pools/peer/class_DefaultPeerPool.php index 8261a2886..6722bfe56 100644 --- a/application/hub/main/pools/peer/class_DefaultPeerPool.php +++ b/application/hub/main/pools/peer/class_DefaultPeerPool.php @@ -100,7 +100,7 @@ class DefaultPeerPool extends BasePool implements PoolablePeer { // The socket resource should not match server socket if ($socketResource != $this->getListenerInstance()->getSocketResource()) { // Try to determine the peer's IP number - if (!@socket_getpeername($socketResource, $peerName)) { + if (!socket_getpeername($socketResource, $peerName)) { // Handle the socket error with a faked recipientData array $this->handleSocketError($socketResource, array('0.0.0.0', '0')); /* @@ -117,7 +117,7 @@ class DefaultPeerPool extends BasePool implements PoolablePeer { } // Output error message - $this->debugOutput('POOL: Adding peer ' . $peerName . ', socketResource=' . $socketResource); + $this->debugOutput('POOL: Adding peer ' . $peerName . ',socketResource=' . $socketResource); // Add it finally to the pool $this->addPoolEntry($socketResource); @@ -165,7 +165,7 @@ class DefaultPeerPool extends BasePool implements PoolablePeer { } // END - if // Try to get the "peer"'s name - if (!@socket_getpeername($socket, $peerIp)) { + if (!socket_getpeername($socket, $peerIp)) { // Handle the socket error with given package data $this->handleSocketError($socket, explode(':', $packageData[NetworkPackage::PACKAGE_DATA_RECIPIENT])); } // END - if