From c53fe0857c999d45d8cce424ba84f65a02ab473b Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Wed, 31 Dec 2008 04:21:03 +0000
Subject: [PATCH] Don't parse the same conf file twice in a row.

---
 xwords4/relay/configs.cpp | 99 +++++++++++++++++++++------------------
 xwords4/relay/configs.h   |  7 ++-
 2 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/xwords4/relay/configs.cpp b/xwords4/relay/configs.cpp
index d0779ec61..3c10a07d5 100644
--- a/xwords4/relay/configs.cpp
+++ b/xwords4/relay/configs.cpp
@@ -58,9 +58,9 @@ RelayConfigs::RelayConfigs( const char* cfile )
     /* There's an order here.  Open multiple files, if present.  File in /etc
        is first, but overridden by local file which is in turn overridden by
        file passed in. */
-    parse( "/etc/xwrelay/xwrelay.conf" );
-    parse( "./xwrelay.conf" );
-    parse( cfile );
+    ino_t prev = parse( "/etc/xwrelay/xwrelay.conf", 0 );
+    prev = parse( "./xwrelay.conf", prev );
+    (void)parse( cfile, prev );
 } /* RelayConfigs::RelayConfigs */
 
 void
@@ -70,58 +70,65 @@ RelayConfigs::GetPorts( std::vector<int>::const_iterator* iter, std::vector<int>
     *end = m_ports.end();
 }
 
-void
-RelayConfigs::parse( const char* fname )
+ino_t
+RelayConfigs::parse( const char* fname, ino_t prev )
 {
+    ino_t inode = 0;
     if ( fname != NULL ) {
-        FILE* f = fopen( fname, "r" );
-        if ( f != NULL ) {
-            logf( XW_LOGINFO, "config: reading from %s", fname );
-            char line[MAX_LINE];
+        struct stat sbuf;
+        stat( fname, &sbuf );
+        inode = sbuf.st_ino;
+        if ( inode != prev ) {
+            FILE* f = fopen( fname, "r" );
+            if ( f != NULL ) {
+                logf( XW_LOGINFO, "config: reading from %s", fname );
+                char line[MAX_LINE];
 
-            for ( ; ; ) {
-                if ( !fgets( line, sizeof(line), f ) ) {
-                    break;
-                }
+                for ( ; ; ) {
+                    if ( !fgets( line, sizeof(line), f ) ) {
+                        break;
+                    }
 
-                int len = strlen( line );
-                if ( line[len-1] == '\n' ) {
-                    line[--len] = '\0';
-                }
+                    int len = strlen( line );
+                    if ( line[len-1] == '\n' ) {
+                        line[--len] = '\0';
+                    }
 
-                if ( len == 0 || line[0] == '#' ) {
-                    continue;
-                }
+                    if ( len == 0 || line[0] == '#' ) {
+                        continue;
+                    }
 
-                char* value = strchr( line, '=' );
-                if ( value == NULL ) {
-                    continue;
-                }
+                    char* value = strchr( line, '=' );
+                    if ( value == NULL ) {
+                        continue;
+                    }
 
-                *value++ = '\0';    /* terminate "key" substring */
-                if ( 0 == strcmp( line, "HEARTBEAT" ) ) {
-                    m_heartbeatInterval = atoi( value );
-                } else if ( 0 == strcmp( line, "ALLCONN" ) ) {
-                    m_allConnInterval = atoi( value );
-                } else if ( 0 == strcmp( line, "CTLPORT" ) ) {
-                    m_ctrlport = atoi( value );
-                } else if ( 0 == strcmp( line, "PORT" ) ) {
-                    m_ports.push_back( atoi( value ) );
-                } else if ( 0 == strcmp( line, "NTHREADS" ) ) {
-                    m_nWorkerThreads = atoi( value );
-                } else if ( 0 == strcmp( line, "SERVERNAME" ) ) {
-                    m_serverName = value;
-                } else if ( 0 == strcmp( line, "IDFILE" ) ) {
-                    m_idFileName = value;
-                } else if ( 0 == strcmp( line, "LOGLEVEL" ) ) {
-                    m_logLevel = atoi(value);
-                } else {
-                    logf( XW_LOGERROR, "unknown key %s with value %s\n",
-                          line, value );
-                    assert( 0 );
+                    *value++ = '\0';    /* terminate "key" substring */
+                    if ( 0 == strcmp( line, "HEARTBEAT" ) ) {
+                        m_heartbeatInterval = atoi( value );
+                    } else if ( 0 == strcmp( line, "ALLCONN" ) ) {
+                        m_allConnInterval = atoi( value );
+                    } else if ( 0 == strcmp( line, "CTLPORT" ) ) {
+                        m_ctrlport = atoi( value );
+                    } else if ( 0 == strcmp( line, "PORT" ) ) {
+                        m_ports.push_back( atoi( value ) );
+                    } else if ( 0 == strcmp( line, "NTHREADS" ) ) {
+                        m_nWorkerThreads = atoi( value );
+                    } else if ( 0 == strcmp( line, "SERVERNAME" ) ) {
+                        m_serverName = value;
+                    } else if ( 0 == strcmp( line, "IDFILE" ) ) {
+                        m_idFileName = value;
+                    } else if ( 0 == strcmp( line, "LOGLEVEL" ) ) {
+                        m_logLevel = atoi(value);
+                    } else {
+                        logf( XW_LOGERROR, "unknown key %s with value %s\n",
+                              line, value );
+                        assert( 0 );
+                    }
                 }
+                fclose( f );
             }
-            fclose( f );
         }
     }
+    return inode;
 } /* parse */
diff --git a/xwords4/relay/configs.h b/xwords4/relay/configs.h
index 864a5c1b9..203544cd4 100644
--- a/xwords4/relay/configs.h
+++ b/xwords4/relay/configs.h
@@ -21,8 +21,13 @@
 #ifndef _CONFIGS_H_
 #define _CONFIGS_H_
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include <string>
 #include <vector>
+
 #include "xwrelay_priv.h"
 
 using namespace std;
@@ -47,7 +52,7 @@ class RelayConfigs {
 
  private:
     RelayConfigs( const char* cfile );
-    void parse( const char* fname );
+    ino_t parse( const char* fname, ino_t prev );
 
     time_t m_allConnInterval;
     time_t m_heartbeatInterval;