Merge Master into Green

src/include/id_map.hpp

@@ -84,13 +84,14 @@
 
 class id_map
   {
-    std::map<std::string, int> str_map;
-    std::vector<std::string>   names;
+    std::map<std::string, int> *str_map;
+    std::vector<std::string>   *names;
     pthread_mutex_t            mutex;
     int                        counter;
 
   public:
     id_map();
+    ~id_map();
     id_map(const id_map &other);
     int get_new_id(const char *name);
     int get_id(const char *name);

src/server/id_map.cpp

@@ -93,14 +93,14 @@ int id_map::get_new_id(
 
   try 
     {
-    id = this->str_map.at(nname);
+    id = this->str_map->at(nname);
     }
   catch (...)
     {
     id = this->counter++;
     std::pair<std::string, int> p1(nname, id);
-    this->str_map.insert(p1);
-    this->names.push_back(nname);
+    this->str_map->insert(p1);
+    this->names->push_back(nname);
     }
   pthread_mutex_unlock(&this->mutex);
 
@@ -121,7 +121,7 @@ int id_map::get_id(
   try 
     {
     std::string nname(name);
-    id = this->str_map.at(nname);
+    id = this->str_map->at(nname);
     }
   catch (...)
     {
@@ -142,7 +142,7 @@ const char *id_map::get_name(
   pthread_mutex_lock(&this->mutex);
   try
     {
-    std::string const &nname = this->names.at(id);
+    std::string const &nname = this->names->at(id);
     name = nname.c_str();
     }
   catch (...)
@@ -154,18 +154,28 @@ const char *id_map::get_name(
   }
 
 
+id_map::~id_map() 
+  {
+  // leave the destructor blank. C++ destroys globally constructed
+  // objects when the main thread exits, and this class is only destroyed
+  // at shutdown, so we don't care about the memory usage at that point.
+  }
 
-id_map::id_map() : counter(0)
 
+
+id_map::id_map() : counter(0)
   {
+  str_map = new std::map<std::string,int>();
+  names = new std::vector<std::string>();
   pthread_mutex_init(&mutex, NULL);
   }
 
 
 
-id_map::id_map(const id_map &other) : counter(other.counter), names(other.names), str_map(other.str_map)
-
+id_map::id_map(const id_map &other) : counter(other.counter)
   {
+  str_map = new std::map<std::string,int>(*other.str_map);
+  names = new std::vector<std::string>(*other.names);
   pthread_mutex_init(&mutex, NULL);
   }
 

src/server/test/exiting_jobs/scaffolding.c

@@ -41,3 +41,4 @@ void on_job_exit(batch_request *preq, char *jobid) {}
 void force_purge_work(job *pjob) {}
 
 void log_event(int eventtype, int objclass, const char *objname, const char *text) {}
+

src/server/test/job_container/scaffolding.c

@@ -59,3 +59,4 @@ job *job_alloc(void)
 
   return(pj);
   }
+

src/server/test/job_func/scaffolding.c

@@ -3,6 +3,7 @@
 #include <stdio.h> /* fprintf */
 #include <pthread.h>
 #include <errno.h>
+#include <string>
 
 #include "pbs_ifl.h" /* MAXPATHLEN, PBS_MAXSERVERNAME */
 #include "server.h" /* server, NO_BUFFER_SPACE */
@@ -13,7 +14,6 @@
 #include "batch_request.h" /* batch_request */
 #include "work_task.h" /* all_tasks */
 #include "array.h" /* ArrayEventsEnum */
-#include <string>
 
 /* This section is for manipulting function return values */
 #include "test_job_func.h" /* *_SUITE */
@@ -591,3 +591,4 @@ job *find_job_by_array(
 
   return(pj);
   } /* END find_job_by_array() */
+

src/server/test/job_recov/scaffolding.c

@@ -330,3 +330,4 @@ job *find_job_by_array(all_jobs *aj, char *job_id, int get_subjob, bool locked)
   {
   return(NULL);
   }
+

src/server/test/node_func/scaffolding.c

@@ -335,6 +335,11 @@ int id_map::get_new_id(char const *name)
   return(id++);
   }
 
+id_map::~id_map() 
+  {
+  }
+
+
 id_map node_mapper;
 
 struct pbsnode *tfind_addr(

src/server/test/node_manager/scaffolding.c

@@ -546,6 +546,11 @@ const char *id_map::get_name(int id)
   return(strdup(buf));
   }
 
+id_map::~id_map() 
+  {
+  }
+
+
 id_map node_mapper;
 
 #ifdef CAN_TIME

src/server/test/req_jobobit/scaffolding.c

@@ -21,7 +21,6 @@
 #include "queue.h" /* pbs_queue */
 
 
-
 const char *msg_momnoexec2 = "Job cannot be executed\nSee job standard error file";
 const char *msg_job_end_sig = "Terminated on signal %d";
 const char *msg_obitnojob  = "Job Obit notice received from %s has error %d";
@@ -325,3 +324,4 @@ void log_record(int eventtype, int objclass, const char *objname, const char *te
 void account_jobend(job *pjob, char *used) {}
 
 void update_array_values(job_array *pa, int old_state, enum ArrayEventsEnum event, char *job_id, long job_atr_hold, int job_exit_status) {}
+

src/server/test/req_quejob/scaffolding.c

@@ -411,4 +411,3 @@ job *find_job_by_array(all_jobs *aj, char *jobid, int get_subjob, bool locked)
   }
 
 
-