From d21583d9c51846d1bbfbc99482d04efa3a351fa1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 26 Nov 2013 16:20:35 -0600 Subject: [PATCH] make AssignmentClient use event loop, closes #1291 --- assignment-client/src/AssignmentClient.cpp | 90 ++++------------------ assignment-client/src/AssignmentClient.h | 8 +- 2 files changed, 18 insertions(+), 80 deletions(-) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index ec7ae6fc92..92d394f41a 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -6,6 +6,8 @@ // Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // +#include + #include #include #include @@ -17,21 +19,15 @@ #include "AssignmentClient.h" const char ASSIGNMENT_CLIENT_TARGET_NAME[] = "assignment-client"; -const long long ASSIGNMENT_REQUEST_INTERVAL_USECS = 1 * 1000 * 1000; +const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000; AssignmentClient::AssignmentClient(int &argc, char **argv, Assignment::Type requestAssignmentType, const sockaddr_in& customAssignmentServerSocket, const char* requestAssignmentPool) : QCoreApplication(argc, argv), - _requestAssignmentType(requestAssignmentType), - _customAssignmentServerSocket(customAssignmentServerSocket), - _requestAssignmentPool(requestAssignmentPool) + _requestAssignment(Assignment::RequestCommand, requestAssignmentType, requestAssignmentPool) { - -} - -int AssignmentClient::exec() { // set the logging target to the the CHILD_TARGET_NAME Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME); @@ -39,74 +35,18 @@ int AssignmentClient::exec() { NodeList* nodeList = NodeList::createInstance(NODE_TYPE_UNASSIGNED); // set the custom assignment socket if we have it - if (_customAssignmentServerSocket.sin_addr.s_addr != 0) { - nodeList->setAssignmentServerSocket((sockaddr*) &_customAssignmentServerSocket); + if (customAssignmentServerSocket.sin_addr.s_addr != 0) { + nodeList->setAssignmentServerSocket((sockaddr*) &customAssignmentServerSocket); } - // change the timeout on the nodelist socket to be as often as we want to re-request - nodeList->getNodeSocket()->setBlockingReceiveTimeoutInUsecs(ASSIGNMENT_REQUEST_INTERVAL_USECS); + // call a timer function every ASSIGNMENT_REQUEST_INTERVAL_MSECS to ask for assignment, if required + qDebug() << "Waiting for assignment -" << _requestAssignment << "\n"; - timeval lastRequest = {}; - - unsigned char packetData[MAX_PACKET_SIZE]; - ssize_t receivedBytes = 0; - - sockaddr_in senderSocket = {}; - - // create a request assignment, accept assignments defined by the overidden type - Assignment requestAssignment(Assignment::RequestCommand, _requestAssignmentType, _requestAssignmentPool); - - qDebug() << "Waiting for assignment -" << requestAssignment << "\n"; - - 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((sockaddr*) &senderSocket, packetData, &receivedBytes) && - (packetData[0] == PACKET_TYPE_DEPLOY_ASSIGNMENT || packetData[0] == PACKET_TYPE_CREATE_ASSIGNMENT) - && packetVersionMatch(packetData)) { - - // construct the deployed assignment from the packet data - Assignment* deployedAssignment = AssignmentFactory::unpackAssignment(packetData, receivedBytes); - - qDebug() << "Received an assignment -" << *deployedAssignment << "\n"; - - // switch our nodelist domain IP and port to whoever sent us the assignment - if (packetData[0] == PACKET_TYPE_CREATE_ASSIGNMENT) { - - nodeList->setDomainIP(QHostAddress((sockaddr*) &senderSocket)); - nodeList->setDomainPort(ntohs(senderSocket.sin_port)); - - nodeList->setOwnerUUID(deployedAssignment->getUUID()); - - qDebug("Destination IP for assignment is %s\n", nodeList->getDomainIP().toString().toStdString().c_str()); - - // run the deployed assignment - deployedAssignment->run(); - } else { - qDebug("Received a bad destination socket for assignment.\n"); - } - - qDebug("Assignment finished or never started - waiting for new assignment\n"); - - // delete the deployedAssignment - delete deployedAssignment; - - // reset our NodeList by switching back to unassigned and clearing the list - nodeList->setOwnerType(NODE_TYPE_UNASSIGNED); - nodeList->reset(); - - // set the NodeList socket back to blocking - nodeList->getNodeSocket()->setBlocking(true); - - // reset the logging target to the the CHILD_TARGET_NAME - Logging::setTargetName(ASSIGNMENT_CLIENT_TARGET_NAME); - } - } - - return 0; + QTimer* timer = new QTimer(this); + connect(timer, SIGNAL(timeout()), SLOT(sendAssignmentRequest())); + timer->start(ASSIGNMENT_REQUEST_INTERVAL_MSECS); +} + +void AssignmentClient::sendAssignmentRequest() { + NodeList::getInstance()->sendAssignment(_requestAssignment); } diff --git a/assignment-client/src/AssignmentClient.h b/assignment-client/src/AssignmentClient.h index 26f1f952c0..97ccc6e805 100644 --- a/assignment-client/src/AssignmentClient.h +++ b/assignment-client/src/AssignmentClient.h @@ -18,12 +18,10 @@ public: Assignment::Type requestAssignmentType = Assignment::AllTypes, const sockaddr_in& customAssignmentServerSocket = sockaddr_in(), const char* requestAssignmentPool = NULL); - - int exec(); +private slots: + void sendAssignmentRequest(); private: - Assignment::Type _requestAssignmentType; - sockaddr_in _customAssignmentServerSocket; - const char* _requestAssignmentPool; + Assignment _requestAssignment; }; #endif /* defined(__hifi__AssignmentClient__) */