Fix race condition in atomic operations for total_time_s

Co-authored-by: bbockelm <1093447+bbockelm@users.noreply.github.com>

Author: Copilot

src/scitokens_internal.h

@@ -133,9 +133,6 @@ class MonitoringStats {
   public:
     static MonitoringStats &instance();
 
-    // Get a reference to issuer stats for periodic updates
-    IssuerStats* get_issuer_stats(const std::string &issuer);
-    
     void record_validation_success(const std::string &issuer,
                                     double duration_s);
     void record_validation_failure(const std::string &issuer,
@@ -486,7 +483,6 @@ class Validator {
     void verify(const SciToken &scitoken, time_t expiry_time) {
         std::string issuer = "";
         auto start_time = std::chrono::steady_clock::now();
-        internal::IssuerStats* stats_ptr = nullptr;
 
         try {
             auto result = verify_async(scitoken);
@@ -496,12 +492,11 @@ class Validator {
                 scitoken.m_decoded.get();
             if (jwt_decoded && jwt_decoded->has_payload_claim("iss")) {
                 issuer = jwt_decoded->get_issuer();
-                stats_ptr = internal::MonitoringStats::instance().get_issuer_stats(issuer);
             }
 
             while (!result->m_done) {
                 auto timeout_val = result->get_timeout_val(expiry_time);
-                // Limit select to 50ms for periodic updates
+                // Limit select to 50ms for periodic checks
                 if (timeout_val.tv_sec > 0 || timeout_val.tv_usec > 50000) {
                     timeout_val.tv_sec = 0;
                     timeout_val.tv_usec = 50000;
@@ -510,14 +505,6 @@ class Validator {
                 select(result->get_max_fd() + 1, result->get_read_fd_set(),
                        result->get_write_fd_set(), result->get_exc_fd_set(),
                        &timeout_val);
-                       
-                // Update elapsed time periodically
-                if (stats_ptr) {
-                    auto current_time = std::chrono::steady_clock::now();
-                    auto duration = std::chrono::duration_cast<std::chrono::duration<double>>(
-                        current_time - start_time);
-                    stats_ptr->total_time_s = duration.count();
-                }
 
                 if (time(NULL) >= expiry_time) {
                     throw CurlException("Timeout when loading the OIDC metadata.");

src/scitokens_monitoring.cpp

@@ -16,25 +16,24 @@ MonitoringStats &MonitoringStats::instance() {
     return instance;
 }
 
-IssuerStats* MonitoringStats::get_issuer_stats(const std::string &issuer) {
-    std::lock_guard<std::mutex> lock(m_mutex);
-    return &m_issuer_stats[issuer];
-}
-
 void MonitoringStats::record_validation_success(const std::string &issuer,
                                                  double duration_s) {
     std::lock_guard<std::mutex> lock(m_mutex);
     auto &stats = m_issuer_stats[issuer];
     stats.successful_validations++;
-    stats.total_time_s = stats.total_time_s.load() + duration_s;
+    // Add to the total time (accumulate across all validations)
+    double current = stats.total_time_s.load();
+    stats.total_time_s.store(current + duration_s);
 }
 
 void MonitoringStats::record_validation_failure(const std::string &issuer,
                                                  double duration_s) {
     std::lock_guard<std::mutex> lock(m_mutex);
     auto &stats = m_issuer_stats[issuer];
     stats.unsuccessful_validations++;
-    stats.total_time_s = stats.total_time_s.load() + duration_s;
+    // Add to the total time (accumulate across all validations)
+    double current = stats.total_time_s.load();
+    stats.total_time_s.store(current + duration_s);
 }
 
 void MonitoringStats::record_expired_token(const std::string &issuer) {