From f8a74acb02c35fa9e67abfe3c44aa9b4eb8edfa9 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 6 Sep 2013 10:19:17 -0700 Subject: [PATCH 01/28] Special frustum handling for mirrored mode. --- interface/src/Application.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index eefbc69d25..296a3e2df2 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -446,6 +446,13 @@ void Application::updateProjectionMatrix() { nearVal = _viewFrustumOffsetCamera.getNearClip(); farVal = _viewFrustumOffsetCamera.getFarClip(); } + + // when mirrored, we must flip left and right + if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { + float tmp = left; + left = -right; + right = -tmp; + } glFrustum(left, right, bottom, top, nearVal, farVal); glMatrixMode(GL_MODELVIEW); @@ -1812,8 +1819,9 @@ void Application::update(float deltaTime) { updateProjectionMatrix(); } else if (_webcam.isActive()) { - const float EYE_OFFSET_SCALE = 5.0f; - _myCamera.setEyeOffsetPosition(_webcam.getEstimatedPosition() * EYE_OFFSET_SCALE); + const float EYE_OFFSET_SCALE = 0.1f; + glm::vec3 position = _webcam.getEstimatedPosition() * EYE_OFFSET_SCALE; + _myCamera.setEyeOffsetPosition(glm::vec3(-position.x, -position.y, position.z)); updateProjectionMatrix(); } } @@ -1966,7 +1974,15 @@ void Application::loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum) { viewFrustum.setFieldOfView(fov); viewFrustum.setNearClip(nearClip); viewFrustum.setFarClip(farClip); - viewFrustum.setEyeOffsetPosition(camera.getEyeOffsetPosition()); + + // when mirrored, we must flip the eye offset in x to get the correct frustum + if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { + glm::vec3 position = camera.getEyeOffsetPosition(); + viewFrustum.setEyeOffsetPosition(glm::vec3(-position.x, position.y, position.z)); + + } else { + viewFrustum.setEyeOffsetPosition(camera.getEyeOffsetPosition()); + } viewFrustum.setEyeOffsetOrientation(camera.getEyeOffsetOrientation()); // Ask the ViewFrustum class to calculate our corners From 9eef894e24028dbb28346bad943a51acbe777f2e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 6 Sep 2013 14:35:59 -0700 Subject: [PATCH 02/28] add doxygen documentation for Assignment classes --- libraries/audio/src/AudioMixer.h | 2 ++ libraries/avatars/src/AvatarMixer.h | 2 ++ libraries/shared/src/Assignment.h | 18 +++++++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libraries/audio/src/AudioMixer.h b/libraries/audio/src/AudioMixer.h index 6318e756dc..fa67d55bca 100644 --- a/libraries/audio/src/AudioMixer.h +++ b/libraries/audio/src/AudioMixer.h @@ -9,8 +9,10 @@ #ifndef __hifi__AudioMixer__ #define __hifi__AudioMixer__ +/// Handles assignments of type AudioMixer - mixing streams of audio and re-distributing to various clients. class AudioMixer { public: + /// runs the audio mixer static void run(); }; diff --git a/libraries/avatars/src/AvatarMixer.h b/libraries/avatars/src/AvatarMixer.h index cf3f2245fe..7e58e067ce 100644 --- a/libraries/avatars/src/AvatarMixer.h +++ b/libraries/avatars/src/AvatarMixer.h @@ -11,8 +11,10 @@ #include +/// Handles assignments of type AvatarMixer - distribution of avatar data to various clients class AvatarMixer { public: + /// runs the avatar mixer static void run(); }; diff --git a/libraries/shared/src/Assignment.h b/libraries/shared/src/Assignment.h index 720169e55b..2c2673f351 100644 --- a/libraries/shared/src/Assignment.h +++ b/libraries/shared/src/Assignment.h @@ -11,6 +11,7 @@ #include "NodeList.h" +/// Holds information used for request, creation, and deployment of assignments class Assignment { public: @@ -27,6 +28,10 @@ public: }; Assignment(Assignment::Direction direction, Assignment::Type type, const char* pool = NULL); + + /// Constructs an Assignment from the data in the buffer + /// \param dataBuffer the source buffer to un-pack the assignment from + /// \param numBytes the number of bytes left to read in the source buffer Assignment(const unsigned char* dataBuffer, int numBytes); ~Assignment(); @@ -39,14 +44,17 @@ public: const sockaddr* getDomainSocket() { return _domainSocket; } void setDomainSocket(const sockaddr* domainSocket); + /// Packs the assignment to the passed buffer + /// \param buffer the buffer in which to pack the assignment + /// \return number of bytes packed into buffer int packToBuffer(unsigned char* buffer); private: - Assignment::Direction _direction; - Assignment::Type _type; - char* _pool; - sockaddr* _domainSocket; - timeval _time; + Assignment::Direction _direction; /// the direction of the assignment (Create, Deploy, Request) + Assignment::Type _type; /// the type of the assignment, defines what the assignee will do + char* _pool; /// the pool this assignment is for/from + sockaddr* _domainSocket; /// pointer to socket for domain server that created assignment + timeval _time; /// time the assignment was created (set in constructor) }; QDebug operator<<(QDebug debug, const Assignment &assignment); From 26411a42b1c5ad132c24fd98a47d5647d1e3f794 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 6 Sep 2013 15:07:15 -0700 Subject: [PATCH 03/28] More focal length bits. --- interface/src/Application.cpp | 32 ++++++++++++++++++++++++---- libraries/voxels/src/ViewFrustum.cpp | 30 +++++++++++++++++--------- libraries/voxels/src/ViewFrustum.h | 15 +++++++------ 3 files changed, 57 insertions(+), 20 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 296a3e2df2..741cb6ad52 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -638,8 +638,8 @@ void Application::keyPressEvent(QKeyEvent* event) { case Qt::Key_J: if (isShifted) { - _myCamera.setEyeOffsetOrientation(glm::normalize( - glm::quat(glm::vec3(0, 0.002f, 0)) * _myCamera.getEyeOffsetOrientation())); + _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() - 0.1f); + } else { _myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(-0.001, 0, 0)); } @@ -648,8 +648,8 @@ void Application::keyPressEvent(QKeyEvent* event) { case Qt::Key_M: if (isShifted) { - _myCamera.setEyeOffsetOrientation(glm::normalize( - glm::quat(glm::vec3(0, -0.002f, 0)) * _myCamera.getEyeOffsetOrientation())); + _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() + 0.1f); + } else { _myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(0.001, 0, 0)); } @@ -2934,6 +2934,30 @@ void Application::renderViewFrustum(ViewFrustum& viewFrustum) { // left plane - top edge - viewFrustum.getNear to distant glVertex3f(viewFrustum.getNearTopLeft().x, viewFrustum.getNearTopLeft().y, viewFrustum.getNearTopLeft().z); glVertex3f(viewFrustum.getFarTopLeft().x, viewFrustum.getFarTopLeft().y, viewFrustum.getFarTopLeft().z); + + // focal plane - bottom edge + glColor3f(1.0f, 0.0f, 1.0f); + float focalProportion = (viewFrustum.getFocalLength() - viewFrustum.getNearClip()) / + (viewFrustum.getFarClip() - viewFrustum.getNearClip()); + glm::vec3 focalBottomLeft = glm::mix(viewFrustum.getNearBottomLeft(), viewFrustum.getFarBottomLeft(), focalProportion); + glm::vec3 focalBottomRight = glm::mix(viewFrustum.getNearBottomRight(), + viewFrustum.getFarBottomRight(), focalProportion); + glVertex3f(focalBottomLeft.x, focalBottomLeft.y, focalBottomLeft.z); + glVertex3f(focalBottomRight.x, focalBottomRight.y, focalBottomRight.z); + + // focal plane - top edge + glm::vec3 focalTopLeft = glm::mix(viewFrustum.getNearTopLeft(), viewFrustum.getFarTopLeft(), focalProportion); + glm::vec3 focalTopRight = glm::mix(viewFrustum.getNearTopRight(), viewFrustum.getFarTopRight(), focalProportion); + glVertex3f(focalTopLeft.x, focalTopLeft.y, focalTopLeft.z); + glVertex3f(focalTopRight.x, focalTopRight.y, focalTopRight.z); + + // focal plane - left edge + glVertex3f(focalBottomLeft.x, focalBottomLeft.y, focalBottomLeft.z); + glVertex3f(focalTopLeft.x, focalTopLeft.y, focalTopLeft.z); + + // focal plane - right edge + glVertex3f(focalBottomRight.x, focalBottomRight.y, focalBottomRight.z); + glVertex3f(focalTopRight.x, focalTopRight.y, focalTopRight.z); } glEnd(); glEnable(GL_LIGHTING); diff --git a/libraries/voxels/src/ViewFrustum.cpp b/libraries/voxels/src/ViewFrustum.cpp index a35dc49ec0..7914ad0165 100644 --- a/libraries/voxels/src/ViewFrustum.cpp +++ b/libraries/voxels/src/ViewFrustum.cpp @@ -32,6 +32,7 @@ ViewFrustum::ViewFrustum() : _aspectRatio(1.0), _nearClip(0.1), _farClip(500.0), + _focalLength(0.25f), _keyholeRadius(DEFAULT_KEYHOLE_RADIUS), _farTopLeft(0,0,0), _farTopRight(0,0,0), @@ -310,15 +311,16 @@ bool testMatches(float lhs, float rhs) { bool ViewFrustum::matches(const ViewFrustum& compareTo, bool debug) const { bool result = - testMatches(compareTo._position, _position ) && - testMatches(compareTo._direction, _direction ) && - testMatches(compareTo._up, _up ) && - testMatches(compareTo._right, _right ) && - testMatches(compareTo._fieldOfView, _fieldOfView ) && - testMatches(compareTo._aspectRatio, _aspectRatio ) && - testMatches(compareTo._nearClip, _nearClip ) && - testMatches(compareTo._farClip, _farClip ) && - testMatches(compareTo._eyeOffsetPosition, _eyeOffsetPosition ) && + testMatches(compareTo._position, _position) && + testMatches(compareTo._direction, _direction) && + testMatches(compareTo._up, _up) && + testMatches(compareTo._right, _right) && + testMatches(compareTo._fieldOfView, _fieldOfView) && + testMatches(compareTo._aspectRatio, _aspectRatio) && + testMatches(compareTo._nearClip, _nearClip) && + testMatches(compareTo._farClip, _farClip) && + testMatches(compareTo._focalLength, _focalLength) && + testMatches(compareTo._eyeOffsetPosition, _eyeOffsetPosition) && testMatches(compareTo._eyeOffsetOrientation, _eyeOffsetOrientation); if (!result && debug) { @@ -351,6 +353,9 @@ bool ViewFrustum::matches(const ViewFrustum& compareTo, bool debug) const { qDebug("%s -- compareTo._farClip=%f _farClip=%f\n", (testMatches(compareTo._farClip, _farClip) ? "MATCHES " : "NO MATCH"), compareTo._farClip, _farClip); + qDebug("%s -- compareTo._focalLength=%f _focalLength=%f\n", + (testMatches(compareTo._focalLength, _focalLength) ? "MATCHES " : "NO MATCH"), + compareTo._focalLength, _focalLength); qDebug("%s -- compareTo._eyeOffsetPosition=%f,%f,%f _eyeOffsetPosition=%f,%f,%f\n", (testMatches(compareTo._eyeOffsetPosition, _eyeOffsetPosition) ? "MATCHES " : "NO MATCH"), compareTo._eyeOffsetPosition.x, compareTo._eyeOffsetPosition.y, compareTo._eyeOffsetPosition.z, @@ -401,13 +406,17 @@ void ViewFrustum::computeOffAxisFrustum(float& left, float& right, float& bottom nearClipPlane = glm::vec4(-normal.x, -normal.y, -normal.z, glm::dot(normal, corners[0])); farClipPlane = glm::vec4(normal.x, normal.y, normal.z, -glm::dot(normal, corners[4])); + // compute the focal proportion (zero is near clip, one is far clip) + float focalProportion = (_focalLength - _nearClip) / (_farClip - _nearClip); + // get the extents at Z = -near left = FLT_MAX; right = -FLT_MAX; bottom = FLT_MAX; top = -FLT_MAX; for (int i = 0; i < 4; i++) { - glm::vec4 intersection = corners[i] * (-near / corners[i].z); + glm::vec4 corner = glm::mix(corners[i], corners[i + 4], focalProportion); + glm::vec4 intersection = corner * (-near / corner.z); left = min(left, intersection.x); right = max(right, intersection.x); bottom = min(bottom, intersection.y); @@ -426,6 +435,7 @@ void ViewFrustum::printDebugDetails() const { qDebug("_keyHoleRadius=%f\n", _keyholeRadius); qDebug("_nearClip=%f\n", _nearClip); qDebug("_farClip=%f\n", _farClip); + qDebug("_focalLength=%f\n", _focalLength); qDebug("_eyeOffsetPosition=%f,%f,%f\n", _eyeOffsetPosition.x, _eyeOffsetPosition.y, _eyeOffsetPosition.z ); qDebug("_eyeOffsetOrientation=%f,%f,%f,%f\n", _eyeOffsetOrientation.x, _eyeOffsetOrientation.y, _eyeOffsetOrientation.z, _eyeOffsetOrientation.w ); diff --git a/libraries/voxels/src/ViewFrustum.h b/libraries/voxels/src/ViewFrustum.h index 22830cb48d..803e52908e 100644 --- a/libraries/voxels/src/ViewFrustum.h +++ b/libraries/voxels/src/ViewFrustum.h @@ -39,6 +39,7 @@ public: void setAspectRatio(float a) { _aspectRatio = a; } void setNearClip(float n) { _nearClip = n; } void setFarClip(float f) { _farClip = f; } + void setFocalLength(float length) { _focalLength = length; } void setEyeOffsetPosition(const glm::vec3& p) { _eyeOffsetPosition = p; } void setEyeOffsetOrientation(const glm::quat& o) { _eyeOffsetOrientation = o; } @@ -47,6 +48,7 @@ public: float getAspectRatio() const { return _aspectRatio; } float getNearClip() const { return _nearClip; } float getFarClip() const { return _farClip; } + float getFocalLength() const { return _focalLength; } const glm::vec3& getEyeOffsetPosition() const { return _eyeOffsetPosition; } const glm::quat& getEyeOffsetOrientation() const { return _eyeOffsetOrientation; } @@ -111,12 +113,13 @@ private: glm::vec3 _right; // Lens attributes - float _fieldOfView; - float _aspectRatio; - float _nearClip; - float _farClip; - glm::vec3 _eyeOffsetPosition; - glm::quat _eyeOffsetOrientation; + float _fieldOfView; + float _aspectRatio; + float _nearClip; + float _farClip; + float _focalLength; + glm::vec3 _eyeOffsetPosition; + glm::quat _eyeOffsetOrientation; // keyhole attributes float _keyholeRadius; From f18a40dc89f6933e801aff4510a9845e045b26e7 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 6 Sep 2013 15:12:53 -0700 Subject: [PATCH 04/28] correct timing for assignment-client check in --- assignment-client/src/main.cpp | 65 +++++++++++++++++-------------- libraries/shared/src/NodeList.cpp | 1 + 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index f3d6b8c0cd..ac34fb0723 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -16,7 +16,7 @@ #include #include -const int ASSIGNMENT_REQUEST_INTERVAL_USECS = 1 * 1000 * 1000; +const long long ASSIGNMENT_REQUEST_INTERVAL_USECS = 1 * 1000 * 1000; int main(int argc, char* const argv[]) { @@ -28,6 +28,8 @@ int main(int argc, char* const argv[]) { // change the timeout on the nodelist socket to be as often as we want to re-request nodeList->getNodeSocket()->setBlockingReceiveTimeoutInUsecs(ASSIGNMENT_REQUEST_INTERVAL_USECS); + timeval lastRequest = {}; + unsigned char packetData[MAX_PACKET_SIZE]; ssize_t receivedBytes = 0; @@ -51,38 +53,41 @@ int main(int argc, char* const argv[]) { Assignment requestAssignment(Assignment::Request, Assignment::All, assignmentPool); while (true) { - // if we're here we have no assignment, so send a request - qDebug() << "Sending an assignment request -" << requestAssignment; - nodeList->sendAssignment(requestAssignment); + if (usecTimestampNow() - usecTimestamp(&lastRequest) >= ASSIGNMENT_REQUEST_INTERVAL_USECS) { + gettimeofday(&lastRequest, NULL); + // if we're here we have no assignment, so send a request + qDebug() << "Sending an assignment request -" << requestAssignment; + nodeList->sendAssignment(requestAssignment); + } - while (nodeList->getNodeSocket()->receive(packetData, &receivedBytes)) { - if (packetData[0] == PACKET_TYPE_DEPLOY_ASSIGNMENT && packetVersionMatch(packetData)) { + if (nodeList->getNodeSocket()->receive(packetData, &receivedBytes) && + packetData[0] == PACKET_TYPE_DEPLOY_ASSIGNMENT && packetVersionMatch(packetData)) { + + // construct the deployed assignment from the packet data + Assignment deployedAssignment(packetData, receivedBytes); + + qDebug() << "Received an assignment - " << deployedAssignment << "\n"; + + // switch our nodelist DOMAIN_IP to the ip receieved in the assignment + if (deployedAssignment.getDomainSocket()->sa_family == AF_INET) { + in_addr domainSocketAddr = ((sockaddr_in*) deployedAssignment.getDomainSocket())->sin_addr; + nodeList->setDomainIP(inet_ntoa(domainSocketAddr)); - // construct the deployed assignment from the packet data - Assignment deployedAssignment(packetData, receivedBytes); - - qDebug() << "Received an assignment - " << deployedAssignment << "\n"; - - // switch our nodelist DOMAIN_IP to the ip receieved in the assignment - if (deployedAssignment.getDomainSocket()->sa_family == AF_INET) { - in_addr domainSocketAddr = ((sockaddr_in*) deployedAssignment.getDomainSocket())->sin_addr; - nodeList->setDomainIP(inet_ntoa(domainSocketAddr)); - - qDebug() << "Changed domain IP to " << inet_ntoa(domainSocketAddr); - } - - if (deployedAssignment.getType() == Assignment::AudioMixer) { - AudioMixer::run(); - } else { - AvatarMixer::run(); - } - - qDebug() << "Assignment finished or never started - waiting for new assignment"; - - // reset our NodeList by switching back to unassigned and clearing the list - nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); - nodeList->clear(); + qDebug() << "Changed domain IP to " << inet_ntoa(domainSocketAddr); } + + if (deployedAssignment.getType() == Assignment::AudioMixer) { + AudioMixer::run(); + } else { + qDebug() << "Running as an avatar mixer!"; + AvatarMixer::run(); + } + + qDebug() << "Assignment finished or never started - waiting for new assignment"; + + // reset our NodeList by switching back to unassigned and clearing the list + nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); + nodeList->clear(); } } } \ No newline at end of file diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index c650190a4a..db90856251 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -255,6 +255,7 @@ void NodeList::clear() { } _numNodes = 0; + _numNoReplyDomainCheckIns = 0; } void NodeList::setNodeTypesOfInterest(const char* nodeTypesOfInterest, int numNodeTypesOfInterest) { From 3b78678a7686393e2f7165fa87cab78a094bb1b0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 6 Sep 2013 15:21:55 -0700 Subject: [PATCH 05/28] cleanup pool grabbing for DS and AC --- assignment-client/src/main.cpp | 19 +++---------------- domain-server/src/main.cpp | 20 +++++--------------- libraries/shared/src/NodeList.cpp | 2 +- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index ac34fb0723..d33bf10e2e 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -18,7 +18,7 @@ const long long ASSIGNMENT_REQUEST_INTERVAL_USECS = 1 * 1000 * 1000; -int main(int argc, char* const argv[]) { +int main(int argc, const char* argv[]) { setvbuf(stdout, NULL, _IOLBF, 0); @@ -33,21 +33,8 @@ int main(int argc, char* const argv[]) { unsigned char packetData[MAX_PACKET_SIZE]; ssize_t receivedBytes = 0; - // loop the parameters to see if we were passed a pool - int parameter = -1; - const char ALLOWED_PARAMETERS[] = "p::"; - const char POOL_PARAMETER_CHAR = 'p'; - - char* assignmentPool = NULL; - - while ((parameter = getopt(argc, argv, ALLOWED_PARAMETERS)) != -1) { - if (parameter == POOL_PARAMETER_CHAR) { - // copy the passed assignment pool - int poolLength = strlen(optarg); - assignmentPool = new char[poolLength + sizeof(char)]; - strcpy(assignmentPool, optarg); - } - } + // grab the assignment pool from argv, if it was passed + const char* assignmentPool = getCmdOption(argc, argv, "-p"); // create a request assignment, accept all assignments, pass the desired pool (if it exists) Assignment requestAssignment(Assignment::Request, Assignment::All, assignmentPool); diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 882fa85098..4bb554ab53 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -48,7 +48,7 @@ unsigned char* addNodeToBroadcastPacket(unsigned char* currentPosition, Node* no return currentPosition; } -int main(int argc, char* const argv[]) { +int main(int argc, const char* argv[]) { NodeList* nodeList = NodeList::createInstance(NODE_TYPE_DOMAIN, DOMAIN_LISTEN_PORT); // If user asks to run in "local" mode then we do NOT replace the IP // with the EC2 IP. Otherwise, we will replace the IP like we used to @@ -85,21 +85,11 @@ int main(int argc, char* const argv[]) { timeval lastStatSendTime = {}; - // loop the parameters to see if we were passed a pool for assignment - int parameter = -1; - const char ALLOWED_PARAMETERS[] = "p::-local::"; - const char POOL_PARAMETER_CHAR = 'p'; + // set our assignment pool from argv, if it exists + const char* assignmentPool = getCmdOption(argc, argv, "-p"); - char* assignmentPool = NULL; - - while ((parameter = getopt(argc, argv, ALLOWED_PARAMETERS)) != -1) { - if (parameter == POOL_PARAMETER_CHAR) { - // copy the passed assignment pool - int poolLength = strlen(optarg); - assignmentPool = new char[poolLength + sizeof(char)]; - strcpy(assignmentPool, optarg); - } - } + // grab the overriden assignment-server hostname from argv, if it exists + const char* assignmentServer = getCmdOption(argc, argv, "-a"); // use a map to keep track of iterations of silence for assignment creation requests const int ASSIGNMENT_SILENCE_MAX_ITERATIONS = 5; diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index db90856251..cd52ff8ded 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -375,7 +375,7 @@ int NodeList::processDomainServerList(unsigned char* packetData, size_t dataByte return readNodes; } -const char ASSIGNMENT_SERVER_HOSTNAME[] = "assignment.highfidelity.io"; +const char ASSIGNMENT_SERVER_HOSTNAME[] = "localhost"; const sockaddr_in assignmentServerSocket = socketForHostnameAndHostOrderPort(ASSIGNMENT_SERVER_HOSTNAME, ASSIGNMENT_SERVER_PORT); From 65ef778efd6482007a8fd5b55b7e92a9977677d8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 6 Sep 2013 15:31:21 -0700 Subject: [PATCH 06/28] allow passing of custom assignment-server to DS and AC --- assignment-client/src/main.cpp | 3 +++ domain-server/src/main.cpp | 2 +- libraries/shared/src/NodeList.cpp | 10 +++++++--- libraries/shared/src/NodeList.h | 2 ++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index d33bf10e2e..1da0a0215a 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -36,6 +36,9 @@ int main(int argc, const char* argv[]) { // grab the assignment pool from argv, if it was passed const char* assignmentPool = getCmdOption(argc, argv, "-p"); + // set the overriden assignment-server hostname from argv, if it exists + nodeList->setAssignmentServerHostname(getCmdOption(argc, argv, "-a")); + // create a request assignment, accept all assignments, pass the desired pool (if it exists) Assignment requestAssignment(Assignment::Request, Assignment::All, assignmentPool); diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 4bb554ab53..5fcef77a8c 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -89,7 +89,7 @@ int main(int argc, const char* argv[]) { const char* assignmentPool = getCmdOption(argc, argv, "-p"); // grab the overriden assignment-server hostname from argv, if it exists - const char* assignmentServer = getCmdOption(argc, argv, "-a"); + nodeList->setAssignmentServerHostname(getCmdOption(argc, argv, "-a")); // use a map to keep track of iterations of silence for assignment creation requests const int ASSIGNMENT_SILENCE_MAX_ITERATIONS = 5; diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index cd52ff8ded..ad5876f622 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -375,9 +375,7 @@ int NodeList::processDomainServerList(unsigned char* packetData, size_t dataByte return readNodes; } -const char ASSIGNMENT_SERVER_HOSTNAME[] = "localhost"; -const sockaddr_in assignmentServerSocket = socketForHostnameAndHostOrderPort(ASSIGNMENT_SERVER_HOSTNAME, - ASSIGNMENT_SERVER_PORT); +const char GLOBAL_ASSIGNMENT_SERVER_HOSTNAME[] = "assignment.highfidelity.io"; void NodeList::sendAssignment(Assignment& assignment) { unsigned char assignmentPacket[MAX_PACKET_SIZE]; @@ -388,6 +386,12 @@ void NodeList::sendAssignment(Assignment& assignment) { int numHeaderBytes = populateTypeAndVersion(assignmentPacket, assignmentPacketType); int numAssignmentBytes = assignment.packToBuffer(assignmentPacket + numHeaderBytes); + + // setup the assignmentServerSocket once, use a custom assignmentServerHostname if it is present + static sockaddr_in assignmentServerSocket = socketForHostnameAndHostOrderPort((_assignmentServerHostname != NULL + ? (const char*) _assignmentServerHostname + : GLOBAL_ASSIGNMENT_SERVER_HOSTNAME), + ASSIGNMENT_SERVER_PORT); _nodeSocket.send((sockaddr*) &assignmentServerSocket, assignmentPacket, numHeaderBytes + numAssignmentBytes); } diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h index 8afe8e38d3..dad422a29b 100644 --- a/libraries/shared/src/NodeList.h +++ b/libraries/shared/src/NodeList.h @@ -99,6 +99,7 @@ public: void sendDomainServerCheckIn(); int processDomainServerList(unsigned char *packetData, size_t dataBytes); + void setAssignmentServerHostname(const char* serverHostname) { _assignmentServerHostname = serverHostname; } void sendAssignment(Assignment& assignment); Node* nodeWithAddress(sockaddr *senderAddress); @@ -151,6 +152,7 @@ private: pthread_t removeSilentNodesThread; pthread_t checkInWithDomainServerThread; int _numNoReplyDomainCheckIns; + const char* _assignmentServerHostname; void handlePingReply(sockaddr *nodeAddress); void timePingReply(sockaddr *nodeAddress, unsigned char *packetData); From 8424c4e38b47de0bf968b982bc53e8f96dd9a41f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 6 Sep 2013 15:44:24 -0700 Subject: [PATCH 07/28] make DS immediately request assignments instead of waiting one silent loop --- domain-server/src/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 5fcef77a8c..6de926a7a7 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -101,9 +101,9 @@ int main(int argc, const char* argv[]) { Assignment avatarAssignment(Assignment::Create, Assignment::AvatarMixer, assignmentPool); while (true) { - if (!nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER)) { - if (assignmentSilenceCount[&audioAssignment] == ASSIGNMENT_SILENCE_MAX_ITERATIONS) { + std::map::iterator countIt = assignmentSilenceCount.find(&audioAssignment); + if (countIt == assignmentSilenceCount.end() || countIt->second == ASSIGNMENT_SILENCE_MAX_ITERATIONS) { nodeList->sendAssignment(audioAssignment); assignmentSilenceCount[&audioAssignment] = 0; } else { @@ -114,7 +114,8 @@ int main(int argc, const char* argv[]) { } if (!nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER)) { - if (assignmentSilenceCount[&avatarAssignment] == ASSIGNMENT_SILENCE_MAX_ITERATIONS) { + std::map::iterator countIt = assignmentSilenceCount.find(&avatarAssignment); + if (countIt == assignmentSilenceCount.end() || countIt->second == ASSIGNMENT_SILENCE_MAX_ITERATIONS) { nodeList->sendAssignment(avatarAssignment); assignmentSilenceCount[&avatarAssignment] = 0; } else { From cbf8a2c202c7b5e487c80bc758ffcf16a8c8aa30 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 6 Sep 2013 16:03:54 -0700 Subject: [PATCH 08/28] use create time already being stored with assignment to decide on re-send --- domain-server/src/main.cpp | 49 ++++++++++++++++------------- libraries/shared/src/Assignment.cpp | 38 +++++++++++----------- libraries/shared/src/Assignment.h | 5 +++ 3 files changed, 50 insertions(+), 42 deletions(-) diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 6de926a7a7..32a88e8e08 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -92,40 +92,42 @@ int main(int argc, const char* argv[]) { nodeList->setAssignmentServerHostname(getCmdOption(argc, argv, "-a")); // use a map to keep track of iterations of silence for assignment creation requests - const int ASSIGNMENT_SILENCE_MAX_ITERATIONS = 5; - std::map assignmentSilenceCount; + const long long ASSIGNMENT_SILENCE_MAX_USECS = 5 * 1000 * 1000; // as a domain-server we will always want an audio mixer and avatar mixer - // setup the create assignments for those - Assignment audioAssignment(Assignment::Create, Assignment::AudioMixer, assignmentPool); - Assignment avatarAssignment(Assignment::Create, Assignment::AvatarMixer, assignmentPool); + // setup the create assignment pointers for those + Assignment *audioAssignment = NULL; + Assignment *avatarAssignment = NULL; while (true) { if (!nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER)) { - std::map::iterator countIt = assignmentSilenceCount.find(&audioAssignment); - if (countIt == assignmentSilenceCount.end() || countIt->second == ASSIGNMENT_SILENCE_MAX_ITERATIONS) { - nodeList->sendAssignment(audioAssignment); - assignmentSilenceCount[&audioAssignment] = 0; - } else { - assignmentSilenceCount[&audioAssignment]++; + if (!audioAssignment + || usecTimestampNow() - usecTimestamp(&audioAssignment->getTime()) >= ASSIGNMENT_SILENCE_MAX_USECS) { + + if (!audioAssignment) { + audioAssignment = new Assignment(Assignment::Create, Assignment::AudioMixer, assignmentPool); + } + + nodeList->sendAssignment(*audioAssignment); + audioAssignment->setCreateTimeToNow(); } - } else { - assignmentSilenceCount[&audioAssignment] = 0; } if (!nodeList->soloNodeOfType(NODE_TYPE_AVATAR_MIXER)) { - std::map::iterator countIt = assignmentSilenceCount.find(&avatarAssignment); - if (countIt == assignmentSilenceCount.end() || countIt->second == ASSIGNMENT_SILENCE_MAX_ITERATIONS) { - nodeList->sendAssignment(avatarAssignment); - assignmentSilenceCount[&avatarAssignment] = 0; - } else { - assignmentSilenceCount[&avatarAssignment]++; + if (!avatarAssignment + || usecTimestampNow() - usecTimestamp(&avatarAssignment->getTime()) >= ASSIGNMENT_SILENCE_MAX_USECS) { + if (!avatarAssignment) { + avatarAssignment = new Assignment(Assignment::Create, Assignment::AvatarMixer, assignmentPool); + } + + nodeList->sendAssignment(*avatarAssignment); + + // reset the create time on the assignment so re-request is in ASSIGNMENT_SILENCE_MAX_USECS + avatarAssignment->setCreateTimeToNow(); } - } else { - assignmentSilenceCount[&avatarAssignment] = 0; + } - if (nodeList->getNodeSocket()->receive((sockaddr *)&nodePublicAddress, packetData, &receivedBytes) && (packetData[0] == PACKET_TYPE_DOMAIN_REPORT_FOR_DUTY || packetData[0] == PACKET_TYPE_DOMAIN_LIST_REQUEST) && packetVersionMatch(packetData)) { @@ -236,6 +238,9 @@ int main(int argc, const char* argv[]) { } } } + + delete audioAssignment; + delete avatarAssignment; return 0; } diff --git a/libraries/shared/src/Assignment.cpp b/libraries/shared/src/Assignment.cpp index 3c6e432f2c..850922396f 100644 --- a/libraries/shared/src/Assignment.cpp +++ b/libraries/shared/src/Assignment.cpp @@ -6,8 +6,6 @@ // Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // -#include - #include "PacketHeaders.h" #include "Assignment.h" @@ -86,6 +84,24 @@ Assignment::~Assignment() { delete _pool; } +void Assignment::setDomainSocket(const sockaddr* domainSocket) { + + if (_domainSocket) { + // delete the old _domainSocket if it exists + delete _domainSocket; + _domainSocket = NULL; + } + + // create a new sockaddr or sockaddr_in depending on what type of address this is + if (domainSocket->sa_family == AF_INET) { + _domainSocket = (sockaddr*) new sockaddr_in; + memcpy(_domainSocket, domainSocket, sizeof(sockaddr_in)); + } else { + _domainSocket = (sockaddr*) new sockaddr_in6; + memcpy(_domainSocket, domainSocket, sizeof(sockaddr_in6)); + } +} + int Assignment::packToBuffer(unsigned char* buffer) { int numPackedBytes = 0; @@ -114,24 +130,6 @@ int Assignment::packToBuffer(unsigned char* buffer) { return numPackedBytes; } -void Assignment::setDomainSocket(const sockaddr* domainSocket) { - - if (_domainSocket) { - // delete the old _domainSocket if it exists - delete _domainSocket; - _domainSocket = NULL; - } - - // create a new sockaddr or sockaddr_in depending on what type of address this is - if (domainSocket->sa_family == AF_INET) { - _domainSocket = (sockaddr*) new sockaddr_in; - memcpy(_domainSocket, domainSocket, sizeof(sockaddr_in)); - } else { - _domainSocket = (sockaddr*) new sockaddr_in6; - memcpy(_domainSocket, domainSocket, sizeof(sockaddr_in6)); - } -} - QDebug operator<<(QDebug debug, const Assignment &assignment) { debug << "T:" << assignment.getType() << "P:" << assignment.getPool(); return debug.nospace(); diff --git a/libraries/shared/src/Assignment.h b/libraries/shared/src/Assignment.h index 2c2673f351..693cc42577 100644 --- a/libraries/shared/src/Assignment.h +++ b/libraries/shared/src/Assignment.h @@ -9,6 +9,8 @@ #ifndef __hifi__Assignment__ #define __hifi__Assignment__ +#include + #include "NodeList.h" /// Holds information used for request, creation, and deployment of assignments @@ -49,6 +51,9 @@ public: /// \return number of bytes packed into buffer int packToBuffer(unsigned char* buffer); + /// Sets _time to the current time given by gettimeofday + void setCreateTimeToNow() { gettimeofday(&_time, NULL); } + private: Assignment::Direction _direction; /// the direction of the assignment (Create, Deploy, Request) Assignment::Type _type; /// the type of the assignment, defines what the assignee will do From f475163072a5c6dd2f76ecf9eb36a0bd5c55583f Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 6 Sep 2013 16:20:13 -0700 Subject: [PATCH 09/28] I believe this should fix the offset in mirror mode. --- interface/src/Application.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 741cb6ad52..a507f9c4e0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2155,8 +2155,9 @@ void Application::displaySide(Camera& whichCamera) { // transform by eye offset // flip x if in mirror mode (also requires reversing winding order for backface culling) + float eyeOffsetSign = 1.0f; if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { - glScalef(-1.0f, 1.0f, 1.0f); + glScalef(eyeOffsetSign = -1.0f, 1.0f, 1.0f); glFrontFace(GL_CW); } else { @@ -2167,7 +2168,7 @@ void Application::displaySide(Camera& whichCamera) { glm::quat eyeOffsetOrient = whichCamera.getEyeOffsetOrientation(); glm::vec3 eyeOffsetAxis = glm::axis(eyeOffsetOrient); glRotatef(-glm::angle(eyeOffsetOrient), eyeOffsetAxis.x, eyeOffsetAxis.y, eyeOffsetAxis.z); - glTranslatef(-eyeOffsetPos.x, -eyeOffsetPos.y, -eyeOffsetPos.z); + glTranslatef(-eyeOffsetPos.x * eyeOffsetSign, -eyeOffsetPos.y, -eyeOffsetPos.z); // transform view according to whichCamera // could be myCamera (if in normal mode) From 38dd176506cf4f4b535dd574293c2386946f838b Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 6 Sep 2013 16:43:22 -0700 Subject: [PATCH 10/28] Fix for off-by-one-frame error. --- interface/src/Application.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a507f9c4e0..0f7cee3da6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -423,9 +423,6 @@ void Application::resizeGL(int width, int height) { resetCamerasOnResizeGL(_viewFrustumOffsetCamera, width, height); resetCamerasOnResizeGL(_myCamera, width, height); - // Tell our viewFrustum about this change, using the application camera - loadViewFrustum(_myCamera, _viewFrustum); - glViewport(0, 0, width, height); // shouldn't this account for the menu??? updateProjectionMatrix(); @@ -436,6 +433,9 @@ void Application::updateProjectionMatrix() { glMatrixMode(GL_PROJECTION); glLoadIdentity(); + // Tell our viewFrustum about this change, using the application camera + loadViewFrustum(_myCamera, _viewFrustum); + float left, right, bottom, top, nearVal, farVal; glm::vec4 nearClipPlane, farClipPlane; _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); From 1a767f3e081961779d56ebe58b1e01bb33f92472 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 6 Sep 2013 16:52:32 -0700 Subject: [PATCH 11/28] Bump up the offset scale for Faceshift. --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0f7cee3da6..43c7a8f585 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1813,7 +1813,7 @@ void Application::update(float deltaTime) { if (Menu::getInstance()->isOptionChecked(MenuOption::OffAxisProjection)) { if (_faceshift.isActive()) { - const float EYE_OFFSET_SCALE = 0.005f; + const float EYE_OFFSET_SCALE = 0.025f; glm::vec3 position = _faceshift.getHeadTranslation() * EYE_OFFSET_SCALE; _myCamera.setEyeOffsetPosition(glm::vec3(-position.x, position.y, position.z)); updateProjectionMatrix(); From 699007691bd425770d44ca763729e4b91cd32790 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 6 Sep 2013 17:50:16 -0700 Subject: [PATCH 12/28] Simplification. --- interface/src/Application.cpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 43c7a8f585..a473469734 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1812,16 +1812,17 @@ void Application::update(float deltaTime) { } if (Menu::getInstance()->isOptionChecked(MenuOption::OffAxisProjection)) { + float xSign = Menu::getInstance()->isOptionChecked(MenuOption::Mirror) ? 1.0f : -1.0f; if (_faceshift.isActive()) { const float EYE_OFFSET_SCALE = 0.025f; glm::vec3 position = _faceshift.getHeadTranslation() * EYE_OFFSET_SCALE; - _myCamera.setEyeOffsetPosition(glm::vec3(-position.x, position.y, position.z)); + _myCamera.setEyeOffsetPosition(glm::vec3(position.x * xSign, position.y, position.z)); updateProjectionMatrix(); } else if (_webcam.isActive()) { - const float EYE_OFFSET_SCALE = 0.1f; + const float EYE_OFFSET_SCALE = 0.5f; glm::vec3 position = _webcam.getEstimatedPosition() * EYE_OFFSET_SCALE; - _myCamera.setEyeOffsetPosition(glm::vec3(-position.x, -position.y, position.z)); + _myCamera.setEyeOffsetPosition(glm::vec3(position.x * xSign, -position.y, position.z)); updateProjectionMatrix(); } } @@ -1974,15 +1975,7 @@ void Application::loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum) { viewFrustum.setFieldOfView(fov); viewFrustum.setNearClip(nearClip); viewFrustum.setFarClip(farClip); - - // when mirrored, we must flip the eye offset in x to get the correct frustum - if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { - glm::vec3 position = camera.getEyeOffsetPosition(); - viewFrustum.setEyeOffsetPosition(glm::vec3(-position.x, position.y, position.z)); - - } else { - viewFrustum.setEyeOffsetPosition(camera.getEyeOffsetPosition()); - } + viewFrustum.setEyeOffsetPosition(camera.getEyeOffsetPosition()); viewFrustum.setEyeOffsetOrientation(camera.getEyeOffsetOrientation()); // Ask the ViewFrustum class to calculate our corners @@ -2155,9 +2148,8 @@ void Application::displaySide(Camera& whichCamera) { // transform by eye offset // flip x if in mirror mode (also requires reversing winding order for backface culling) - float eyeOffsetSign = 1.0f; if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { - glScalef(eyeOffsetSign = -1.0f, 1.0f, 1.0f); + glScalef(-1.0f, 1.0f, 1.0f); glFrontFace(GL_CW); } else { @@ -2168,7 +2160,7 @@ void Application::displaySide(Camera& whichCamera) { glm::quat eyeOffsetOrient = whichCamera.getEyeOffsetOrientation(); glm::vec3 eyeOffsetAxis = glm::axis(eyeOffsetOrient); glRotatef(-glm::angle(eyeOffsetOrient), eyeOffsetAxis.x, eyeOffsetAxis.y, eyeOffsetAxis.z); - glTranslatef(-eyeOffsetPos.x * eyeOffsetSign, -eyeOffsetPos.y, -eyeOffsetPos.z); + glTranslatef(-eyeOffsetPos.x, -eyeOffsetPos.y, -eyeOffsetPos.z); // transform view according to whichCamera // could be myCamera (if in normal mode) From ddf92b39c76408836d4a54e1f7202f44f71fe63d Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Sun, 8 Sep 2013 17:52:35 -0700 Subject: [PATCH 13/28] Fix for off-axis ambient occlusion. --- .../resources/shaders/ambient_occlusion.frag | 3 +-- interface/src/Application.cpp | 22 ++++++++++++------- interface/src/Application.h | 4 ++++ .../src/renderer/AmbientOcclusionEffect.cpp | 2 +- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/interface/resources/shaders/ambient_occlusion.frag b/interface/resources/shaders/ambient_occlusion.frag index 4e87ac3221..b3a054cc67 100644 --- a/interface/resources/shaders/ambient_occlusion.frag +++ b/interface/resources/shaders/ambient_occlusion.frag @@ -44,8 +44,7 @@ float texCoordToViewSpaceZ(vec2 texCoord) { // given a texture coordinate, returns the 3D view space coordinate vec3 texCoordToViewSpace(vec2 texCoord) { float z = texCoordToViewSpaceZ(texCoord); - return vec3(((texCoord * 2.0 - vec2(1.0 - gl_ProjectionMatrix[2][0], 1.0)) * - (rightTop - leftBottom) + rightTop + leftBottom) * z / (-2.0 * near), z); + return vec3((leftBottom + texCoord * (rightTop - leftBottom)) * (-z / near), z); } void main(void) { diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a473469734..ea61179057 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -438,7 +438,7 @@ void Application::updateProjectionMatrix() { float left, right, bottom, top, nearVal, farVal; glm::vec4 nearClipPlane, farClipPlane; - _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); + computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); // If we're in Display Frustum mode, then we want to use the slightly adjust near/far clip values of the // _viewFrustumOffsetCamera, so that we can see more of the application content in the application's frustum @@ -446,13 +446,6 @@ void Application::updateProjectionMatrix() { nearVal = _viewFrustumOffsetCamera.getNearClip(); farVal = _viewFrustumOffsetCamera.getFarClip(); } - - // when mirrored, we must flip left and right - if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { - float tmp = left; - left = -right; - right = -tmp; - } glFrustum(left, right, bottom, top, nearVal, farVal); glMatrixMode(GL_MODELVIEW); @@ -2144,6 +2137,19 @@ void Application::setupWorldLight(Camera& whichCamera) { glMateriali(GL_FRONT, GL_SHININESS, 96); } +void Application::computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& near, + float& far, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { + + _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, near, far, nearClipPlane, farClipPlane); + + // when mirrored, we must flip left and right + if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { + float tmp = left; + left = -right; + right = -tmp; + } +} + void Application::displaySide(Camera& whichCamera) { // transform by eye offset diff --git a/interface/src/Application.h b/interface/src/Application.h index 0630d3cbca..8bb3106375 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -135,6 +135,10 @@ public: void setupWorldLight(Camera& whichCamera); + /// Computes the off-axis frustum parameters for the view frustum, taking mirroring into account. + void computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& near, + float& far, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const; + virtual void nodeAdded(Node* node); virtual void nodeKilled(Node* node); virtual void packetSentNotification(ssize_t length); diff --git a/interface/src/renderer/AmbientOcclusionEffect.cpp b/interface/src/renderer/AmbientOcclusionEffect.cpp index 2169ec00af..907ec7a863 100644 --- a/interface/src/renderer/AmbientOcclusionEffect.cpp +++ b/interface/src/renderer/AmbientOcclusionEffect.cpp @@ -103,7 +103,7 @@ void AmbientOcclusionEffect::render() { float left, right, bottom, top, nearVal, farVal; glm::vec4 nearClipPlane, farClipPlane; - Application::getInstance()->getViewFrustum()->computeOffAxisFrustum( + Application::getInstance()->computeOffAxisFrustum( left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); _occlusionProgram->bind(); From 49050320901cf755937d7659cdc65d0e86943b04 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 09:44:43 -0700 Subject: [PATCH 14/28] allow forking of multiple assignment-clients from the main target --- assignment-client/src/main.cpp | 42 ++++++++++++++++++++++++++----- domain-server/src/main.cpp | 6 ++++- libraries/shared/src/NodeList.cpp | 18 ++++++------- libraries/shared/src/NodeList.h | 4 +-- 4 files changed, 52 insertions(+), 18 deletions(-) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index 1da0a0215a..67d2a1e021 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -18,13 +18,47 @@ const long long ASSIGNMENT_REQUEST_INTERVAL_USECS = 1 * 1000 * 1000; + int main(int argc, const char* argv[]) { setvbuf(stdout, NULL, _IOLBF, 0); + sockaddr_in customAssignmentSocket = {}; + + // grab the overriden assignment-server hostname from argv, if it exists + const char* customAssignmentServer = getCmdOption(argc, argv, "-a"); + if (customAssignmentServer) { + customAssignmentSocket = socketForHostnameAndHostOrderPort(customAssignmentServer, ASSIGNMENT_SERVER_PORT); + } + + const char* NUM_FORKS_PARAMETER = "-n"; + const char* numForksIncludingParentString = getCmdOption(argc, argv, NUM_FORKS_PARAMETER); + + if (numForksIncludingParentString) { + int numForksIncludingParent = atoi(numForksIncludingParentString); + qDebug() << "Starting" << numForksIncludingParent << "assignment clients."; + + int processID = 0; + + // fire off as many children as we need (this is one less than the parent since the parent will run as well) + for (int i = 0; i < numForksIncludingParent - 1; i++) { + processID = fork(); + + if (processID == 0) { + // this is one of the children, break so we don't start a fork bomb + break; + } + } + } + // create a NodeList as an unassigned client NodeList* nodeList = NodeList::createInstance(NODE_TYPE_UNASSIGNED); + // set the custom assignment socket if we have it + if (customAssignmentSocket.sin_addr.s_addr != 0) { + nodeList->setAssignmentServerSocket((sockaddr*) &customAssignmentSocket); + } + // change the timeout on the nodelist socket to be as often as we want to re-request nodeList->getNodeSocket()->setBlockingReceiveTimeoutInUsecs(ASSIGNMENT_REQUEST_INTERVAL_USECS); @@ -34,10 +68,8 @@ int main(int argc, const char* argv[]) { ssize_t receivedBytes = 0; // grab the assignment pool from argv, if it was passed - const char* assignmentPool = getCmdOption(argc, argv, "-p"); - - // set the overriden assignment-server hostname from argv, if it exists - nodeList->setAssignmentServerHostname(getCmdOption(argc, argv, "-a")); + const char* ASSIGNMENT_POOL_PARAMETER = "-p"; + const char* assignmentPool = getCmdOption(argc, argv, ASSIGNMENT_POOL_PARAMETER); // create a request assignment, accept all assignments, pass the desired pool (if it exists) Assignment requestAssignment(Assignment::Request, Assignment::All, assignmentPool); @@ -46,7 +78,6 @@ int main(int argc, const char* argv[]) { if (usecTimestampNow() - usecTimestamp(&lastRequest) >= ASSIGNMENT_REQUEST_INTERVAL_USECS) { gettimeofday(&lastRequest, NULL); // if we're here we have no assignment, so send a request - qDebug() << "Sending an assignment request -" << requestAssignment; nodeList->sendAssignment(requestAssignment); } @@ -69,7 +100,6 @@ int main(int argc, const char* argv[]) { if (deployedAssignment.getType() == Assignment::AudioMixer) { AudioMixer::run(); } else { - qDebug() << "Running as an avatar mixer!"; AvatarMixer::run(); } diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 32a88e8e08..c8916f1c59 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -89,7 +89,11 @@ int main(int argc, const char* argv[]) { const char* assignmentPool = getCmdOption(argc, argv, "-p"); // grab the overriden assignment-server hostname from argv, if it exists - nodeList->setAssignmentServerHostname(getCmdOption(argc, argv, "-a")); + const char* customAssignmentServer = getCmdOption(argc, argv, "-a"); + if (customAssignmentServer) { + sockaddr_in customAssignmentSocket = socketForHostnameAndHostOrderPort(customAssignmentServer, ASSIGNMENT_SERVER_PORT); + nodeList->setAssignmentServerSocket((sockaddr*) &customAssignmentSocket); + } // use a map to keep track of iterations of silence for assignment creation requests const long long ASSIGNMENT_SILENCE_MAX_USECS = 5 * 1000 * 1000; diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index ad5876f622..4d042b0f63 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -65,7 +65,8 @@ NodeList::NodeList(char newOwnerType, unsigned short int newSocketListenPort) : _nodeTypesOfInterest(NULL), _ownerID(UNKNOWN_NODE_ID), _lastNodeID(UNKNOWN_NODE_ID + 1), - _numNoReplyDomainCheckIns(0) + _numNoReplyDomainCheckIns(0), + _assignmentServerSocket(NULL) { memcpy(_domainHostname, DEFAULT_DOMAIN_HOSTNAME, sizeof(DEFAULT_DOMAIN_HOSTNAME)); memcpy(_domainIP, DEFAULT_DOMAIN_IP, sizeof(DEFAULT_DOMAIN_IP)); @@ -376,7 +377,8 @@ int NodeList::processDomainServerList(unsigned char* packetData, size_t dataByte } const char GLOBAL_ASSIGNMENT_SERVER_HOSTNAME[] = "assignment.highfidelity.io"; - +const sockaddr_in GLOBAL_ASSIGNMENT_SOCKET = socketForHostnameAndHostOrderPort(GLOBAL_ASSIGNMENT_SERVER_HOSTNAME, + ASSIGNMENT_SERVER_PORT); void NodeList::sendAssignment(Assignment& assignment) { unsigned char assignmentPacket[MAX_PACKET_SIZE]; @@ -387,13 +389,11 @@ void NodeList::sendAssignment(Assignment& assignment) { int numHeaderBytes = populateTypeAndVersion(assignmentPacket, assignmentPacketType); int numAssignmentBytes = assignment.packToBuffer(assignmentPacket + numHeaderBytes); - // setup the assignmentServerSocket once, use a custom assignmentServerHostname if it is present - static sockaddr_in assignmentServerSocket = socketForHostnameAndHostOrderPort((_assignmentServerHostname != NULL - ? (const char*) _assignmentServerHostname - : GLOBAL_ASSIGNMENT_SERVER_HOSTNAME), - ASSIGNMENT_SERVER_PORT); - - _nodeSocket.send((sockaddr*) &assignmentServerSocket, assignmentPacket, numHeaderBytes + numAssignmentBytes); + sockaddr* assignmentServerSocket = (_assignmentServerSocket == NULL) + ? (sockaddr*) &GLOBAL_ASSIGNMENT_SOCKET + : _assignmentServerSocket; + + _nodeSocket.send((sockaddr*) assignmentServerSocket, assignmentPacket, numHeaderBytes + numAssignmentBytes); } Node* NodeList::addOrUpdateNode(sockaddr* publicSocket, sockaddr* localSocket, char nodeType, uint16_t nodeId) { diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h index dad422a29b..ea94e8c080 100644 --- a/libraries/shared/src/NodeList.h +++ b/libraries/shared/src/NodeList.h @@ -99,7 +99,7 @@ public: void sendDomainServerCheckIn(); int processDomainServerList(unsigned char *packetData, size_t dataBytes); - void setAssignmentServerHostname(const char* serverHostname) { _assignmentServerHostname = serverHostname; } + void setAssignmentServerSocket(sockaddr* serverSocket) { _assignmentServerSocket = serverSocket; } void sendAssignment(Assignment& assignment); Node* nodeWithAddress(sockaddr *senderAddress); @@ -152,7 +152,7 @@ private: pthread_t removeSilentNodesThread; pthread_t checkInWithDomainServerThread; int _numNoReplyDomainCheckIns; - const char* _assignmentServerHostname; + sockaddr* _assignmentServerSocket; void handlePingReply(sockaddr *nodeAddress); void timePingReply(sockaddr *nodeAddress, unsigned char *packetData); From 2fd043b55c2588cea2b059cc4e612e4ba2a9720f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 10:02:30 -0700 Subject: [PATCH 15/28] code review comments --- domain-server/src/main.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index c8916f1c59..4c13888ee3 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -85,11 +85,14 @@ int main(int argc, const char* argv[]) { timeval lastStatSendTime = {}; + const char ASSIGNMENT_POOL_OPTION = "-p"; + const char ASSIGNMENT_SERVER_OPTION = "-a"; + // set our assignment pool from argv, if it exists - const char* assignmentPool = getCmdOption(argc, argv, "-p"); + const char* assignmentPool = getCmdOption(argc, argv, ASSIGNMENT_POOL_OPTION); // grab the overriden assignment-server hostname from argv, if it exists - const char* customAssignmentServer = getCmdOption(argc, argv, "-a"); + const char* customAssignmentServer = getCmdOption(argc, argv, ASSIGNMENT_SERVER_OPTION); if (customAssignmentServer) { sockaddr_in customAssignmentSocket = socketForHostnameAndHostOrderPort(customAssignmentServer, ASSIGNMENT_SERVER_PORT); nodeList->setAssignmentServerSocket((sockaddr*) &customAssignmentSocket); @@ -100,8 +103,8 @@ int main(int argc, const char* argv[]) { // as a domain-server we will always want an audio mixer and avatar mixer // setup the create assignment pointers for those - Assignment *audioAssignment = NULL; - Assignment *avatarAssignment = NULL; + Assignment* audioAssignment = NULL; + Assignment* avatarAssignment = NULL; while (true) { if (!nodeList->soloNodeOfType(NODE_TYPE_AUDIO_MIXER)) { From 64e3c19a8c789db748a0519e67ae8440d73d29c2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 10:07:31 -0700 Subject: [PATCH 16/28] fix an incorrectly typed const --- domain-server/src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 4c13888ee3..07b67db85d 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -85,8 +85,8 @@ int main(int argc, const char* argv[]) { timeval lastStatSendTime = {}; - const char ASSIGNMENT_POOL_OPTION = "-p"; - const char ASSIGNMENT_SERVER_OPTION = "-a"; + const char ASSIGNMENT_POOL_OPTION[] = "-p"; + const char ASSIGNMENT_SERVER_OPTION[]g = "-a"; // set our assignment pool from argv, if it exists const char* assignmentPool = getCmdOption(argc, argv, ASSIGNMENT_POOL_OPTION); From d1c602df0768960ab713ba78b7e188174de822d9 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 10:10:16 -0700 Subject: [PATCH 17/28] remove an extra g --- domain-server/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 07b67db85d..0d51671e0c 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -86,7 +86,7 @@ int main(int argc, const char* argv[]) { timeval lastStatSendTime = {}; const char ASSIGNMENT_POOL_OPTION[] = "-p"; - const char ASSIGNMENT_SERVER_OPTION[]g = "-a"; + const char ASSIGNMENT_SERVER_OPTION[] = "-a"; // set our assignment pool from argv, if it exists const char* assignmentPool = getCmdOption(argc, argv, ASSIGNMENT_POOL_OPTION); From bb073bdff3f4a2519ed2ae0c83cfe9549dd47b9b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 11:59:58 -0700 Subject: [PATCH 18/28] fork off n children and keep the parent process as a monitor --- assignment-client/src/main.cpp | 126 ++++++++++++++++++--------------- 1 file changed, 68 insertions(+), 58 deletions(-) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index 67d2a1e021..72ae826ef2 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -32,16 +32,19 @@ int main(int argc, const char* argv[]) { } const char* NUM_FORKS_PARAMETER = "-n"; - const char* numForksIncludingParentString = getCmdOption(argc, argv, NUM_FORKS_PARAMETER); + const char* numForksString = getCmdOption(argc, argv, NUM_FORKS_PARAMETER); - if (numForksIncludingParentString) { - int numForksIncludingParent = atoi(numForksIncludingParentString); - qDebug() << "Starting" << numForksIncludingParent << "assignment clients."; + int processID = 0; + int numForks = 0; + + if (numForksString) { + numForks = atoi(numForksString); + qDebug() << "Starting" << numForks << "assignment clients."; + - int processID = 0; // fire off as many children as we need (this is one less than the parent since the parent will run as well) - for (int i = 0; i < numForksIncludingParent - 1; i++) { + for (int i = 0; i < numForks; i++) { processID = fork(); if (processID == 0) { @@ -51,63 +54,70 @@ int main(int argc, const char* argv[]) { } } - // create a NodeList as an unassigned client - NodeList* nodeList = NodeList::createInstance(NODE_TYPE_UNASSIGNED); - - // set the custom assignment socket if we have it - if (customAssignmentSocket.sin_addr.s_addr != 0) { - nodeList->setAssignmentServerSocket((sockaddr*) &customAssignmentSocket); - } - - // change the timeout on the nodelist socket to be as often as we want to re-request - nodeList->getNodeSocket()->setBlockingReceiveTimeoutInUsecs(ASSIGNMENT_REQUEST_INTERVAL_USECS); - - timeval lastRequest = {}; - - unsigned char packetData[MAX_PACKET_SIZE]; - ssize_t receivedBytes = 0; - - // grab the assignment pool from argv, if it was passed - const char* ASSIGNMENT_POOL_PARAMETER = "-p"; - const char* assignmentPool = getCmdOption(argc, argv, ASSIGNMENT_POOL_PARAMETER); - - // create a request assignment, accept all assignments, pass the desired pool (if it exists) - Assignment requestAssignment(Assignment::Request, Assignment::All, assignmentPool); - - while (true) { - if (usecTimestampNow() - usecTimestamp(&lastRequest) >= ASSIGNMENT_REQUEST_INTERVAL_USECS) { - gettimeofday(&lastRequest, NULL); - // if we're here we have no assignment, so send a request - nodeList->sendAssignment(requestAssignment); + if (processID == 0 || numForks == 0) { + // this is one of the child forks or there is a single assignment client, continue assignment-client execution + + // create a NodeList as an unassigned client + NodeList* nodeList = NodeList::createInstance(NODE_TYPE_UNASSIGNED); + + // set the custom assignment socket if we have it + if (customAssignmentSocket.sin_addr.s_addr != 0) { + nodeList->setAssignmentServerSocket((sockaddr*) &customAssignmentSocket); } - if (nodeList->getNodeSocket()->receive(packetData, &receivedBytes) && - packetData[0] == PACKET_TYPE_DEPLOY_ASSIGNMENT && packetVersionMatch(packetData)) { + // change the timeout on the nodelist socket to be as often as we want to re-request + nodeList->getNodeSocket()->setBlockingReceiveTimeoutInUsecs(ASSIGNMENT_REQUEST_INTERVAL_USECS); + + timeval lastRequest = {}; + + unsigned char packetData[MAX_PACKET_SIZE]; + ssize_t receivedBytes = 0; + + // grab the assignment pool from argv, if it was passed + const char* ASSIGNMENT_POOL_PARAMETER = "-p"; + const char* assignmentPool = getCmdOption(argc, argv, ASSIGNMENT_POOL_PARAMETER); + + // create a request assignment, accept all assignments, pass the desired pool (if it exists) + Assignment requestAssignment(Assignment::Request, Assignment::All, assignmentPool); + + while (true) { + if (usecTimestampNow() - usecTimestamp(&lastRequest) >= ASSIGNMENT_REQUEST_INTERVAL_USECS) { + gettimeofday(&lastRequest, NULL); + // if we're here we have no assignment, so send a request + nodeList->sendAssignment(requestAssignment); + } - // construct the deployed assignment from the packet data - Assignment deployedAssignment(packetData, receivedBytes); - - qDebug() << "Received an assignment - " << deployedAssignment << "\n"; - - // switch our nodelist DOMAIN_IP to the ip receieved in the assignment - if (deployedAssignment.getDomainSocket()->sa_family == AF_INET) { - in_addr domainSocketAddr = ((sockaddr_in*) deployedAssignment.getDomainSocket())->sin_addr; - nodeList->setDomainIP(inet_ntoa(domainSocketAddr)); + if (nodeList->getNodeSocket()->receive(packetData, &receivedBytes) && + packetData[0] == PACKET_TYPE_DEPLOY_ASSIGNMENT && packetVersionMatch(packetData)) { - qDebug() << "Changed domain IP to " << inet_ntoa(domainSocketAddr); + // construct the deployed assignment from the packet data + Assignment deployedAssignment(packetData, receivedBytes); + + qDebug() << "Received an assignment - " << deployedAssignment << "\n"; + + // switch our nodelist DOMAIN_IP to the ip receieved in the assignment + if (deployedAssignment.getDomainSocket()->sa_family == AF_INET) { + in_addr domainSocketAddr = ((sockaddr_in*) deployedAssignment.getDomainSocket())->sin_addr; + nodeList->setDomainIP(inet_ntoa(domainSocketAddr)); + + qDebug() << "Changed domain IP to " << inet_ntoa(domainSocketAddr); + } + + if (deployedAssignment.getType() == Assignment::AudioMixer) { + AudioMixer::run(); + } else { + AvatarMixer::run(); + } + + qDebug() << "Assignment finished or never started - waiting for new assignment"; + + // reset our NodeList by switching back to unassigned and clearing the list + nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); + nodeList->clear(); } - - if (deployedAssignment.getType() == Assignment::AudioMixer) { - AudioMixer::run(); - } else { - AvatarMixer::run(); - } - - qDebug() << "Assignment finished or never started - waiting for new assignment"; - - // reset our NodeList by switching back to unassigned and clearing the list - nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); - nodeList->clear(); } + } else { + // don't bail until all children have finished + wait(NULL); } } \ No newline at end of file From f770dd623bb4d69c9fc7c8dee6b03ed0d39e5969 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 12:31:53 -0700 Subject: [PATCH 19/28] have parent assignment-client make sure there are always n --- assignment-client/src/main.cpp | 207 ++++++++++++++++++++++----------- 1 file changed, 137 insertions(+), 70 deletions(-) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index 72ae826ef2..50e4f069a5 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -7,6 +7,8 @@ // #include +#include +#include #include #include @@ -18,106 +20,171 @@ const long long ASSIGNMENT_REQUEST_INTERVAL_USECS = 1 * 1000 * 1000; +pid_t* childForks = NULL; +sockaddr_in customAssignmentSocket = {}; +const char* assignmentPool = NULL; +int numForks = 0; + +void childClient() { + // this is one of the child forks or there is a single assignment client, continue assignment-client execution + + // create a NodeList as an unassigned client + NodeList* nodeList = NodeList::createInstance(NODE_TYPE_UNASSIGNED); + + // set the custom assignment socket if we have it + if (customAssignmentSocket.sin_addr.s_addr != 0) { + nodeList->setAssignmentServerSocket((sockaddr*) &customAssignmentSocket); + } + + // change the timeout on the nodelist socket to be as often as we want to re-request + nodeList->getNodeSocket()->setBlockingReceiveTimeoutInUsecs(ASSIGNMENT_REQUEST_INTERVAL_USECS); + + timeval lastRequest = {}; + + unsigned char packetData[MAX_PACKET_SIZE]; + ssize_t receivedBytes = 0; + + // create a request assignment, accept all assignments, pass the desired pool (if it exists) + Assignment requestAssignment(Assignment::Request, Assignment::All, assignmentPool); + + while (true) { + if (usecTimestampNow() - usecTimestamp(&lastRequest) >= ASSIGNMENT_REQUEST_INTERVAL_USECS) { + gettimeofday(&lastRequest, NULL); + // if we're here we have no assignment, so send a request + nodeList->sendAssignment(requestAssignment); + } + + if (nodeList->getNodeSocket()->receive(packetData, &receivedBytes) && + packetData[0] == PACKET_TYPE_DEPLOY_ASSIGNMENT && packetVersionMatch(packetData)) { + + // construct the deployed assignment from the packet data + Assignment deployedAssignment(packetData, receivedBytes); + + qDebug() << "Received an assignment - " << deployedAssignment << "\n"; + + // switch our nodelist DOMAIN_IP to the ip receieved in the assignment + if (deployedAssignment.getDomainSocket()->sa_family == AF_INET) { + in_addr domainSocketAddr = ((sockaddr_in*) deployedAssignment.getDomainSocket())->sin_addr; + nodeList->setDomainIP(inet_ntoa(domainSocketAddr)); + + qDebug() << "Changed domain IP to " << inet_ntoa(domainSocketAddr); + } + + if (deployedAssignment.getType() == Assignment::AudioMixer) { + AudioMixer::run(); + } else { + AvatarMixer::run(); + } + + qDebug() << "Assignment finished or never started - waiting for new assignment"; + + // reset our NodeList by switching back to unassigned and clearing the list + nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); + nodeList->clear(); + } + } +} + +void sigchldHandler(int sig) { + pid_t processID; + int status; + + while ((processID = waitpid(-1, &status, WNOHANG)) != -1) { + if (processID == 0) { + // there are no more children to process, break out of here + break; + } + + qDebug() << "Handling death of" << processID; + + int newForkProcessID = 0; + + // find the dead process in the array of child forks + for (int i = 0; i < ::numForks; i++) { + if (::childForks[i] == processID) { + qDebug() << "Matched" << ::childForks[i] << "with" << processID; + + newForkProcessID = fork(); + if (newForkProcessID == 0) { + // this is the child, call childClient + childClient(); + + // break out so we don't fork bomb + break; + } else { + // this is the parent, replace the dead process with the new one + ::childForks[i] = newForkProcessID; + break; + } + } + } + } +} + +void parentMonitor() { + + struct sigaction sa; + + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = sigchldHandler; + + sigaction(SIGCHLD, &sa, NULL); + + pid_t childID = 0; + + // don't bail until all children have finished + while ((childID = waitpid(-1, NULL, 0))) { + if (errno == ECHILD) { + break; + } + } + + // delete the array of pid_t holding the forked process IDs + delete[] ::childForks; +} int main(int argc, const char* argv[]) { setvbuf(stdout, NULL, _IOLBF, 0); - sockaddr_in customAssignmentSocket = {}; - // grab the overriden assignment-server hostname from argv, if it exists const char* customAssignmentServer = getCmdOption(argc, argv, "-a"); if (customAssignmentServer) { - customAssignmentSocket = socketForHostnameAndHostOrderPort(customAssignmentServer, ASSIGNMENT_SERVER_PORT); + ::customAssignmentSocket = socketForHostnameAndHostOrderPort(customAssignmentServer, ASSIGNMENT_SERVER_PORT); } const char* NUM_FORKS_PARAMETER = "-n"; const char* numForksString = getCmdOption(argc, argv, NUM_FORKS_PARAMETER); + // grab the assignment pool from argv, if it was passed + const char* ASSIGNMENT_POOL_PARAMETER = "-p"; + ::assignmentPool = getCmdOption(argc, argv, ASSIGNMENT_POOL_PARAMETER); + int processID = 0; - int numForks = 0; if (numForksString) { - numForks = atoi(numForksString); + ::numForks = atoi(numForksString); qDebug() << "Starting" << numForks << "assignment clients."; - + ::childForks = new pid_t[numForks]; // fire off as many children as we need (this is one less than the parent since the parent will run as well) for (int i = 0; i < numForks; i++) { processID = fork(); if (processID == 0) { - // this is one of the children, break so we don't start a fork bomb + // this is in one of the children, break so we don't start a fork bomb break; + } else { + // this is in the parent, save the ID of the forked process + childForks[i] = processID; } } } if (processID == 0 || numForks == 0) { - // this is one of the child forks or there is a single assignment client, continue assignment-client execution - - // create a NodeList as an unassigned client - NodeList* nodeList = NodeList::createInstance(NODE_TYPE_UNASSIGNED); - - // set the custom assignment socket if we have it - if (customAssignmentSocket.sin_addr.s_addr != 0) { - nodeList->setAssignmentServerSocket((sockaddr*) &customAssignmentSocket); - } - - // change the timeout on the nodelist socket to be as often as we want to re-request - nodeList->getNodeSocket()->setBlockingReceiveTimeoutInUsecs(ASSIGNMENT_REQUEST_INTERVAL_USECS); - - timeval lastRequest = {}; - - unsigned char packetData[MAX_PACKET_SIZE]; - ssize_t receivedBytes = 0; - - // grab the assignment pool from argv, if it was passed - const char* ASSIGNMENT_POOL_PARAMETER = "-p"; - const char* assignmentPool = getCmdOption(argc, argv, ASSIGNMENT_POOL_PARAMETER); - - // create a request assignment, accept all assignments, pass the desired pool (if it exists) - Assignment requestAssignment(Assignment::Request, Assignment::All, assignmentPool); - - while (true) { - if (usecTimestampNow() - usecTimestamp(&lastRequest) >= ASSIGNMENT_REQUEST_INTERVAL_USECS) { - gettimeofday(&lastRequest, NULL); - // if we're here we have no assignment, so send a request - nodeList->sendAssignment(requestAssignment); - } - - if (nodeList->getNodeSocket()->receive(packetData, &receivedBytes) && - packetData[0] == PACKET_TYPE_DEPLOY_ASSIGNMENT && packetVersionMatch(packetData)) { - - // construct the deployed assignment from the packet data - Assignment deployedAssignment(packetData, receivedBytes); - - qDebug() << "Received an assignment - " << deployedAssignment << "\n"; - - // switch our nodelist DOMAIN_IP to the ip receieved in the assignment - if (deployedAssignment.getDomainSocket()->sa_family == AF_INET) { - in_addr domainSocketAddr = ((sockaddr_in*) deployedAssignment.getDomainSocket())->sin_addr; - nodeList->setDomainIP(inet_ntoa(domainSocketAddr)); - - qDebug() << "Changed domain IP to " << inet_ntoa(domainSocketAddr); - } - - if (deployedAssignment.getType() == Assignment::AudioMixer) { - AudioMixer::run(); - } else { - AvatarMixer::run(); - } - - qDebug() << "Assignment finished or never started - waiting for new assignment"; - - // reset our NodeList by switching back to unassigned and clearing the list - nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); - nodeList->clear(); - } - } + childClient(); } else { - // don't bail until all children have finished - wait(NULL); + parentMonitor(); } } \ No newline at end of file From 3f941a33715abe16e994ca0e2269bec8c1034152 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 12:42:18 -0700 Subject: [PATCH 20/28] add a missing include for waitpid --- assignment-client/src/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index 50e4f069a5..130cca9135 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include From 001ecec729c04d8a62e285b818d646e7e8f39e03 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Mon, 9 Sep 2013 14:38:57 -0600 Subject: [PATCH 21/28] Removing audio-mixer and avatar-mixer jobs --- jenkins/jobs.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index ed33f49723..306ee030a8 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -102,8 +102,6 @@ static Closure cmakeBuild(srcDir, instCommand) { def targets = [ 'animation-server':true, 'assignment-server':true, - 'audio-mixer':true, - 'avatar-mixer':true, 'domain-server':true, 'eve':true, 'pairing-server':true, @@ -188,4 +186,4 @@ doxygenJob.with { } } -queue doxygenJob \ No newline at end of file +queue doxygenJob From 8077963bb1d2641b04bf8eeddc9f2a44f18aefc4 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 14:21:33 -0700 Subject: [PATCH 22/28] add standardized logging and leverage forked assignment clients --- assignment-client/src/main.cpp | 20 ++-- domain-server/src/main.cpp | 6 +- libraries/audio/src/AudioMixer.cpp | 14 +-- libraries/shared/src/Assignment.cpp | 6 +- libraries/shared/src/Assignment.h | 2 + libraries/shared/src/Logging.cpp | 106 ++++++++++++++++++ .../shared/src/{Logstash.h => Logging.h} | 18 ++- libraries/shared/src/Logstash.cpp | 60 ---------- 8 files changed, 150 insertions(+), 82 deletions(-) create mode 100644 libraries/shared/src/Logging.cpp rename libraries/shared/src/{Logstash.h => Logging.h} (66%) delete mode 100644 libraries/shared/src/Logstash.cpp diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index 130cca9135..9259e503e3 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -15,11 +15,14 @@ #include #include #include +#include #include #include #include const long long ASSIGNMENT_REQUEST_INTERVAL_USECS = 1 * 1000 * 1000; +const char PARENT_TARGET_NAME[] = "assignment-client-monitor"; +const char CHILD_TARGET_NAME[] = "assignment-client"; pid_t* childForks = NULL; sockaddr_in customAssignmentSocket = {}; @@ -61,14 +64,15 @@ void childClient() { // construct the deployed assignment from the packet data Assignment deployedAssignment(packetData, receivedBytes); - qDebug() << "Received an assignment - " << deployedAssignment << "\n"; + Logging::standardizedLog(QString("Received an assignment - %1").arg(deployedAssignment.toString()), + CHILD_TARGET_NAME); // switch our nodelist DOMAIN_IP to the ip receieved in the assignment if (deployedAssignment.getDomainSocket()->sa_family == AF_INET) { in_addr domainSocketAddr = ((sockaddr_in*) deployedAssignment.getDomainSocket())->sin_addr; nodeList->setDomainIP(inet_ntoa(domainSocketAddr)); - qDebug() << "Changed domain IP to " << inet_ntoa(domainSocketAddr); + Logging::standardizedLog(QString("Changed Domain IP to %1").arg(inet_ntoa(domainSocketAddr)), CHILD_TARGET_NAME); } if (deployedAssignment.getType() == Assignment::AudioMixer) { @@ -77,7 +81,8 @@ void childClient() { AvatarMixer::run(); } - qDebug() << "Assignment finished or never started - waiting for new assignment"; + Logging::standardizedLog(QString("Assignment finished or never started - waiting for new assignment"), + CHILD_TARGET_NAME); // reset our NodeList by switching back to unassigned and clearing the list nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); @@ -96,14 +101,11 @@ void sigchldHandler(int sig) { break; } - qDebug() << "Handling death of" << processID; - int newForkProcessID = 0; // find the dead process in the array of child forks for (int i = 0; i < ::numForks; i++) { if (::childForks[i] == processID) { - qDebug() << "Matched" << ::childForks[i] << "with" << processID; newForkProcessID = fork(); if (newForkProcessID == 0) { @@ -115,6 +117,10 @@ void sigchldHandler(int sig) { } else { // this is the parent, replace the dead process with the new one ::childForks[i] = newForkProcessID; + + Logging::standardizedLog(QString("Repleaced dead %1 with new fork %2").arg(processID).arg(newForkProcessID), + PARENT_TARGET_NAME); + break; } } @@ -165,7 +171,7 @@ int main(int argc, const char* argv[]) { if (numForksString) { ::numForks = atoi(numForksString); - qDebug() << "Starting" << numForks << "assignment clients."; + Logging::standardizedLog(QString("Starting %1 assignment clients").arg(numForks), PARENT_TARGET_NAME); ::childForks = new pid_t[numForks]; diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 0d51671e0c..5739639f95 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -28,7 +28,7 @@ #include "Assignment.h" #include "NodeList.h" #include "NodeTypes.h" -#include "Logstash.h" +#include "Logging.h" #include "PacketHeaders.h" #include "SharedUtil.h" @@ -234,12 +234,12 @@ int main(int argc, const char* argv[]) { } } - if (Logstash::shouldSendStats()) { + if (Logging::shouldSendStats()) { if (usecTimestampNow() - usecTimestamp(&lastStatSendTime) >= (NODE_COUNT_STAT_INTERVAL_MSECS * 1000)) { // time to send our count of nodes and servers to logstash const char NODE_COUNT_LOGSTASH_KEY[] = "ds-node-count"; - Logstash::stashValue(STAT_TYPE_TIMER, NODE_COUNT_LOGSTASH_KEY, nodeList->getNumAliveNodes()); + Logging::stashValue(STAT_TYPE_TIMER, NODE_COUNT_LOGSTASH_KEY, nodeList->getNumAliveNodes()); gettimeofday(&lastStatSendTime, NULL); } diff --git a/libraries/audio/src/AudioMixer.cpp b/libraries/audio/src/AudioMixer.cpp index c6387ce02a..b11aa9c14b 100644 --- a/libraries/audio/src/AudioMixer.cpp +++ b/libraries/audio/src/AudioMixer.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -105,8 +105,8 @@ void AudioMixer::run() { stk::StkFrames stkFrameBuffer(BUFFER_LENGTH_SAMPLES_PER_CHANNEL, 1); // if we'll be sending stats, call the Logstash::socket() method to make it load the logstash IP outside the loop - if (Logstash::shouldSendStats()) { - Logstash::socket(); + if (Logging::shouldSendStats()) { + Logging::socket(); } while (true) { @@ -114,7 +114,7 @@ void AudioMixer::run() { break; } - if (Logstash::shouldSendStats()) { + if (Logging::shouldSendStats()) { gettimeofday(&beginSendTime, NULL); } @@ -123,12 +123,12 @@ void AudioMixer::run() { gettimeofday(&lastDomainServerCheckIn, NULL); NodeList::getInstance()->sendDomainServerCheckIn(); - if (Logstash::shouldSendStats() && numStatCollections > 0) { + if (Logging::shouldSendStats() && numStatCollections > 0) { // if we should be sending stats to Logstash send the appropriate average now const char MIXER_LOGSTASH_METRIC_NAME[] = "audio-mixer-frame-time-usage"; float averageFrameTimePercentage = sumFrameTimePercentages / numStatCollections; - Logstash::stashValue(STAT_TYPE_TIMER, MIXER_LOGSTASH_METRIC_NAME, averageFrameTimePercentage); + Logging::stashValue(STAT_TYPE_TIMER, MIXER_LOGSTASH_METRIC_NAME, averageFrameTimePercentage); sumFrameTimePercentages = 0.0f; numStatCollections = 0; @@ -398,7 +398,7 @@ void AudioMixer::run() { } } - if (Logstash::shouldSendStats()) { + if (Logging::shouldSendStats()) { // send a packet to our logstash instance // calculate the percentage value for time elapsed for this send (of the max allowable time) diff --git a/libraries/shared/src/Assignment.cpp b/libraries/shared/src/Assignment.cpp index 850922396f..867854030a 100644 --- a/libraries/shared/src/Assignment.cpp +++ b/libraries/shared/src/Assignment.cpp @@ -130,7 +130,11 @@ int Assignment::packToBuffer(unsigned char* buffer) { return numPackedBytes; } +QString Assignment::toString() const { + return QString("T:%1 P:%2").arg(_type).arg(_pool); +} + QDebug operator<<(QDebug debug, const Assignment &assignment) { - debug << "T:" << assignment.getType() << "P:" << assignment.getPool(); + debug << assignment.toString().toStdString().c_str(); return debug.nospace(); } \ No newline at end of file diff --git a/libraries/shared/src/Assignment.h b/libraries/shared/src/Assignment.h index 693cc42577..34cf065ce5 100644 --- a/libraries/shared/src/Assignment.h +++ b/libraries/shared/src/Assignment.h @@ -54,6 +54,8 @@ public: /// Sets _time to the current time given by gettimeofday void setCreateTimeToNow() { gettimeofday(&_time, NULL); } + QString toString() const; + private: Assignment::Direction _direction; /// the direction of the assignment (Create, Deploy, Request) Assignment::Type _type; /// the type of the assignment, defines what the assignee will do diff --git a/libraries/shared/src/Logging.cpp b/libraries/shared/src/Logging.cpp new file mode 100644 index 0000000000..cb4c249620 --- /dev/null +++ b/libraries/shared/src/Logging.cpp @@ -0,0 +1,106 @@ +// +// Logging.cpp +// hifi +// +// Created by Stephen Birarda on 6/11/13. +// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. +// + +#include +#include +#include + +#include "SharedUtil.h" +#include "NodeList.h" + +#include "Logging.h" + +sockaddr_in Logging::logstashSocket = {}; + +sockaddr* Logging::socket() { + + if (logstashSocket.sin_addr.s_addr == 0) { + // we need to construct the socket object + + // assume IPv4 + logstashSocket.sin_family = AF_INET; + + // use the constant port + logstashSocket.sin_port = htons(LOGSTASH_UDP_PORT); + + // lookup the IP address for the constant hostname + struct hostent* logstashHostInfo; + if ((logstashHostInfo = gethostbyname(LOGSTASH_HOSTNAME))) { + memcpy(&logstashSocket.sin_addr, logstashHostInfo->h_addr_list[0], logstashHostInfo->h_length); + } else { + printf("Failed to lookup logstash IP - will try again on next log attempt.\n"); + } + } + + return (sockaddr*) &logstashSocket; +} + +bool Logging::shouldSendStats() { + static bool shouldSendStats = isInEnvironment("production"); + return shouldSendStats; +} + +void Logging::stashValue(char statType, const char* key, float value) { + static char logstashPacket[MAX_PACKET_SIZE]; + + // load up the logstash packet with the key and the passed float value + // send it to 4 decimal places + int numPacketBytes = sprintf(logstashPacket, "%c %s %.4f", statType, key, value); + + NodeList *nodeList = NodeList::getInstance(); + + if (nodeList) { + nodeList->getNodeSocket()->send(socket(), logstashPacket, numPacketBytes); + } +} + +const QString DEBUG_STRING = "DEBUG"; +const QString WARN_STRING = "WARN"; +const QString ERROR_STRING = "ERROR"; + +const QString& stringForLogType(Logging::Type logType) { + if (logType == Logging::Debug) { + return DEBUG_STRING; + } else if (logType == Logging::Warn) { + return WARN_STRING; + } else { + return ERROR_STRING; + } +} + +// the following will produce 2000-10-02 13:55:36 -0700 +const char DATE_STRING_FORMAT[] = "%F %H:%M:%S %z"; + +void Logging::standardizedLog(const QString &output, const char* targetName, Logging::Type logType) { + time_t rawTime; + time(&rawTime); + struct tm* localTime = localtime(&rawTime); + + // log prefix is in the following format + // [DEBUG] [TIMESTAMP] [PID:PARENT_PID] [TARGET] logged string + + QString prefixString = QString("[%1] ").arg(stringForLogType(logType)); + + char dateString[100]; + strftime(dateString, sizeof(dateString), DATE_STRING_FORMAT, localTime); + + prefixString.append(QString("[%1] ").arg(dateString)); + + prefixString.append(QString("[%1").arg(getpid())); + + pid_t parentProcessID = getppid(); + if (parentProcessID != 0) { + prefixString.append(QString(":%1] ").arg(parentProcessID)); + } else { + prefixString.append("]"); + } + + prefixString.append(QString("[%1]").arg(targetName)); + + qDebug("%s %s", prefixString.toStdString().c_str(), output.toStdString().c_str()); +} \ No newline at end of file diff --git a/libraries/shared/src/Logstash.h b/libraries/shared/src/Logging.h similarity index 66% rename from libraries/shared/src/Logstash.h rename to libraries/shared/src/Logging.h index 7c805ddb23..c8f12ac8b6 100644 --- a/libraries/shared/src/Logstash.h +++ b/libraries/shared/src/Logging.h @@ -1,16 +1,18 @@ // -// Logstash.h +// Logging.h // hifi // // Created by Stephen Birarda on 6/11/13. // Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // -#ifndef __hifi__Logstash__ -#define __hifi__Logstash__ +#ifndef __hifi__Logging__ +#define __hifi__Logging__ #include +#include + const int LOGSTASH_UDP_PORT = 9500; const char LOGSTASH_HOSTNAME[] = "graphite.highfidelity.io"; @@ -18,11 +20,19 @@ const char STAT_TYPE_TIMER = 't'; const char STAT_TYPE_COUNTER = 'c'; const char STAT_TYPE_GAUGE = 'g'; -class Logstash { +class Logging { public: + + enum Type { + Error, + Warn, + Debug + }; + static sockaddr* socket(); static bool shouldSendStats(); static void stashValue(char statType, const char* key, float value); + static void standardizedLog(const QString& output, const char* targetName, Logging::Type logType = Logging::Debug); private: static sockaddr_in logstashSocket; }; diff --git a/libraries/shared/src/Logstash.cpp b/libraries/shared/src/Logstash.cpp deleted file mode 100644 index 63d3da56d9..0000000000 --- a/libraries/shared/src/Logstash.cpp +++ /dev/null @@ -1,60 +0,0 @@ -// -// Logstash.cpp -// hifi -// -// Created by Stephen Birarda on 6/11/13. -// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. -// - -#include -#include -#include - -#include "SharedUtil.h" -#include "NodeList.h" - -#include "Logstash.h" - -sockaddr_in Logstash::logstashSocket = {}; - -sockaddr* Logstash::socket() { - - if (logstashSocket.sin_addr.s_addr == 0) { - // we need to construct the socket object - - // assume IPv4 - logstashSocket.sin_family = AF_INET; - - // use the constant port - logstashSocket.sin_port = htons(LOGSTASH_UDP_PORT); - - // lookup the IP address for the constant hostname - struct hostent* logstashHostInfo; - if ((logstashHostInfo = gethostbyname(LOGSTASH_HOSTNAME))) { - memcpy(&logstashSocket.sin_addr, logstashHostInfo->h_addr_list[0], logstashHostInfo->h_length); - } else { - printf("Failed to lookup logstash IP - will try again on next log attempt.\n"); - } - } - - return (sockaddr*) &logstashSocket; -} - -bool Logstash::shouldSendStats() { - static bool shouldSendStats = isInEnvironment("production"); - return shouldSendStats; -} - -void Logstash::stashValue(char statType, const char* key, float value) { - static char logstashPacket[MAX_PACKET_SIZE]; - - // load up the logstash packet with the key and the passed float value - // send it to 4 decimal places - int numPacketBytes = sprintf(logstashPacket, "%c %s %.4f", statType, key, value); - - NodeList *nodeList = NodeList::getInstance(); - - if (nodeList) { - nodeList->getNodeSocket()->send(socket(), logstashPacket, numPacketBytes); - } -} \ No newline at end of file From fe8fabee3830203f137bb6d7af734325b0fa9535 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 14:31:27 -0700 Subject: [PATCH 23/28] add a static method to the Logging class to change target name --- assignment-client/src/main.cpp | 19 +++++++++++-------- libraries/shared/src/Logging.cpp | 24 ++++++++++++++++++------ libraries/shared/src/Logging.h | 4 +++- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index 9259e503e3..f375c74f69 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -61,18 +61,20 @@ void childClient() { if (nodeList->getNodeSocket()->receive(packetData, &receivedBytes) && packetData[0] == PACKET_TYPE_DEPLOY_ASSIGNMENT && packetVersionMatch(packetData)) { + // reset the logging target to the the CHILD_TARGET_NAME + Logging::setTargetName(CHILD_TARGET_NAME); + // construct the deployed assignment from the packet data Assignment deployedAssignment(packetData, receivedBytes); - Logging::standardizedLog(QString("Received an assignment - %1").arg(deployedAssignment.toString()), - CHILD_TARGET_NAME); + Logging::standardizedLog(QString("Received an assignment - %1").arg(deployedAssignment.toString())); // switch our nodelist DOMAIN_IP to the ip receieved in the assignment if (deployedAssignment.getDomainSocket()->sa_family == AF_INET) { in_addr domainSocketAddr = ((sockaddr_in*) deployedAssignment.getDomainSocket())->sin_addr; nodeList->setDomainIP(inet_ntoa(domainSocketAddr)); - Logging::standardizedLog(QString("Changed Domain IP to %1").arg(inet_ntoa(domainSocketAddr)), CHILD_TARGET_NAME); + Logging::standardizedLog(QString("Changed Domain IP to %1").arg(inet_ntoa(domainSocketAddr))); } if (deployedAssignment.getType() == Assignment::AudioMixer) { @@ -81,8 +83,7 @@ void childClient() { AvatarMixer::run(); } - Logging::standardizedLog(QString("Assignment finished or never started - waiting for new assignment"), - CHILD_TARGET_NAME); + Logging::standardizedLog(QString("Assignment finished or never started - waiting for new assignment")); // reset our NodeList by switching back to unassigned and clearing the list nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); @@ -118,8 +119,7 @@ void sigchldHandler(int sig) { // this is the parent, replace the dead process with the new one ::childForks[i] = newForkProcessID; - Logging::standardizedLog(QString("Repleaced dead %1 with new fork %2").arg(processID).arg(newForkProcessID), - PARENT_TARGET_NAME); + Logging::standardizedLog(QString("Replaced dead %1 with new fork %2").arg(processID).arg(newForkProcessID)); break; } @@ -154,6 +154,9 @@ int main(int argc, const char* argv[]) { setvbuf(stdout, NULL, _IOLBF, 0); + // start the Logging class with the parent's target name + Logging::setTargetName(PARENT_TARGET_NAME); + // grab the overriden assignment-server hostname from argv, if it exists const char* customAssignmentServer = getCmdOption(argc, argv, "-a"); if (customAssignmentServer) { @@ -171,7 +174,7 @@ int main(int argc, const char* argv[]) { if (numForksString) { ::numForks = atoi(numForksString); - Logging::standardizedLog(QString("Starting %1 assignment clients").arg(numForks), PARENT_TARGET_NAME); + Logging::standardizedLog(QString("Starting %1 assignment clients").arg(numForks)); ::childForks = new pid_t[numForks]; diff --git a/libraries/shared/src/Logging.cpp b/libraries/shared/src/Logging.cpp index cb4c249620..7fb141eba9 100644 --- a/libraries/shared/src/Logging.cpp +++ b/libraries/shared/src/Logging.cpp @@ -16,6 +16,7 @@ #include "Logging.h" sockaddr_in Logging::logstashSocket = {}; +char* Logging::targetName = NULL; sockaddr* Logging::socket() { @@ -73,10 +74,19 @@ const QString& stringForLogType(Logging::Type logType) { } } +void Logging::setTargetName(const char* targetName) { + // remove the old target name, if it exists + delete Logging::targetName; + + // copy over the new target name + Logging::targetName = new char[strlen(targetName)]; + strcpy(Logging::targetName, targetName); +} + // the following will produce 2000-10-02 13:55:36 -0700 const char DATE_STRING_FORMAT[] = "%F %H:%M:%S %z"; -void Logging::standardizedLog(const QString &output, const char* targetName, Logging::Type logType) { +void Logging::standardizedLog(const QString &output, Logging::Type logType) { time_t rawTime; time(&rawTime); struct tm* localTime = localtime(&rawTime); @@ -84,23 +94,25 @@ void Logging::standardizedLog(const QString &output, const char* targetName, Log // log prefix is in the following format // [DEBUG] [TIMESTAMP] [PID:PARENT_PID] [TARGET] logged string - QString prefixString = QString("[%1] ").arg(stringForLogType(logType)); + QString prefixString = QString("[%1]").arg(stringForLogType(logType)); char dateString[100]; strftime(dateString, sizeof(dateString), DATE_STRING_FORMAT, localTime); - prefixString.append(QString("[%1] ").arg(dateString)); + prefixString.append(QString(" [%1]").arg(dateString)); - prefixString.append(QString("[%1").arg(getpid())); + prefixString.append(QString(" [%1").arg(getpid())); pid_t parentProcessID = getppid(); if (parentProcessID != 0) { - prefixString.append(QString(":%1] ").arg(parentProcessID)); + prefixString.append(QString(":%1]").arg(parentProcessID)); } else { prefixString.append("]"); } - prefixString.append(QString("[%1]").arg(targetName)); + if (Logging::targetName) { + prefixString.append(QString(" [%1]").arg(Logging::targetName)); + } qDebug("%s %s", prefixString.toStdString().c_str(), output.toStdString().c_str()); } \ No newline at end of file diff --git a/libraries/shared/src/Logging.h b/libraries/shared/src/Logging.h index c8f12ac8b6..472063d84c 100644 --- a/libraries/shared/src/Logging.h +++ b/libraries/shared/src/Logging.h @@ -32,9 +32,11 @@ public: static sockaddr* socket(); static bool shouldSendStats(); static void stashValue(char statType, const char* key, float value); - static void standardizedLog(const QString& output, const char* targetName, Logging::Type logType = Logging::Debug); + static void setTargetName(const char* targetName); + static void standardizedLog(const QString& output, Logging::Type logType = Logging::Debug); private: static sockaddr_in logstashSocket; + static char* targetName; }; #endif /* defined(__hifi__Logstash__) */ From b0c9dfeddc3b598a88231430917d4ed84f009e79 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 14:47:15 -0700 Subject: [PATCH 24/28] more leveraging of standardized logging --- assignment-client/src/main.cpp | 9 +++++++-- libraries/audio/src/AudioMixer.cpp | 4 ++++ libraries/avatars/src/AvatarMixer.cpp | 6 ++++++ libraries/shared/src/Logging.cpp | 4 ++++ libraries/shared/src/Logging.h | 1 + libraries/shared/src/Node.cpp | 12 +++++++----- libraries/shared/src/Node.h | 2 ++ libraries/shared/src/NodeList.cpp | 16 ++++++++-------- libraries/shared/src/UDPSocket.cpp | 3 ++- 9 files changed, 41 insertions(+), 16 deletions(-) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index f375c74f69..896b69b274 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -32,6 +32,9 @@ int numForks = 0; void childClient() { // this is one of the child forks or there is a single assignment client, continue assignment-client execution + // set the logging target to the the CHILD_TARGET_NAME + Logging::setTargetName(CHILD_TARGET_NAME); + // create a NodeList as an unassigned client NodeList* nodeList = NodeList::createInstance(NODE_TYPE_UNASSIGNED); @@ -61,8 +64,7 @@ void childClient() { if (nodeList->getNodeSocket()->receive(packetData, &receivedBytes) && packetData[0] == PACKET_TYPE_DEPLOY_ASSIGNMENT && packetVersionMatch(packetData)) { - // reset the logging target to the the CHILD_TARGET_NAME - Logging::setTargetName(CHILD_TARGET_NAME); + // construct the deployed assignment from the packet data Assignment deployedAssignment(packetData, receivedBytes); @@ -88,6 +90,9 @@ void childClient() { // reset our NodeList by switching back to unassigned and clearing the list nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); nodeList->clear(); + + // reset the logging target to the the CHILD_TARGET_NAME + Logging::setTargetName(CHILD_TARGET_NAME); } } } diff --git a/libraries/audio/src/AudioMixer.cpp b/libraries/audio/src/AudioMixer.cpp index b11aa9c14b..d4b6097134 100644 --- a/libraries/audio/src/AudioMixer.cpp +++ b/libraries/audio/src/AudioMixer.cpp @@ -57,6 +57,8 @@ const unsigned int BUFFER_SEND_INTERVAL_USECS = floorf((BUFFER_LENGTH_SAMPLES_PE const int MAX_SAMPLE_VALUE = std::numeric_limits::max(); const int MIN_SAMPLE_VALUE = std::numeric_limits::min(); +const char AUDIO_MIXER_LOGGING_TARGET_NAME[] = "audio-mixer"; + void attachNewBufferToNode(Node *newNode) { if (!newNode->getLinkedData()) { if (newNode->getType() == NODE_TYPE_AGENT) { @@ -68,6 +70,8 @@ void attachNewBufferToNode(Node *newNode) { } void AudioMixer::run() { + // change the logging target name while this is running + Logging::setTargetName(AUDIO_MIXER_LOGGING_TARGET_NAME); NodeList *nodeList = NodeList::getInstance(); nodeList->setOwnerType(NODE_TYPE_AUDIO_MIXER); diff --git a/libraries/avatars/src/AvatarMixer.cpp b/libraries/avatars/src/AvatarMixer.cpp index 92e27a64af..acf77be8da 100644 --- a/libraries/avatars/src/AvatarMixer.cpp +++ b/libraries/avatars/src/AvatarMixer.cpp @@ -10,6 +10,7 @@ // The avatar mixer receives head, hand and positional data from all connected // nodes, and broadcasts that data back to them, every BROADCAST_INTERVAL ms. +#include #include #include #include @@ -18,6 +19,8 @@ #include "AvatarMixer.h" +const char AVATAR_MIXER_LOGGING_NAME[] = "avatar-mixer"; + unsigned char* addNodeToBroadcastPacket(unsigned char *currentPosition, Node *nodeToAdd) { currentPosition += packNodeId(currentPosition, nodeToAdd->getNodeID()); @@ -81,6 +84,9 @@ void broadcastAvatarData(NodeList* nodeList, sockaddr* nodeAddress) { } void AvatarMixer::run() { + // change the logging target name while AvatarMixer is running + Logging::setTargetName(AVATAR_MIXER_LOGGING_NAME); + NodeList* nodeList = NodeList::getInstance(); nodeList->setOwnerType(NODE_TYPE_AVATAR_MIXER); diff --git a/libraries/shared/src/Logging.cpp b/libraries/shared/src/Logging.cpp index 7fb141eba9..9da64ec271 100644 --- a/libraries/shared/src/Logging.cpp +++ b/libraries/shared/src/Logging.cpp @@ -86,6 +86,10 @@ void Logging::setTargetName(const char* targetName) { // the following will produce 2000-10-02 13:55:36 -0700 const char DATE_STRING_FORMAT[] = "%F %H:%M:%S %z"; +void Logging::standardizedLog(const char *output, Logging::Type logType) { + standardizedLog(QString(output), logType); +} + void Logging::standardizedLog(const QString &output, Logging::Type logType) { time_t rawTime; time(&rawTime); diff --git a/libraries/shared/src/Logging.h b/libraries/shared/src/Logging.h index 472063d84c..705bad86b3 100644 --- a/libraries/shared/src/Logging.h +++ b/libraries/shared/src/Logging.h @@ -33,6 +33,7 @@ public: static bool shouldSendStats(); static void stashValue(char statType, const char* key, float value); static void setTargetName(const char* targetName); + static void standardizedLog(const char* output, Logging::Type logType = Logging::Debug); static void standardizedLog(const QString& output, Logging::Type logType = Logging::Debug); private: static sockaddr_in logstashSocket; diff --git a/libraries/shared/src/Node.cpp b/libraries/shared/src/Node.cpp index c91626d99d..09d8801068 100644 --- a/libraries/shared/src/Node.cpp +++ b/libraries/shared/src/Node.cpp @@ -144,14 +144,16 @@ float Node::getAverageKilobitsPerSecond() { } } -QDebug operator<<(QDebug debug, const Node &node) { +QString Node::toString() const { char publicAddressBuffer[16] = {'\0'}; - unsigned short publicAddressPort = loadBufferWithSocketInfo(publicAddressBuffer, node.getPublicSocket()); + unsigned short publicAddressPort = loadBufferWithSocketInfo(publicAddressBuffer, _publicSocket); //char localAddressBuffer[16] = {'\0'}; //unsigned short localAddressPort = loadBufferWithSocketInfo(localAddressBuffer, node.localSocket); - debug << "#" << node.getNodeID() << node.getTypeName() << node.getType(); - debug.nospace() << publicAddressBuffer << ":" << publicAddressPort; - return debug.nospace(); + return QString("# %1 %2 %3 %4:%5").arg(_nodeID).arg(getTypeName()).arg(_type).arg(publicAddressBuffer).arg(publicAddressPort); +} + +QDebug operator<<(QDebug debug, const Node &node) { + return debug << node.toString(); } diff --git a/libraries/shared/src/Node.h b/libraries/shared/src/Node.h index 2de75bcec1..d22d4e0076 100644 --- a/libraries/shared/src/Node.h +++ b/libraries/shared/src/Node.h @@ -72,6 +72,8 @@ public: void unlock() { pthread_mutex_unlock(&_mutex); } static void printLog(Node const&); + + QString toString() const; private: // privatize copy and assignment operator to disallow Node copying Node(const Node &otherNode); diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index 4d042b0f63..7b0bef7002 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -14,6 +14,7 @@ #include #include "Assignment.h" +#include "Logging.h" #include "NodeList.h" #include "NodeTypes.h" #include "PacketHeaders.h" @@ -43,7 +44,7 @@ NodeList* NodeList::createInstance(char ownerType, unsigned short int socketList if (!_sharedInstance) { _sharedInstance = new NodeList(ownerType, socketListenPort); } else { - qDebug("NodeList createInstance called with existing instance.\n"); + Logging::standardizedLog("NodeList createInstance called with existing instance."); } return _sharedInstance; @@ -51,7 +52,7 @@ NodeList* NodeList::createInstance(char ownerType, unsigned short int socketList NodeList* NodeList::getInstance() { if (!_sharedInstance) { - qDebug("NodeList getInstance called before call to createInstance. Returning NULL pointer.\n"); + Logging::standardizedLog("NodeList getInstance called before call to createInstance. Returning NULL pointer."); } return _sharedInstance; @@ -278,13 +279,12 @@ void NodeList::sendDomainServerCheckIn() { sockaddr_in tempAddress; memcpy(&tempAddress.sin_addr, pHostInfo->h_addr_list[0], pHostInfo->h_length); strcpy(_domainIP, inet_ntoa(tempAddress.sin_addr)); - - qDebug("Domain Server: %s\n", _domainHostname); + Logging::standardizedLog(QString("Domain Server: %1").arg(_domainHostname)); } else { - qDebug("Failed domain server lookup\n"); + Logging::standardizedLog("Failed domain server lookup", Logging::Warn); } } else if (!printedDomainServerIP) { - qDebug("Domain Server IP: %s\n", _domainIP); + Logging::standardizedLog(QString("Domain Server IP: %1").arg(_domainIP)); printedDomainServerIP = true; } @@ -460,7 +460,7 @@ void NodeList::addNodeToList(Node* newNode) { ++_numNodes; - qDebug() << "Added" << *newNode << "\n"; + Logging::standardizedLog(QString("Added %1").arg(newNode->toString())); notifyHooksOfAddedNode(newNode); } @@ -516,7 +516,7 @@ void* removeSilentNodes(void *args) { if ((checkTimeUSecs - node->getLastHeardMicrostamp()) > NODE_SILENCE_THRESHOLD_USECS) { - qDebug() << "Killed" << *node << "\n"; + Logging::standardizedLog(QString("Killed %1").arg(node->toString())); nodeList->notifyHooksOfKilledNode(&*node); diff --git a/libraries/shared/src/UDPSocket.cpp b/libraries/shared/src/UDPSocket.cpp index ab2460dd7f..f2f5129181 100644 --- a/libraries/shared/src/UDPSocket.cpp +++ b/libraries/shared/src/UDPSocket.cpp @@ -23,6 +23,7 @@ #include +#include "Logging.h" #include "UDPSocket.h" sockaddr_in destSockaddr, senderAddress; @@ -170,7 +171,7 @@ UDPSocket::UDPSocket(unsigned short int listeningPort) : const int DEFAULT_BLOCKING_SOCKET_TIMEOUT_USECS = 0.5 * 1000000; setBlockingReceiveTimeoutInUsecs(DEFAULT_BLOCKING_SOCKET_TIMEOUT_USECS); - qDebug("Created UDP socket listening on port %hu.\n", _listeningPort); + Logging::standardizedLog(QString("Created UDP Socket listening on %1").arg(_listeningPort)); } UDPSocket::~UDPSocket() { From 9a259ea618b1deecc15610dbf88fb7b5ea689a13 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Mon, 9 Sep 2013 15:51:52 -0600 Subject: [PATCH 25/28] Adding assignment-client to DSL --- jenkins/jobs.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 306ee030a8..7cab63d42d 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -102,6 +102,7 @@ static Closure cmakeBuild(srcDir, instCommand) { def targets = [ 'animation-server':true, 'assignment-server':true, + 'assignment-client':true, 'domain-server':true, 'eve':true, 'pairing-server':true, From 613334074f2c8d2e7c356b3c63ad4a4322afa1e6 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 15:11:11 -0700 Subject: [PATCH 26/28] leverage qDebug and custom message handler for verbose logging --- assignment-client/src/main.cpp | 19 +++++++----- interface/src/Application.cpp | 4 +-- libraries/shared/src/Assignment.cpp | 6 +--- libraries/shared/src/Assignment.h | 2 -- libraries/shared/src/Logging.cpp | 46 +++++++++++++---------------- libraries/shared/src/Logging.h | 10 +------ libraries/shared/src/Node.cpp | 12 ++++---- libraries/shared/src/Node.h | 2 -- libraries/shared/src/NodeList.cpp | 14 ++++----- libraries/shared/src/UDPSocket.cpp | 2 +- 10 files changed, 49 insertions(+), 68 deletions(-) diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp index 896b69b274..0579b8bb56 100644 --- a/assignment-client/src/main.cpp +++ b/assignment-client/src/main.cpp @@ -69,14 +69,14 @@ void childClient() { // construct the deployed assignment from the packet data Assignment deployedAssignment(packetData, receivedBytes); - Logging::standardizedLog(QString("Received an assignment - %1").arg(deployedAssignment.toString())); + qDebug() << "Received an assignment -" << deployedAssignment << "\n"; // switch our nodelist DOMAIN_IP to the ip receieved in the assignment if (deployedAssignment.getDomainSocket()->sa_family == AF_INET) { in_addr domainSocketAddr = ((sockaddr_in*) deployedAssignment.getDomainSocket())->sin_addr; nodeList->setDomainIP(inet_ntoa(domainSocketAddr)); - Logging::standardizedLog(QString("Changed Domain IP to %1").arg(inet_ntoa(domainSocketAddr))); + qDebug("Changed Domain IP to %s\n", inet_ntoa(domainSocketAddr)); } if (deployedAssignment.getType() == Assignment::AudioMixer) { @@ -85,7 +85,7 @@ void childClient() { AvatarMixer::run(); } - Logging::standardizedLog(QString("Assignment finished or never started - waiting for new assignment")); + qDebug("Assignment finished or never started - waiting for new assignment\n"); // reset our NodeList by switching back to unassigned and clearing the list nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); @@ -124,7 +124,7 @@ void sigchldHandler(int sig) { // this is the parent, replace the dead process with the new one ::childForks[i] = newForkProcessID; - Logging::standardizedLog(QString("Replaced dead %1 with new fork %2").arg(processID).arg(newForkProcessID)); + qDebug("Replaced dead %d with new fork %d\n", processID, newForkProcessID); break; } @@ -159,6 +159,9 @@ int main(int argc, const char* argv[]) { setvbuf(stdout, NULL, _IOLBF, 0); + // use the verbose message handler in Logging + qInstallMessageHandler(Logging::verboseMessageHandler); + // start the Logging class with the parent's target name Logging::setTargetName(PARENT_TARGET_NAME); @@ -179,12 +182,12 @@ int main(int argc, const char* argv[]) { if (numForksString) { ::numForks = atoi(numForksString); - Logging::standardizedLog(QString("Starting %1 assignment clients").arg(numForks)); + qDebug("Starting %d assignment clients\n", ::numForks); - ::childForks = new pid_t[numForks]; + ::childForks = new pid_t[::numForks]; // fire off as many children as we need (this is one less than the parent since the parent will run as well) - for (int i = 0; i < numForks; i++) { + for (int i = 0; i < ::numForks; i++) { processID = fork(); if (processID == 0) { @@ -197,7 +200,7 @@ int main(int argc, const char* argv[]) { } } - if (processID == 0 || numForks == 0) { + if (processID == 0 || ::numForks == 0) { childClient(); } else { parentMonitor(); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ea61179057..7f055abe88 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include @@ -318,7 +318,7 @@ void Application::initializeGL() { const char LOGSTASH_INTERFACE_START_TIME_KEY[] = "interface-start-time"; // ask the Logstash class to record the startup time - Logstash::stashValue(STAT_TYPE_TIMER, LOGSTASH_INTERFACE_START_TIME_KEY, startupTime); + Logging::stashValue(STAT_TYPE_TIMER, LOGSTASH_INTERFACE_START_TIME_KEY, startupTime); } // update before the first render diff --git a/libraries/shared/src/Assignment.cpp b/libraries/shared/src/Assignment.cpp index 867854030a..850922396f 100644 --- a/libraries/shared/src/Assignment.cpp +++ b/libraries/shared/src/Assignment.cpp @@ -130,11 +130,7 @@ int Assignment::packToBuffer(unsigned char* buffer) { return numPackedBytes; } -QString Assignment::toString() const { - return QString("T:%1 P:%2").arg(_type).arg(_pool); -} - QDebug operator<<(QDebug debug, const Assignment &assignment) { - debug << assignment.toString().toStdString().c_str(); + debug << "T:" << assignment.getType() << "P:" << assignment.getPool(); return debug.nospace(); } \ No newline at end of file diff --git a/libraries/shared/src/Assignment.h b/libraries/shared/src/Assignment.h index 34cf065ce5..693cc42577 100644 --- a/libraries/shared/src/Assignment.h +++ b/libraries/shared/src/Assignment.h @@ -54,8 +54,6 @@ public: /// Sets _time to the current time given by gettimeofday void setCreateTimeToNow() { gettimeofday(&_time, NULL); } - QString toString() const; - private: Assignment::Direction _direction; /// the direction of the assignment (Create, Deploy, Request) Assignment::Type _type; /// the type of the assignment, defines what the assignee will do diff --git a/libraries/shared/src/Logging.cpp b/libraries/shared/src/Logging.cpp index 9da64ec271..bfdc3523f1 100644 --- a/libraries/shared/src/Logging.cpp +++ b/libraries/shared/src/Logging.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include "SharedUtil.h" @@ -60,20 +61,6 @@ void Logging::stashValue(char statType, const char* key, float value) { } } -const QString DEBUG_STRING = "DEBUG"; -const QString WARN_STRING = "WARN"; -const QString ERROR_STRING = "ERROR"; - -const QString& stringForLogType(Logging::Type logType) { - if (logType == Logging::Debug) { - return DEBUG_STRING; - } else if (logType == Logging::Warn) { - return WARN_STRING; - } else { - return ERROR_STRING; - } -} - void Logging::setTargetName(const char* targetName) { // remove the old target name, if it exists delete Logging::targetName; @@ -83,22 +70,31 @@ void Logging::setTargetName(const char* targetName) { strcpy(Logging::targetName, targetName); } +const char* stringForLogType(QtMsgType msgType) { + switch (msgType) { + case QtDebugMsg: + return "DEBUG"; + case QtCriticalMsg: + return "CRITICAL"; + case QtFatalMsg: + return "FATAL"; + case QtWarningMsg: + return "WARNING"; + } +} + // the following will produce 2000-10-02 13:55:36 -0700 const char DATE_STRING_FORMAT[] = "%F %H:%M:%S %z"; -void Logging::standardizedLog(const char *output, Logging::Type logType) { - standardizedLog(QString(output), logType); -} - -void Logging::standardizedLog(const QString &output, Logging::Type logType) { - time_t rawTime; - time(&rawTime); - struct tm* localTime = localtime(&rawTime); - +void Logging::verboseMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) { // log prefix is in the following format // [DEBUG] [TIMESTAMP] [PID:PARENT_PID] [TARGET] logged string - QString prefixString = QString("[%1]").arg(stringForLogType(logType)); + QString prefixString = QString("[%1]").arg(stringForLogType(type)); + + time_t rawTime; + time(&rawTime); + struct tm* localTime = localtime(&rawTime); char dateString[100]; strftime(dateString, sizeof(dateString), DATE_STRING_FORMAT, localTime); @@ -118,5 +114,5 @@ void Logging::standardizedLog(const QString &output, Logging::Type logType) { prefixString.append(QString(" [%1]").arg(Logging::targetName)); } - qDebug("%s %s", prefixString.toStdString().c_str(), output.toStdString().c_str()); + fprintf(stdout, "%s %s", prefixString.toLocal8Bit().constData(), message.toLocal8Bit().constData()); } \ No newline at end of file diff --git a/libraries/shared/src/Logging.h b/libraries/shared/src/Logging.h index 705bad86b3..0bd6197b9a 100644 --- a/libraries/shared/src/Logging.h +++ b/libraries/shared/src/Logging.h @@ -22,19 +22,11 @@ const char STAT_TYPE_GAUGE = 'g'; class Logging { public: - - enum Type { - Error, - Warn, - Debug - }; - static sockaddr* socket(); static bool shouldSendStats(); static void stashValue(char statType, const char* key, float value); static void setTargetName(const char* targetName); - static void standardizedLog(const char* output, Logging::Type logType = Logging::Debug); - static void standardizedLog(const QString& output, Logging::Type logType = Logging::Debug); + static void verboseMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message); private: static sockaddr_in logstashSocket; static char* targetName; diff --git a/libraries/shared/src/Node.cpp b/libraries/shared/src/Node.cpp index 09d8801068..c91626d99d 100644 --- a/libraries/shared/src/Node.cpp +++ b/libraries/shared/src/Node.cpp @@ -144,16 +144,14 @@ float Node::getAverageKilobitsPerSecond() { } } -QString Node::toString() const { +QDebug operator<<(QDebug debug, const Node &node) { char publicAddressBuffer[16] = {'\0'}; - unsigned short publicAddressPort = loadBufferWithSocketInfo(publicAddressBuffer, _publicSocket); + unsigned short publicAddressPort = loadBufferWithSocketInfo(publicAddressBuffer, node.getPublicSocket()); //char localAddressBuffer[16] = {'\0'}; //unsigned short localAddressPort = loadBufferWithSocketInfo(localAddressBuffer, node.localSocket); - return QString("# %1 %2 %3 %4:%5").arg(_nodeID).arg(getTypeName()).arg(_type).arg(publicAddressBuffer).arg(publicAddressPort); -} - -QDebug operator<<(QDebug debug, const Node &node) { - return debug << node.toString(); + debug << "#" << node.getNodeID() << node.getTypeName() << node.getType(); + debug.nospace() << publicAddressBuffer << ":" << publicAddressPort; + return debug.nospace(); } diff --git a/libraries/shared/src/Node.h b/libraries/shared/src/Node.h index d22d4e0076..2de75bcec1 100644 --- a/libraries/shared/src/Node.h +++ b/libraries/shared/src/Node.h @@ -72,8 +72,6 @@ public: void unlock() { pthread_mutex_unlock(&_mutex); } static void printLog(Node const&); - - QString toString() const; private: // privatize copy and assignment operator to disallow Node copying Node(const Node &otherNode); diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index 7b0bef7002..3b16150a00 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -44,7 +44,7 @@ NodeList* NodeList::createInstance(char ownerType, unsigned short int socketList if (!_sharedInstance) { _sharedInstance = new NodeList(ownerType, socketListenPort); } else { - Logging::standardizedLog("NodeList createInstance called with existing instance."); + qDebug("NodeList createInstance called with existing instance."); } return _sharedInstance; @@ -52,7 +52,7 @@ NodeList* NodeList::createInstance(char ownerType, unsigned short int socketList NodeList* NodeList::getInstance() { if (!_sharedInstance) { - Logging::standardizedLog("NodeList getInstance called before call to createInstance. Returning NULL pointer."); + qDebug("NodeList getInstance called before call to createInstance. Returning NULL pointer."); } return _sharedInstance; @@ -279,12 +279,12 @@ void NodeList::sendDomainServerCheckIn() { sockaddr_in tempAddress; memcpy(&tempAddress.sin_addr, pHostInfo->h_addr_list[0], pHostInfo->h_length); strcpy(_domainIP, inet_ntoa(tempAddress.sin_addr)); - Logging::standardizedLog(QString("Domain Server: %1").arg(_domainHostname)); + qDebug("Domain Server: %s", _domainHostname); } else { - Logging::standardizedLog("Failed domain server lookup", Logging::Warn); + qDebug("Failed domain server lookup"); } } else if (!printedDomainServerIP) { - Logging::standardizedLog(QString("Domain Server IP: %1").arg(_domainIP)); + qDebug("Domain Server IP: %s", _domainIP); printedDomainServerIP = true; } @@ -460,7 +460,7 @@ void NodeList::addNodeToList(Node* newNode) { ++_numNodes; - Logging::standardizedLog(QString("Added %1").arg(newNode->toString())); + qDebug() << "Added" << *newNode << "\n"; notifyHooksOfAddedNode(newNode); } @@ -516,7 +516,7 @@ void* removeSilentNodes(void *args) { if ((checkTimeUSecs - node->getLastHeardMicrostamp()) > NODE_SILENCE_THRESHOLD_USECS) { - Logging::standardizedLog(QString("Killed %1").arg(node->toString())); + qDebug() << "Killed " << *node << "\n"; nodeList->notifyHooksOfKilledNode(&*node); diff --git a/libraries/shared/src/UDPSocket.cpp b/libraries/shared/src/UDPSocket.cpp index f2f5129181..d89265b471 100644 --- a/libraries/shared/src/UDPSocket.cpp +++ b/libraries/shared/src/UDPSocket.cpp @@ -171,7 +171,7 @@ UDPSocket::UDPSocket(unsigned short int listeningPort) : const int DEFAULT_BLOCKING_SOCKET_TIMEOUT_USECS = 0.5 * 1000000; setBlockingReceiveTimeoutInUsecs(DEFAULT_BLOCKING_SOCKET_TIMEOUT_USECS); - Logging::standardizedLog(QString("Created UDP Socket listening on %1").arg(_listeningPort)); + qDebug("Created UDP Socket listening on %hd\n", _listeningPort); } UDPSocket::~UDPSocket() { From bbc051a7641bbf5d6c6aa524cf7792bab7768d07 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 15:27:27 -0700 Subject: [PATCH 27/28] add doxygen comments to refactored Logging class --- libraries/shared/src/Logging.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libraries/shared/src/Logging.h b/libraries/shared/src/Logging.h index 0bd6197b9a..c4f921070a 100644 --- a/libraries/shared/src/Logging.h +++ b/libraries/shared/src/Logging.h @@ -20,12 +20,28 @@ const char STAT_TYPE_TIMER = 't'; const char STAT_TYPE_COUNTER = 'c'; const char STAT_TYPE_GAUGE = 'g'; +/// Handles custom message handling and sending of stats/logs to Logstash instance class Logging { public: + /// \return the socket used to send stats to logstash static sockaddr* socket(); + + /// checks if this target should send stats to logstash, given its current environment + /// \return true if the caller should send stats to logstash static bool shouldSendStats(); + + /// stashes a float value to Logstash instance + /// \param statType a stat type from the constants in this file + /// \param key the key at which to store the stat + /// \param value the value to store static void stashValue(char statType, const char* key, float value); + + /// sets the target name to output via the verboseMessageHandler, called once before logging begins + /// \param targetName the desired target name to output in logs static void setTargetName(const char* targetName); + + /// a qtMessageHandler that can be hooked up to a target that links to Qt + /// prints various process, message type, and time information static void verboseMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &message); private: static sockaddr_in logstashSocket; From 1c792cf46a0e1f189d03d4ba0743c6f725974649 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Sep 2013 15:35:28 -0700 Subject: [PATCH 28/28] some newline additions for logging in NodeList --- libraries/shared/src/NodeList.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index 3b16150a00..a982e22242 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -279,12 +279,12 @@ void NodeList::sendDomainServerCheckIn() { sockaddr_in tempAddress; memcpy(&tempAddress.sin_addr, pHostInfo->h_addr_list[0], pHostInfo->h_length); strcpy(_domainIP, inet_ntoa(tempAddress.sin_addr)); - qDebug("Domain Server: %s", _domainHostname); + qDebug("Domain Server: %s\n", _domainHostname); } else { - qDebug("Failed domain server lookup"); + qDebug("Failed domain server lookup\n"); } } else if (!printedDomainServerIP) { - qDebug("Domain Server IP: %s", _domainIP); + qDebug("Domain Server IP: %s\n", _domainIP); printedDomainServerIP = true; }