This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit e41c66724a15c4cfb252eb50f18a2b6e51a3f236 Author: Leif Hedstrom <[email protected]> AuthorDate: Mon May 27 14:43:49 2019 -0600 Step 19: Removes the now unused Rollback member variables --- mgmt/FileManager.cc | 2 +- mgmt/Rollback.cc | 18 ++++-------------- mgmt/Rollback.h | 20 ++++++-------------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/mgmt/FileManager.cc b/mgmt/FileManager.cc index 2dd3fb7..6aa30bb 100644 --- a/mgmt/FileManager.cc +++ b/mgmt/FileManager.cc @@ -107,7 +107,7 @@ FileManager::addFileHelper(const char *fileName, const char *configName, bool ro { ink_assert(fileName != nullptr); - Rollback *rb = new Rollback(fileName, configName, root_access_needed, parentRollback, flags); + Rollback *rb = new Rollback(fileName, configName, root_access_needed, parentRollback); rb->configFiles = this; bindings.emplace(rb->getFileName(), rb); diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc index fc1372d..70fe2b0 100644 --- a/mgmt/Rollback.cc +++ b/mgmt/Rollback.cc @@ -46,9 +46,8 @@ const char *RollbackStrings[] = {"Rollback Ok", "File was not found", "Version was out of date", "System Call Error", "Invalid Version - Version Numbers Must Increase"}; -Rollback::Rollback(const char *fileName_, const char *configName_, bool root_access_needed_, Rollback *parentRollback_, - unsigned flags) - : configFiles(nullptr), root_access_needed(root_access_needed_), parentRollback(parentRollback_), fileLastModified(0) +Rollback::Rollback(const char *fileName_, const char *configName_, bool root_access_needed_, Rollback *parentRollback_) + : root_access_needed(root_access_needed_), parentRollback(parentRollback_) { ExpandingArray existVer(25, true); // Existing versions struct stat fileInfo; @@ -60,17 +59,8 @@ Rollback::Rollback(const char *fileName_, const char *configName_, bool root_acc } // Copy the file name. - fileNameLen = strlen(fileName_); - fileName = ats_strdup(fileName_); - configName = ats_strdup(configName_); - - // Extract the file base name. - fileBaseName = strrchr(fileName, '/'); - if (fileBaseName) { - fileBaseName++; - } else { - fileBaseName = fileName; - } + fileName = ats_strdup(fileName_); + configName = ats_strdup(configName_); ink_mutex_init(&fileAccessLock); diff --git a/mgmt/Rollback.h b/mgmt/Rollback.h index e8ec017..f118e89 100644 --- a/mgmt/Rollback.h +++ b/mgmt/Rollback.h @@ -49,8 +49,7 @@ class Rollback { public: // fileName_ should be rooted or a base file name. - Rollback(const char *fileName_, const char *configName_, bool root_access_needed, Rollback *parentRollback = nullptr, - unsigned flags = 0); + Rollback(const char *fileName_, const char *configName_, bool root_access_needed, Rollback *parentRollback); ~Rollback(); // Manual take out of lock required @@ -66,16 +65,10 @@ public: ink_mutex_release(&fileAccessLock); }; - // Automatically take out lock + // Check if a file has changed, automatically holds the lock. Used by FileManager. bool checkForUserUpdate(); - // Not file based so no lock necessary - const char * - getBaseName() const - { - return fileBaseName; - } - + // These are getters, for FileManager to get info about a particular configuration. const char * getFileName() const { @@ -106,7 +99,7 @@ public: return root_access_needed; } - FileManager *configFiles; // Manager to notify on an update. + FileManager *configFiles = nullptr; // Manager to notify on an update. // noncopyable Rollback(const Rollback &) = delete; @@ -114,12 +107,11 @@ public: private: int statFile(struct stat *buf); + ink_mutex fileAccessLock; char *fileName; - char *fileBaseName; char *configName; - size_t fileNameLen; bool root_access_needed; Rollback *parentRollback; - time_t fileLastModified; + time_t fileLastModified = 0; };
