fixup: refactored JobControlRecord cache interface

bareos · Oct 15, 2019 · 6c047c6 · 6c047c6
1 parent 7f18805
commit 6c047c6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/core/src/include/jcr.h b/core/src/include/jcr.h
@@ -681,16 +681,24 @@ extern void b_free_jcr(const char* file, int line, JobControlRecord* jcr);
 typedef void(dbg_jcr_hook_t)(JobControlRecord* jcr, FILE* fp);
 extern void DbgJcrAddHook(dbg_jcr_hook_t* fct);
 
+struct SessionIdentifier {
+  uint32_t id_{0};
+  uint32_t time_{0};
+  SessionIdentifier(uint32_t id, uint32_t time) : id_(id), time_(time) {}
+  bool operator==(const SessionIdentifier& rhs) const
+  {
+    return id_ == rhs.id_ && time_ == rhs.time_;
+  }
+};
 
 /* new interface */
 void InitJcr(std::shared_ptr<JobControlRecord> jcr,
              JCR_free_HANDLER* daemon_free_jcr);
 std::size_t GetJcrCount();
 std::shared_ptr<JobControlRecord> GetJcrById(uint32_t JobId);
-std::shared_ptr<JobControlRecord> GetJcrByFullName(char* name_in);
-std::shared_ptr<JobControlRecord> GetJcrByPartialName(char* name_in);
-std::shared_ptr<JobControlRecord> GetJcrBySession(uint32_t SessionId,
-                                                  uint32_t SessionTime);
+std::shared_ptr<JobControlRecord> GetJcrByFullName(std::string name);
+std::shared_ptr<JobControlRecord> GetJcrByPartialName(std::string name);
+std::shared_ptr<JobControlRecord> GetJcrBySession(SessionIdentifier identifier);
 uint32_t GetJobIdByThreadId(pthread_t tid);
 /* ************* */
 

diff --git a/core/src/lib/jcr.cc b/core/src/lib/jcr.cc
@@ -529,30 +529,25 @@ std::shared_ptr<JobControlRecord> GetJcrById(uint32_t JobId)
       [JobId](const JobControlRecord* jcr) { return jcr->JobId == JobId; });
 }
 
-std::shared_ptr<JobControlRecord> GetJcrByFullName(char* name_in)
+std::shared_ptr<JobControlRecord> GetJcrByFullName(std::string name)
 {
-  return GetJcr([name_in](const JobControlRecord* jcr) {
-    std::string name(name_in);
-    std::string job_name(jcr->Job);
-    return job_name == name;
+  return GetJcr([&name](const JobControlRecord* jcr) {
+    return std::string{jcr->Job} == name;
   });
 }
 
-std::shared_ptr<JobControlRecord> GetJcrByPartialName(char* name_in)
+std::shared_ptr<JobControlRecord> GetJcrByPartialName(std::string name)
 {
-  return GetJcr([name_in](const JobControlRecord* jcr) {
-    std::string name(name_in);
-    std::string job_name(jcr->Job);
-    return job_name.find(name) == 0;
+  return GetJcr([&name](const JobControlRecord* jcr) {
+    return std::string{jcr->Job}.find(name) == 0;
   });
 }
 
-std::shared_ptr<JobControlRecord> GetJcrBySession(uint32_t SessionId,
-                                                  uint32_t SessionTime)
+std::shared_ptr<JobControlRecord> GetJcrBySession(SessionIdentifier identifier)
 {
-  return GetJcr([SessionId, SessionTime](const JobControlRecord* jcr) {
-    return (jcr->VolSessionId == SessionId &&
-            jcr->VolSessionTime == SessionTime);
+  return GetJcr([&identifier](const JobControlRecord* jcr) {
+    return (SessionIdentifier{jcr->VolSessionId, jcr->VolSessionTime} ==
+            identifier);
   });
 }
 

diff --git a/core/src/tests/job_control_record.cc b/core/src/tests/job_control_record.cc
@@ -122,15 +122,15 @@ TEST_F(JobControlRecordTest, get_job_by_partial_name_not_found)
 
 TEST_F(JobControlRecordTest, get_job_by_session)
 {
-  auto found_jcr = GetJcrBySession(11, 101);
+  auto found_jcr = GetJcrBySession({11, 101});
   EXPECT_EQ(jobs[1].get(), found_jcr.get());
 }
 
 TEST_F(JobControlRecordTest, get_job_by_session_not_found)
 {
-  auto found_jcr = GetJcrBySession(12, 101);
+  auto found_jcr = GetJcrBySession({12, 101});
   EXPECT_FALSE(found_jcr.get());
 
-  found_jcr = GetJcrBySession(11, 103);
+  found_jcr = GetJcrBySession({11, 103});
   EXPECT_FALSE(found_jcr.get());
 }