Log update's CPU use (user and system time)

[empserver] / src / lib / update / main.c

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index e8a46bf181d02ea2df7faafffca2a8dfd098537d..7a656be1e5eed7dd01dda41beaab9d5d9327da42 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -31,11 +31,12 @@
  *     Dave Pare, 1994
  *     Steve McClure, 1996
  *     Doug Hay, 1998
- *     Markus Armbruster, 2006-2007
+ *     Markus Armbruster, 2006-2009
  */
 
 #include <config.h>
 
+#include <sys/resource.h>
 #include "budg.h"
 #include "empthread.h"
 #include "game.h"
@@ -56,14 +57,15 @@ void
 update_main(void)
 {
     int etu = etu_per_update;
+    struct rusage rus1, rus2;
     int n;
     int i;
     struct bp *bp;
-    int cn, cn2, rel;
-    struct natstr *cnp;
+    int cn;
     struct natstr *np;
 
     logerror("production update (%d etus)", etu);
+    getrusage(RUSAGE_SELF, &rus1);
     game_record_update(time(NULL));
     journal_update(etu);
 
@@ -107,9 +109,6 @@ update_main(void)
        if (!(np = getnatp(i)))
            continue;
        if (np->nat_stat == STAT_SANCT) {
-#ifdef DEBUG
-           logerror("Country %i is in sanctuary and did not update", i);
-#endif
            continue;
        }
        np->nat_money += (int)(np->nat_reserve * money_res * etu);
@@ -133,26 +132,7 @@ update_main(void)
     prod_nat(etu);
     age_levels(etu);
     free(bp);
-    if (opt_SLOW_WAR) {
-       /* Update war declarations */
-       /* MOBILIZATION->SITZKRIEG->AT_WAR */
-       for (cn = 1; cn < MAXNOC; cn++) {
-           if (!(cnp = getnatp(cn)))
-               break;
-           for (cn2 = 1; cn2 < MAXNOC; cn2++) {
-               if (cn2 == cn)
-                   continue;
-               rel = getrel(cnp, cn2);
-               if (rel == MOBILIZATION) {
-                   rel = SITZKRIEG;
-                   setrel(cn, cn2, rel);
-               } else if (rel == SITZKRIEG) {
-                   rel = AT_WAR;
-                   setrel(cn, cn2, rel);
-               }
-           }
-       }
-    }
+
     /* Only update mobility for non-MOB_ACCESS here, since it doesn't
        get done for MOB_ACCESS anyway during the update */
     if (!opt_MOB_ACCESS) {
@@ -177,5 +157,10 @@ update_main(void)
     /* Clear all the telegram flags */
     for (cn = 0; cn < MAXNOC; cn++)
        clear_telegram_is_new(cn);
-    logerror("End update");
+    getrusage(RUSAGE_SELF, &rus2);
+    logerror("End update %g user %g system",
+            rus2.ru_utime.tv_sec + rus2.ru_utime.tv_usec / 1e6
+            - (rus1.ru_utime.tv_sec + rus1.ru_utime.tv_usec / 1e6),
+            rus2.ru_stime.tv_sec + rus2.ru_stime.tv_usec / 1e6
+            - (rus1.ru_stime.tv_sec + rus1.ru_stime.tv_usec / 1e6));
 }