sessionDuration and sessionGap are added

kongdeming · Nov 7, 2015 · 256ca8b · 256ca8b
1 parent 79d613f
commit 256ca8b
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 7 deletions.
diff --git a/filters/ehealth/EHealthSender.cpp b/filters/ehealth/EHealthSender.cpp
@@ -33,12  33,12 @@ Filter(name) {
 }
 
 void EHealthSender::init() {
-
-
   mode = std::stoi(getProp("mode"));
   httpHandler.setHost(getProp("host"));
 
   jsonHandler.setMacID();
   jsonHandler.setUserID(getProp("userid"));
 
   jsonHandler.setType(1);
 
   string message = jsonHandler.toJSON();
@@ -50,22  50,45 @@ void EHealthSender::init() {
   sessionDuration = std::stoi(config.getValue("sessionduration"));
   sessionGap = std::stoi(config.getValue("sessiongap"));
 
   gapPeriod = false;
 
   jsonHandler.setType(0);
   chronometer.start();
 }
 
 void EHealthSender::run() {
-
   
   long long timediff;
   input->lock();
   SensorData * inputData = input->get();
-  timediff = jsonHandler.insertData(inputData);
-  input->unlock();   
 
   if (mode==0 && gapPeriod) {
     if (chronometer.now() < sessionGap) {
       cout << "Sleeping..." << endl;
       input->unlock();
       return;
     } else {
       cout << "Waking up..." << endl;
       chronometer.start();
       gapPeriod = false;
     }
   }
 
   timediff = jsonHandler.insertData(inputData);
   input->unlock();
 
   if (timediff >= sendingPeriod) { 
     cout << "Sending..." << endl;
     string message = jsonHandler.toJSON();
     std::string response = httpHandler.sendHTTP(message);
     cout << response << endl;
   }
 
   if (mode==0 && chronometer.now() >= sessionDuration) {
     gapPeriod = true;
     chronometer.start();
     cout << "Session duration is up..." << endl;
   }
 
 }
 

diff --git a/filters/ehealth/EHealthSender.h b/filters/ehealth/EHealthSender.h
@@ -28,6  28,7 @@
 #include <ehealthsensor/Sensor.h>
 #include <filters/ehealth/tools/JSONHandler.h>
 #include <filters/ehealth/tools/HTTPHandler.h>
 #include <filters/ehealth/tools/Chronometer.h>
 
 struct EHealthSender: public tmf::Filter {
 private:
@@ -36,13  37,16 @@ struct EHealthSender: public tmf::Filter {
 
   static tmf::FilterRegister<EHealthSender> reg;
 
-  std::string mode;  
   int mode;  
   int sendingPeriod;  
   int sessionDuration;
   int sessionGap;
   boolean gapPeriod;
 
   JSONHandler jsonHandler;    
   HTTPHandler httpHandler;
   Chronometer chronometer;
 
 public:
 
   EHealthSender(const std::string& name);

diff --git a/filters/ehealth/tools/Chronometer.cpp b/filters/ehealth/tools/Chronometer.cpp
@@ -0,0  1,41 @@
 /*
  * 
  *  Tiny Multimedia Framework
  *  Copyright (C) 2014 Arash Shafiei
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 #include "filters/ehealth/tools/Chronometer.h"
 
 
 Chronometer::Chronometer() {
 }
 
 void Chronometer::start() {
   startTime = std::chrono::high_resolution_clock::now();
 }
 
 long long Chronometer::now() {
   endTime = std::chrono::high_resolution_clock::now();
 
   auto duration = std::chrono::duration_cast<std::chrono::milliseconds>( endTime - startTime ).count();
 
   return duration;
 
 }
 
 Chronometer::~Chronometer() {
 }
diff --git a/filters/ehealth/tools/Chronometer.h b/filters/ehealth/tools/Chronometer.h
@@ -0,0  1,40 @@
 /*
  * 
  *  Tiny Multimedia Framework
  *  Copyright (C) 2014 Arash Shafiei
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 
 #ifndef CHRONOMETER_H
 #define CHRONOMETER_H
 
 #include <thread>
 #include <chrono>
 
 class Chronometer 
 {
 private:
   std::chrono::high_resolution_clock::time_point startTime, endTime;
 
 public:
   Chronometer();
   void start();
   long long now();
   ~Chronometer();
 };
 
 #endif // SCHEDULER_H
diff --git a/filters/ehealth/tools/HTTPHandler.cpp b/filters/ehealth/tools/HTTPHandler.cpp
@@ -32,6  32,12 @@ void HTTPHandler::setHost(std::string url) {
   this->url = url;
 }
 
 size_t HTTPHandler::WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
 {
     ((std::string*)userp)->append((char*)contents, size * nmemb);
     return size * nmemb;
 }
 
 std::string HTTPHandler::sendHTTP(std::string message)
 {
   std::string response;
@@ -46,6  52,7 @@ std::string HTTPHandler::sendHTTP(std::string message)
     curl_easy_setopt(curl, CURLOPT_URL, this->url.c_str());
     /* Now specify the POST data */ 
     curl_easy_setopt(curl, CURLOPT_POSTFIELDS, message.c_str());
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);  
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
 
     /* Perform the request, res will get the return code */ 

diff --git a/filters/ehealth/tools/HTTPHandler.h b/filters/ehealth/tools/HTTPHandler.h
@@ -32,7  32,8 @@ class HTTPHandler
   std::string url;
   CURL *curl;
   CURLcode res;
-
   static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp);
 
 public:
   HTTPHandler();
   void setHost(std::string url);