more code

diff --git a/src/server/.dir-locals.el b/src/server/.dir-locals.el
index ce85e5fa05e1aba56f93f471d99ea537f410b933..e166a2e892d1c8c8e7bf867c89e7689958f72a68 100644 (file)
--- a/src/server/.dir-locals.el
+++ b/src/server/.dir-locals.el
@@ -1 +1,2 @@
-((nil . ((indent-tabs-mode . t))))
\ No newline at end of file
+((nil . ((indent-tabs-mode . t))))
+

diff --git a/src/server/iotquery.cpp b/src/server/iotquery.cpp
index 8fc9fadf8e43b1aa77766cfa7806a699e368a755..d2d80e4177420a100a9900fbdd625289bc910735 100644 (file)
--- a/src/server/iotquery.cpp
+++ b/src/server/iotquery.cpp
@@ -23,10 +23,9 @@ IoTQuery::IoTQuery(FCGX_Request *request) :
        query(NULL),
        method(NULL),
        iotcloudroot(NULL),
        query(NULL),
        method(NULL),
        iotcloudroot(NULL),

-       dir(NULL),

        length(0),
        length(0),

-       firstentry(0),
-       lastentry(0),
+       oldestentry(0),
+       newestentry(0),

        requestsequencenumber(0),
        numqueueentries(DEFAULT_SIZE),
        fd(-1) {
        requestsequencenumber(0),
        numqueueentries(DEFAULT_SIZE),
        fd(-1) {


@@ -39,8 +38,6 @@ IoTQuery::~IoTQuery() {
                delete directory;
        if (data)
                delete data;
                delete directory;
        if (data)
                delete data;

-       if (dir != NULL)
-               closedir(dir);

 }
 
 bool IoTQuery::checkDirectory() {
 }
 
 bool IoTQuery::checkDirectory() {


@@ -69,22 +66,71 @@ void IoTQuery::decodeQuery() {
        char *sequencenumber_str = strsep(&tok_ptr, "&");
 
        if (sequencenumber_str != NULL)
        char *sequencenumber_str = strsep(&tok_ptr, "&");
 
        if (sequencenumber_str != NULL)

-               requestsequencenumber = strtol(sequencenumber_str, NULL, 10);
+               requestsequencenumber = strtoll(sequencenumber_str, NULL, 10);

 
        /* Update size if we get request */
        char * numqueueentries_str = tok_ptr;
        if (numqueueentries_str != NULL)
 
        /* Update size if we get request */
        char * numqueueentries_str = tok_ptr;
        if (numqueueentries_str != NULL)

-               numqueueentries = strtol(numqueueentries_str, NULL, 10);
+               numqueueentries = strtoll(numqueueentries_str, NULL, 10);

 
        delete str;
 }
 
 
        delete str;
 }
 

-void IoTQuery::getSlot() {
+void doWrite(int fd, char *data, long long length) {
+       long long offset=0;
+       do {
+               long long byteswritten=write(fd, &data[offset], length);
+               if (byteswritten > 0) {
+                       length -= byteswritten;
+                       offset += byteswritten;
+               } else {
+                       cerr << "Bytes not written";
+                       return;
+               }
+       } while(length != 0);
+}

 
 

+void IoTQuery::getSlot() {
+       

 }
 
 void IoTQuery::putSlot() {
 }
 
 void IoTQuery::putSlot() {

+       if (requestsequencenumber!=(newestentry+1)) {
+               getSlot();
+               return;
+       }
+       
+       int numberofliveslots=(int) ((newestentry-oldestentry)+1);
+       if (numberofliveslots >=  numqueueentries) {
+               //need to drop slot
+               removeOldestSlot();
+       }
+       //write slot data out to file
+       char *filename = getSlotFileName(requestsequencenumber);
+       int slotfd = open(filename, O_CREAT|O_WRONLY, S_IRUSR| S_IWUSR);
+       doWrite(slotfd, data, length);
+       close(slotfd);
+       delete filename;
+       newestentry = requestsequencenumber; // update sequence number
+       updateStatusFile(); // update counts
+}
+
+char * IoTQuery::getSlotFileName(long long slot) {
+       int directorylen=strlen(directory);
+       char * filename=new char[25+directorylen];//19 digits for long number + 4 characters for SLOT + 1 character for null termination
+       snprintf(filename, 24+directorylen+1, "%s/SLOT%lld", directory, slot);
+       return filename;
+}
+

 
 

+
+void IoTQuery::removeOldestSlot() {
+       if (oldestentry!=0) {
+               char * filename=getSlotFileName(oldestentry);
+               unlink(filename);
+               delete filename;
+       }
+       oldestentry++;

 }
 
 void IoTQuery::processQuery() {
 }
 
 void IoTQuery::processQuery() {


@@ -133,7 +179,7 @@ void IoTQuery::getQuery() {
 
        char * reqlength = FCGX_GetParam(length_str, request->envp);
        if (length) {
 
        char * reqlength = FCGX_GetParam(length_str, request->envp);
        if (length) {

-               length=strtol(reqlength, NULL, 10);
+               length=strtoll(reqlength, NULL, 10);

        } else {
                length=0;
        }
        } else {
                length=0;
        }


@@ -165,8 +211,8 @@ int doread(int fd, void *ptr, size_t count, off_t offset) {
 
 void IoTQuery::updateStatusFile() {
        pwrite(fd, &numqueueentries, sizeof(numqueueentries), OFFSET_MAX);
 
 void IoTQuery::updateStatusFile() {
        pwrite(fd, &numqueueentries, sizeof(numqueueentries), OFFSET_MAX);

-       pwrite(fd, &firstentry, sizeof(firstentry), OFFSET_FIRST);
-       pwrite(fd, &lastentry, sizeof(lastentry), OFFSET_LAST);
+       pwrite(fd, &oldestentry, sizeof(oldestentry), OFFSET_OLD);
+       pwrite(fd, &newestentry, sizeof(newestentry), OFFSET_NEW);

 }
 
 bool IoTQuery::openStatusFile() {
 }
 
 bool IoTQuery::openStatusFile() {


@@ -191,14 +237,14 @@ bool IoTQuery::openStatusFile() {
        else
                needwrite=1;
 
        else
                needwrite=1;
 

-       long entry;
-       if (doread(fd, &entry, sizeof(entry), OFFSET_FIRST))
-               firstentry=entry;
+       long long entry;
+       if (doread(fd, &entry, sizeof(entry), OFFSET_OLD))
+               oldestentry=entry;

        else
                needwrite=1;
 
        else
                needwrite=1;
 

-       if (doread(fd, &entry, sizeof(entry), OFFSET_LAST))
-               lastentry=entry;
+       if (doread(fd, &entry, sizeof(entry), OFFSET_NEW))
+               newestentry=entry;

        else
                needwrite=1;
 
        else
                needwrite=1;
 

diff --git a/src/server/iotquery.h b/src/server/iotquery.h
index 5aba593582848ea4563b6c66fdddb3fafcfbb7ab..2136a2d5cc17a25f5ab207db6a00483b5ef60b8a 100644 (file)
--- a/src/server/iotquery.h
+++ b/src/server/iotquery.h
@@ -3,12 +3,11 @@
 #include <iostream>
 #include "fcgio.h"
 #include "fcgi_stdio.h"
 #include <iostream>
 #include "fcgio.h"
 #include "fcgi_stdio.h"

-#include <dirent.h>

 
 #define DEFAULT_SIZE 128
 #define OFFSET_MAX 0
 
 #define DEFAULT_SIZE 128
 #define OFFSET_MAX 0

-#define OFFSET_FIRST 4
-#define OFFSET_LAST 12
+#define OFFSET_OLD 4
+#define OFFSET_NEW 12

 
 class IoTQuery {
  public:
 
 class IoTQuery {
  public:


@@ -26,6 +25,8 @@ class IoTQuery {
        void decodeQuery();
        void getSlot();
        void putSlot();
        void decodeQuery();
        void getSlot();
        void putSlot();

+       void removeOldestSlot();
+       char * getSlotFileName(long long);

        
        FCGX_Request * request;
        char *data;
        
        FCGX_Request * request;
        char *data;


@@ -34,11 +35,10 @@ class IoTQuery {
        const char * query;
        const char * method;
        const char * iotcloudroot;
        const char * query;
        const char * method;
        const char * iotcloudroot;

-       DIR *dir;
-       long length;
-       long firstentry;
-       long lastentry;
-       long requestsequencenumber;
+       long long length;
+       long long oldestentry;
+       long long newestentry;
+       long long requestsequencenumber;

        int numqueueentries;
        int fd;
        bool reqGetSlot;
        int numqueueentries;
        int fd;
        bool reqGetSlot;