Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 14:42:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add the ability to ask for multiple instances from JS page

Browse source
This commit is contained in:
Stephen Birarda 2013-09-17 11:48:08 -07:00
parent 0e19d9a53a
commit 76df707e31
5 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
domain-server/resources/web/assignment/css/style.css
View file

@ -36,11 +36,22 @@ body {
}
#deploy-button {
background-color: #0DFFBB;
right: 0px;
right: 85px;
}
#deploy-button:hover {
background-color: #28FF57;
}
#instance-field {
position: absolute;
right: 20px;
top: 40px;
}
#instance-field input {
width: 80px;
}
#stop-button {
background-color: #CC1F00;
right: 0px;

3
domain-server/resources/web/assignment/index.shtml
View file

@ -14,6 +14,9 @@
Run
</a>
</div>
<div class='big-field' id='instance-field'>
<input type='text' name='instances' placeholder='# of instances'>
</div>
<!-- %div#stop-button.big-button -->
</body>
</html>

6
domain-server/resources/web/assignment/js/assignment.js
View file

@ -20,6 +20,11 @@ $(document).ready(function(){
// add the script
+ script + '\r\n'
+ '--' + boundary + '--';
var headers = {};
if ($('#instance-field input').val()) {
headers['ASSIGNMENT-INSTANCES'] = $('#instance-field input').val();
}
// post form to assignment in order to create an assignment
$.ajax({
@ -27,6 +32,7 @@ $(document).ready(function(){
data: body,
type: "POST",
url: "/assignment",
headers: headers,
success: function (data, status) {
console.log(data);
console.log(status);

21
domain-server/src/main.cpp
View file

@ -313,17 +313,18 @@ int main(int argc, const char* argv[]) {
broadcastPacket,
numHeaderBytes + numAssignmentBytes);
// remove the assignment from the queue
::assignmentQueue.erase(assignment);
if ((*assignment)->getType() == Assignment::AgentType) {
// if this is a script assignment we need to delete it to avoid a memory leak
// or if there is more than one instance to send out, simpy decrease the number of instances
if ((*assignment)->getNumberOfInstances() > 1) {
(*assignment)->decrementNumberOfInstances();
} else {
::assignmentQueue.erase(assignment);
delete *assignment;
}
} else {
// remove the assignment from the queue
::assignmentQueue.erase(assignment);
}
// stop looping, we've handed out an assignment
@ -351,12 +352,18 @@ int main(int argc, const char* argv[]) {
nodeList->sendAssignment(*(*assignment));
// remove the assignment from the queue
::assignmentQueue.erase(assignment);
if ((*assignment)->getType() == Assignment::AgentType) {
// if this is a script assignment we need to delete it to avoid a memory leak
delete *assignment;
// or if there is more than one instance to send out, simpy decrease the number of instances
if ((*assignment)->getNumberOfInstances() > 1) {
(*assignment)->decrementNumberOfInstances();
} else {
::assignmentQueue.erase(assignment);
delete *assignment;
}
} else {
// remove the assignment from the queue
::assignmentQueue.erase(assignment);
}
// stop looping, we've handed out an assignment

6
libraries/shared/src/Assignment.cpp
View file

@ -21,7 +21,8 @@ Assignment::Assignment(Assignment::Command command, Assignment::Type type, Assig
_type(type),
_location(location),
_attachedPublicSocket(NULL),
_attachedLocalSocket(NULL)
_attachedLocalSocket(NULL),
_numberOfInstances(1)
{
// set the create time on this assignment
gettimeofday(&_time, NULL);
@ -35,7 +36,8 @@ Assignment::Assignment(Assignment::Command command, Assignment::Type type, Assig
Assignment::Assignment(const unsigned char* dataBuffer, int numBytes) :
_location(GlobalLocation),
_attachedPublicSocket(NULL),
_attachedLocalSocket(NULL)
_attachedLocalSocket(NULL),
_numberOfInstances(1)
{
// set the create time on this assignment
gettimeofday(&_time, NULL);