Update copyright notice

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

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index 60547d2a4b246d17219caa9b579f5aa2ac3493a3..ffc90411d8c31d555c5151b6c71796db57a2b4c4 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -31,40 +30,44 @@
  *     Dave Pare, 1994
  *     Steve McClure, 1996
  *     Doug Hay, 1998
- *     Markus Armbruster, 2006-2009
+ *     Markus Armbruster, 2006-2013
  */
 
 #include <config.h>
 
+#include <sys/resource.h>
 #include "budg.h"
 #include "empthread.h"
 #include "game.h"
 #include "journal.h"
-#include "player.h"
 #include "server.h"
 #include "unit.h"
 #include "update.h"
 
-long money[MAXNOC];
-long pops[MAXNOC];
-long sea_money[MAXNOC];
-long lnd_money[MAXNOC];
-long air_money[MAXNOC];
-long tpops[MAXNOC];
+int money[MAXNOC];
+int pops[MAXNOC];
+int sea_money[MAXNOC];
+int lnd_money[MAXNOC];
+int air_money[MAXNOC];
+int tpops[MAXNOC];
 
 void
 update_main(void)
 {
     int etu = etu_per_update;
+    struct rusage rus1, rus2;
     int n;
     int i;
     struct bp *bp;
-    int cn;
     struct natstr *np;
 
     logerror("production update (%d etus)", etu);
+    getrusage(RUSAGE_SELF, &rus1);
     game_record_update(time(NULL));
     journal_update(etu);
+    /* Ensure back-to-back production reports are separate: */
+    for (n = 0; n < MAXNOC; n++)
+       clear_telegram_is_new(n);
 
     /* First, make sure all mobility is updated correctly. */
     if (opt_MOB_ACCESS) {
@@ -100,7 +103,7 @@ update_main(void)
     logerror("done preparing sectors.");
     logerror("producing for countries...");
     for (i = 0; i < MAXNOC; i++) {
-       long p_sect[SCT_BUDG_MAX+1][2];
+       int p_sect[SCT_BUDG_MAX+1][2];
 
        memset(p_sect, 0, sizeof(p_sect));
        if (!(np = getnatp(i)))
@@ -151,8 +154,10 @@ update_main(void)
     delete_old_announcements();
     delete_old_news();
     delete_old_lostitems();
-    /* 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));
 }