dev: changes to allow multiple simulatneous active sessions, issue#8

src/users/user_feedback.cpp

@@ -2,6 +2,7 @@
 #include "../pempek_assert.hpp"
 #include "json_workload.hpp"
 #include "rapidjson/document.h"
+#include <limits>
 #include <string>
 
 /* FeedbackUser */
@@ -42,78 +43,108 @@ FeedbackUser::~FeedbackUser()
 {
 }
 
+void FeedbackUser::update_date_next_sub()
+{
+    /* Calculate the date of next submission.
+     * next_submit_time = DATE_UNKNOWN || DATE_NEVER ||
+            min(free_session->next, active_session->next) */
+
+    if (active_sessions.empty()){
+        if (!free_sessions.empty())
+            date_of_next_submission = free_sessions.top()->start_time;
+        else if (ongoing_job_counter > 0)
+            date_of_next_submission = DATE_UNKNOWN;
+        else
+            date_of_next_submission = DATE_NEVER;
+        return;
+    }
+
+    /* Case active_sessions not empty: the next submit time is known.
+     * Calculate the min. */
+    date_of_next_submission = std::numeric_limits<double>::max();
+    for (Session *active_sess : active_sessions)
+    { 
+        PPK_ASSERT_ERROR(!active_sess->jobs.empty(), 
+            "Active session %d has no job to submit", active_sess->id);
+        
+        double next_call = active_sess->start_time + 
+            active_sess->jobs.front()->submission_time;
+
+        date_of_next_submission = std::min(date_of_next_submission, next_call);        
+    }
+
+    if (!free_sessions.empty())
+        date_of_next_submission = std::min(date_of_next_submission,
+            free_sessions.top()->start_time);
+    return;
+}
+
 void FeedbackUser::jobs_to_submit(
     double date, std::list<Job *> &jobs, std::list<Profile *> &profiles)
 {
     jobs = std::list<Job *>();
     profiles = std::list<Profile *>();
 
-    if (active_session == nullptr)
+    /* Add the free sessions starting now to the list of active sessions */
+    while (!free_sessions.empty() && free_sessions.top()->start_time <= date)
     {
-        PPK_ASSERT_ERROR(!free_sessions.empty(),
-            "User %s has been called to sumbit but she has neither an active "
-            "session nor free sessions",
-            user_name.c_str());
-        PPK_ASSERT_ERROR(free_sessions.top()->start_time <= date,
-            "Next free session of user %s has greater start time than "
-            "current date",
-            user_name.c_str());
-
-        active_session = free_sessions.top();
+        active_sessions.push_back(free_sessions.top());
         free_sessions.pop();
     }
-
-    auto job_list = &active_session->jobs;
-    PPK_ASSERT_ERROR(!job_list->empty(),
-        "User %s has been called to sumbit but the job list in her active "
-        "session is empty",
+    PPK_ASSERT_ERROR(!active_sessions.empty(),
+        "User %s has been called to sumbit but she has no active session",
         user_name.c_str());
 
-    double offset = active_session->start_time;
-    PPK_ASSERT_ERROR(job_list->front()->submission_time + offset <= date,
-        "First job in user %s's job list has greater sumbmission time than "
-        "current date",
-        user_name.c_str());
 
-    /* Submit all jobs that have same submit time */
-    while (!job_list->empty()
-        && job_list->front()->submission_time + offset <= date)
+    /* For each active session, add the jobs to submit now to the list `jobs` */
+    for (auto iter = active_sessions.begin(); iter != active_sessions.end();)
     {
-        Job *job = new Job(*job_list->front()); /* Cast const Job * -> Job * */
-        Profile *job_profile = new Profile();
+        Session *active_sess = *iter;
+        auto job_list = &active_sess->jobs;
+        PPK_ASSERT_ERROR(!job_list->empty(),
+            "Active session %d has no job to submit", active_sess->id);
 
-        /* Handle the job according to the user behavior. */
-        bool execute_now = handle_job(date, job, job_profile);
+        double offset = active_sess->start_time;
 
-        if (execute_now)
+        while (!job_list->empty()
+            && job_list->front()->submission_time + offset <= date)
         {
-            job->submission_time = date;
-            /* Add it to the list of jobs (and profiles, if new) to submit */
-            jobs.push_back(job);
-            if (sent_profiles.count(job->profile) == 0)
+            Job *job = new Job(*job_list->front()); // Cast const Job * -> Job *
+            Profile *job_profile = new Profile();
+
+            /* Handle the job according to the user behavior. */
+            bool execute_now = handle_job(date, job, job_profile);
+
+            if (execute_now)
             {
-                profiles.push_back(job_profile);
-                sent_profiles.insert(job->profile);
+                job->submission_time = date;
+                /* Add it to the list of jobs (and profiles, if new) to submit */
+                jobs.push_back(job);
+                if (sent_profiles.count(job->profile) == 0)
+                {
+                    profiles.push_back(job_profile);
+                    sent_profiles.insert(job->profile);
+                }
+                ongoing_job_counter++;
+
+                /* Delete job from the job list */
+                job_list->pop_front();
             }
-            ongoing_job_counter++;
-
-            /* Delete job from the job list */
-            job_list->pop_front();
         }
-    }
 
-    /* Update next submit time */
-    if (!job_list->empty())
-        date_of_next_submission = job_list->front()->submission_time + offset;
-    else
-    {
-        active_session = nullptr;
-
-        if (!free_sessions.empty())
-            date_of_next_submission = free_sessions.top()->start_time;
+        if (job_list->empty()) /* active session finished: close it */
+            iter = active_sessions.erase(iter);
         else
-            date_of_next_submission = DATE_UNKNOWN;
+            ++iter;
     }
+    
+    PPK_ASSERT_ERROR(!jobs.empty(), 
+        "User %s called to submit but did not submit any job",
+        user_name.c_str());
+
+
+    /* Update next submit time */
+    update_date_next_sub();   
 }
 
 void FeedbackUser::wake_on_feedback(double date, std::list<Job *> &ended_jobs)
@@ -131,16 +162,8 @@ void FeedbackUser::wake_on_feedback(double date, std::list<Job *> &ended_jobs)
             close_session(date, j->session);
     }
 
-    /* If no active session, find the next submit time */
-    if (active_session == nullptr)
-    {
-        if (!free_sessions.empty())
-            date_of_next_submission = free_sessions.top()->start_time;
-        else if (ongoing_job_counter > 0)
-            date_of_next_submission = DATE_UNKNOWN;
-        else
-            date_of_next_submission = DATE_NEVER;
-    }
+    /* The next submit time might have changed in reaction to feedback */
+    update_date_next_sub();
 }
 
 /* FBUserThinkTimeOnly */

src/users/user_feedback.hpp

@@ -28,6 +28,11 @@ protected:
      */
     void init_FeedbackUser(std::string name, const rapidjson::Value &param);
 
+    /**
+     * Method to update the date of the next submission of the user
+     */
+    void update_date_next_sub();
+
     /**
      * A session has finished (all its jobs finished). Update its following
      * sessions and the free sessions depending on the replay model.
@@ -47,9 +52,8 @@ protected:
     std::set<std::string> sent_profiles;
     unsigned int ongoing_job_counter = 0;
 
-    /* A session is "active" if the user is currently submitting from it.
-     * There is only one active session at a time. */
-    Session *active_session = nullptr;
+    /* A session is "active" if the user is currently submitting from it */
+    std::list<Session *> active_sessions;
 
     /* A session is "free" if its dependancy list is empty and it hasn't started
      * yet */