merge forward changes from release-2-90xx

dcti · Nov 1, 2003 · e2ca70a · e2ca70a
1 parent 4d69f6c
commit e2ca70a
Show file tree

Hide file tree

Showing 152 changed files with 2,523 additions and 724 deletions.
diff --git a/common/base64.cpp b/common/base64.cpp
@@ -10,7 +10,7 @@
  *
 */ 
 const char *base64_cpp(void) {
-return "@(#)$Id: base64.cpp,v 1.10 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: base64.cpp,v 1.11 2003/11/01 14:20:12 mweiser Exp $"; }
 
 static const unsigned char base64table[64] = 
 {

diff --git a/common/base64.h b/common/base64.h
@@ -6,7 +6,7 @@
 */ 
 
 #ifndef __BASE64_H__
-#define __BASE64_H__ "@(#)$Id: base64.h,v 1.8 2003/09/12 22:29:25 mweiser Exp $"
+#define __BASE64_H__ "@(#)$Id: base64.h,v 1.9 2003/11/01 14:20:12 mweiser Exp $"
 
 /* 
   On success, both functions return the number of bytes in the outbuf (not 

diff --git a/common/baseincs.h b/common/baseincs.h
@@ -5,7 +5,7 @@
  * Any other distribution or use of this source violates copyright.
 */
 #ifndef __BASEINCS_H__
-#define __BASEINCS_H__ "@(#)$Id: baseincs.h,v 1.87 2003/09/12 22:29:25 mweiser Exp $"
+#define __BASEINCS_H__ "@(#)$Id: baseincs.h,v 1.88 2003/11/01 14:20:12 mweiser Exp $"
 
 #include "cputypes.h"
 
@@ -92,12 +92,9 @@
 #elif (CLIENT_OS == OS_VMS)
   #include <fcntl.h>
   #include <types.h>
-  #define unlink remove
-  #ifdef __VMS_UCX__
-    #include <netinet/in.h> //ntohl/htonl/ntohs/htons
-  #elif defined(MULTINET)
-    #include "multinet_root:[multinet.include.netinet]in.h"
-  #endif
+  #include <unistd.h>
+  #include <timers.h>
+  #include <in.h>
 #elif (CLIENT_OS == OS_SCO)
   #include <unistd.h>
   #include <fcntl.h>

diff --git a/common/bench.cpp b/common/bench.cpp
@@ -4,7 +4,7 @@
  * Any other distribution or use of this source violates copyright.
 */
 const char *bench_cpp(void) {
-return "@(#)$Id: bench.cpp,v 1.57 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: bench.cpp,v 1.58 2003/11/01 14:20:12 mweiser Exp $"; }
 
 //#define TRACE
 

diff --git a/common/bench.h b/common/bench.h
@@ -5,7 +5,7 @@
  * Any other distribution or use of this source violates copyright.
 */ 
 #ifndef __BENCH_H__
-#define __BENCH_H__ "@(#)$Id: bench.h,v 1.13 2003/09/12 22:29:25 mweiser Exp $"
+#define __BENCH_H__ "@(#)$Id: bench.h,v 1.14 2003/11/01 14:20:12 mweiser Exp $"
 
 /* returns "rate", or -1 if core error/^C, or 0 if not supported */
 long TBenchmark( unsigned int contestid, unsigned int numsecs, int flags );

diff --git a/common/buffbase.cpp b/common/buffbase.cpp
@@ -6,7 +6,7 @@
  * Created by Cyrus Patel <[email protected]>
 */
 const char *buffbase_cpp(void) {
-return "@(#)$Id: buffbase.cpp,v 1.37 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: buffbase.cpp,v 1.38 2003/11/01 14:20:12 mweiser Exp $"; }
 
 //#define TRACE
 //#define PROFILE_DISK_HITS

diff --git a/common/buffbase.h b/common/buffbase.h
@@ -10,7 +10,7 @@
  * ------------------------------------------------------------------
 */
 #ifndef __BUFFBASE_H__
-#define __BUFFBASE_H__ "@(#)$Id: buffbase.h,v 1.6 2003/09/12 22:29:25 mweiser Exp $"
+#define __BUFFBASE_H__ "@(#)$Id: buffbase.h,v 1.7 2003/11/01 14:20:12 mweiser Exp $"
 
 //efficiency hints/open mode modifiers
 #define BUFFER_FLAGS_NONE           (0x00) //regular local buffer

diff --git a/common/buffpub.cpp b/common/buffpub.cpp
@@ -9,7 +9,7 @@
 */
 
 const char *buffpub_cpp(void) {
-return "@(#)$Id: buffpub.cpp,v 1.7 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: buffpub.cpp,v 1.8 2003/11/01 14:20:12 mweiser Exp $"; }
 
 #include "cputypes.h"
 #include "client.h"   //client class

diff --git a/common/buffupd.h b/common/buffupd.h
@@ -5,7 +5,7 @@
  * Any other distribution or use of this source violates copyright.
 */ 
 #ifndef __BUFFUPD_H__
-#define __BUFFUPD_H__ "@(#)$Id: buffupd.h,v 1.13 2003/09/12 22:29:25 mweiser Exp $"
+#define __BUFFUPD_H__ "@(#)$Id: buffupd.h,v 1.14 2003/11/01 14:20:12 mweiser Exp $"
 
 // pass flags ORd with BUFFERUPDATE_FETCH/*_FLUSH. 
 // if interactive, prints "Input buffer full. No fetch required" etc.

diff --git a/common/ccoreio.h b/common/ccoreio.h
@@ -21,7 +21,7 @@
  *   of the problem object (ie created when the object is new'd) 
 */
 #ifndef __CCOREIO_H__
-#define __CCOREIO_H__ "@(#)$Id: ccoreio.h,v 1.14 2003/09/12 22:29:25 mweiser Exp $"
+#define __CCOREIO_H__ "@(#)$Id: ccoreio.h,v 1.15 2003/11/01 14:20:12 mweiser Exp $"
 
 #include "cputypes.h"   /* u32 etc. used here and in the cores */
 

diff --git a/common/checkpt.cpp b/common/checkpt.cpp
@@ -14,7 +14,7 @@
  * -----------------------------------------------------------------
 */
 const char *checkpt_cpp(void) {
-return "@(#)$Id: checkpt.cpp,v 1.22 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: checkpt.cpp,v 1.23 2003/11/01 14:20:12 mweiser Exp $"; }
 
 #include "client.h"   // FileHeader, Client class
 #include "baseincs.h" // memset(), strlen()

diff --git a/common/checkpt.h b/common/checkpt.h
@@ -5,7 +5,7 @@
  * Any other distribution or use of this source violates copyright.
 */ 
 #ifndef __CHECKPT_H__
-#define __CHECKPT_H__ "@(#)$Id: checkpt.h,v 1.9 2003/09/12 22:29:25 mweiser Exp $"
+#define __CHECKPT_H__ "@(#)$Id: checkpt.h,v 1.10 2003/11/01 14:20:12 mweiser Exp $"
 
 /* action flags */
 #define CHECKPOINT_REFRESH 0x00       /* save current to checkpoint */

diff --git a/common/clicdata.cpp b/common/clicdata.cpp
@@ -12,7 +12,7 @@
  * ----------------------------------------------------------------------
 */ 
 const char *clicdata_cpp(void) {
-return "@(#)$Id: clicdata.cpp,v 1.36 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: clicdata.cpp,v 1.37 2003/11/01 14:20:12 mweiser Exp $"; }
 
 //#define TRACE
 

diff --git a/common/clicdata.h b/common/clicdata.h
@@ -13,7 +13,7 @@
  * ----------------------------------------------------------------------
 */ 
 #ifndef __CLICDATA_H__
-#define __CLICDATA_H__ "@(#)$Id: clicdata.h,v 1.26 2003/09/12 22:29:25 mweiser Exp $"
+#define __CLICDATA_H__ "@(#)$Id: clicdata.h,v 1.27 2003/11/01 14:20:12 mweiser Exp $"
 
 // return 0 if contestID is invalid, non-zero if valid.
 int CliIsContestIDValid(int contestID);

diff --git a/common/client.cpp b/common/client.cpp
@@ -4,7 +4,7 @@
  * Any other distribution or use of this source violates copyright.
 */
 const char *client_cpp(void) {
-return "@(#)$Id: client.cpp,v 1.252 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: client.cpp,v 1.253 2003/11/01 14:20:13 mweiser Exp $"; }
 
 /* ------------------------------------------------------------------------ */
 

diff --git a/common/client.h b/common/client.h
@@ -5,7 +5,7 @@
  * Any other distribution or use of this source violates copyright.
 */
 #ifndef __CLIENT_H__
-#define __CLIENT_H__ "@(#)$Id: client.h,v 1.150 2003/09/12 22:29:25 mweiser Exp $"
+#define __CLIENT_H__ "@(#)$Id: client.h,v 1.151 2003/11/01 14:20:13 mweiser Exp $"
 
 #include "projdata.h" /* PROJECT_COUNT */
 #include "problem.h"  /* WorkRecord, CONTEST_COUNT */

diff --git a/common/clievent.cpp b/common/clievent.cpp
@@ -31,7 +31,7 @@
  * ----------------------------------------------------------------------
 */
 const char *clievent_cpp(void) {
-return "@(#)$Id: clievent.cpp,v 1.12 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: clievent.cpp,v 1.13 2003/11/01 14:20:13 mweiser Exp $"; }
 
 #include "baseincs.h"   /* NULL, memset */
 #include "clievent.h"   /* keep prototypes in sync */

diff --git a/common/clievent.h b/common/clievent.h
@@ -9,7 +9,7 @@
 */
 
 #ifndef __CLIEVENT_H__
-#define __CLIEVENT_H__ "@(#)$Id: clievent.h,v 1.14 2003/09/12 22:29:25 mweiser Exp $"
+#define __CLIEVENT_H__ "@(#)$Id: clievent.h,v 1.15 2003/11/01 14:20:13 mweiser Exp $"
 
                                               /* parm is ptr to... */
 #define CLIEVENT_CLIENT_STARTED        0x0001 /* ...client */

diff --git a/common/cliident.h b/common/cliident.h
@@ -5,7 +5,7 @@
  * Any other distribution or use of this source violates copyright.
 */ 
 #ifndef __CLIIDENT_H__
-#define __CLIIDENT_H__ "@(#)$Id: cliident.h,v 1.11 2003/09/12 22:29:25 mweiser Exp $"
+#define __CLIIDENT_H__ "@(#)$Id: cliident.h,v 1.12 2003/11/01 14:20:13 mweiser Exp $"
 
 extern void CliIdentifyModules(void);
 extern time_t CliGetNewestModuleTime(void);

diff --git a/common/clirun.cpp b/common/clirun.cpp
@@ -10,7 +10,7 @@
 //#define DYN_TIMESLICE_SHOWME
 
 const char *clirun_cpp(void) {
-return "@(#)$Id: clirun.cpp,v 1.130 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: clirun.cpp,v 1.131 2003/11/01 14:20:13 mweiser Exp $"; }
 
 #include "cputypes.h"  // CLIENT_OS, CLIENT_CPU
 #include "baseincs.h"  // basic (even if port-specific) #includes
@@ -271,6 +271,8 @@ static int __cruncher_yield__(struct thread_param_block *thrparams)
     NonPolledUSleep( 0 ); /* yield */
   #elif (CLIENT_OS == OS_SCO)
     NonPolledUSleep( 0 ); /* yield */
+  #elif (CLIENT_OS == OS_VMS)
+    NonPolledUSleep( 0 ); /* yield */
   #else
     #error where is your yield function?
     NonPolledUSleep( 0 ); /* yield */

diff --git a/common/clisync.h b/common/clisync.h
@@ -62,7 +62,7 @@
  */
 
 #ifndef __CLISYNC_H__
-#define __CLISYNC_H__ "@(#)$Id: clisync.h,v 1.4 2003/09/17 00:17:53 bdragon Exp $"
+#define __CLISYNC_H__ "@(#)$Id: clisync.h,v 1.5 2003/11/01 14:20:13 mweiser Exp $"
 
 #include "cputypes.h"           /* thread defines */
 #include "sleepdef.h"           /* NonPolledUSleep() */

diff --git a/common/clitime.cpp b/common/clitime.cpp
@@ -14,7 +14,7 @@
  * ----------------------------------------------------------------------
 */
 const char *clitime_cpp(void) {
-return "@(#)$Id: clitime.cpp,v 1.57 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: clitime.cpp,v 1.58 2003/11/01 14:20:13 mweiser Exp $"; }
 
 #include "cputypes.h"
 #include "baseincs.h"   /* for timeval, time, clock, sprintf, gettimeofday */
@@ -696,6 +696,14 @@ int CliGetMonotonicClock( struct timeval *tv )
       tv->tv_sec = ts.tv_sec;
       tv->tv_usec = ts.tv_nsec / 1000;
     }
+    #elif (CLIENT_OS == OS_VMS)
+    {
+      struct timespec ts;            /* OpenVMS only supports   */
+      if (getclock(TIMEOFDAY, &ts))  /* TIMEOFDAY for getclock, */
+        return -1;                   /* which is the number of  */
+      tv->tv_sec  = ts.tv_sec;       /* seconds since 00:00:00  */
+      tv->tv_usec = ts.tv_nsec / 1000; /* UTC on 1-Jan-1970.    */
+    }
     #elif 0
     {
       /* ***** this code is not thread-safe! ******

diff --git a/common/clitime.h b/common/clitime.h
@@ -10,7 +10,7 @@
  * ----------------------------------------------------------------------
 */ 
 #ifndef __CLITIME_H__
-#define __CLITIME_H__ "@(#)$Id: clitime.h,v 1.28 2003/09/12 22:29:25 mweiser Exp $"
+#define __CLITIME_H__ "@(#)$Id: clitime.h,v 1.29 2003/11/01 14:20:13 mweiser Exp $"
 
 #include "baseincs.h" /* struct timeval */
 

diff --git a/common/cmdline.cpp b/common/cmdline.cpp
@@ -15,7 +15,7 @@
  * -------------------------------------------------------------------
 */
 const char *cmdline_cpp(void) {
-return "@(#)$Id: cmdline.cpp,v 1.161 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: cmdline.cpp,v 1.162 2003/11/01 14:20:13 mweiser Exp $"; }
 
 //#define TRACE
 

diff --git a/common/cmdline.h b/common/cmdline.h
@@ -5,7 +5,7 @@
  * Any other distribution or use of this source violates copyright.
 */ 
 #ifndef __CMDLINE_H__
-#define __CMDLINE_H__ "@(#)$Id: cmdline.h,v 1.8 2003/09/12 22:29:25 mweiser Exp $"
+#define __CMDLINE_H__ "@(#)$Id: cmdline.h,v 1.9 2003/11/01 14:20:13 mweiser Exp $"
 
 // runlevel=0 = parse cmdline, >0==exec modes && print messages
 // returns !0 if app should be terminated; (retcodeP then has exit code)

diff --git a/common/confmenu.cpp b/common/confmenu.cpp
@@ -9,7 +9,7 @@
  * ---------------------------------------------------------------------
 */
 const char *confmenu_cpp(void) {
-return "@(#)$Id: confmenu.cpp,v 1.63 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: confmenu.cpp,v 1.64 2003/11/01 14:20:13 mweiser Exp $"; }
 
 /* ----------------------------------------------------------------------- */
 

diff --git a/common/confmenu.h b/common/confmenu.h
@@ -5,7 +5,7 @@
  * Any other distribution or use of this source violates copyright.
 */
 #ifndef __CONFMENU_H__
-#define __CONFMENU_H__ "@(#)$Id: confmenu.h,v 1.6 2003/09/12 22:29:25 mweiser Exp $"
+#define __CONFMENU_H__ "@(#)$Id: confmenu.h,v 1.7 2003/11/01 14:20:13 mweiser Exp $"
 
 /* returns <0=error, 0=exit+nosave, >0=exit+save */
 int Configure( Client *sample_client, int nottycheck ); 

diff --git a/common/confopt.cpp b/common/confopt.cpp
@@ -4,7 +4,7 @@
  * Any other distribution or use of this source violates copyright.
 */
 const char *confopt_cpp(void) {
-return "@(#)$Id: confopt.cpp,v 1.52 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: confopt.cpp,v 1.53 2003/11/01 14:20:13 mweiser Exp $"; }
 
 /* ----------------------------------------------------------------------- */
 
@@ -629,7 +629,6 @@ struct optionstruct conf_options[CONF_OPTION_COUNT] = {
   "             in the \"Log file limit\" option is reached.\n"
   "3) fifo      the oldest lines in the file will be discarded when the size\n"
   "             of the file exceeds the limit in the \"Log file limit\" option.\n"
-  "             This option is not supported on VMS.\n"
   "4) rotate    a new file will be created when the rotation interval specified\n"
   "             in the \"Log file limit\" option is exceeded.\n"
   ),CONF_MENU_LOG,CONF_TYPE_INT,NULL,NULL /*logtypes[]*/,0,0,NULL,NULL

diff --git a/common/confopt.h b/common/confopt.h
@@ -6,7 +6,7 @@
 */ 
 
 #ifndef __CONFOPT_H__
-#define __CONFOPT_H__ "@(#)$Id: confopt.h,v 1.25 2003/09/12 22:29:25 mweiser Exp $"
+#define __CONFOPT_H__ "@(#)$Id: confopt.h,v 1.26 2003/11/01 14:20:13 mweiser Exp $"
 
 enum /* anonymous */
 {

diff --git a/common/confrwv.cpp b/common/confrwv.cpp
@@ -6,7 +6,7 @@
  * Written by Cyrus Patel <[email protected]>
 */
 const char *confrwv_cpp(void) {
-return "@(#)$Id: confrwv.cpp,v 1.93 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: confrwv.cpp,v 1.94 2003/11/01 14:20:13 mweiser Exp $"; }
 
 //#define TRACE
 

diff --git a/common/confrwv.h b/common/confrwv.h
@@ -6,7 +6,7 @@
 */
 
 #ifndef __CONFRWV_H__
-#define __CONFRWV_H__ "@(#)$Id: confrwv.h,v 1.17 2003/09/12 22:29:25 mweiser Exp $"
+#define __CONFRWV_H__ "@(#)$Id: confrwv.h,v 1.18 2003/11/01 14:20:13 mweiser Exp $"
 
 int  ConfigRead(Client *client);
 int  ConfigWrite(Client *client);

diff --git a/common/console.cpp b/common/console.cpp
@@ -14,7 +14,7 @@
  * ----------------------------------------------------------------------
 */
 const char *console_cpp(void) {
-return "@(#)$Id: console.cpp,v 1.76 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: console.cpp,v 1.77 2003/11/01 14:20:13 mweiser Exp $"; }
 
 /* -------------------------------------------------------------------- */
 
@@ -361,6 +361,13 @@ int ConInKey(int timeout_millisecs) /* Returns -1 if err. 0 if timed out. */
         fflush(stdout);
         ch = getch();
       }
+      #elif (CLIENT_OS == OS_VMS)
+      {
+        fflush(stdout);       /* OpenVMS doesn't support select() */
+        ch = getchar();       /* for non-socket devices such as   */
+        if (ch == EOF)        /* stdin.  Use getchar() instead.   */
+          ch = 0;
+      }
       #elif (defined(HAVE_TERMIOS))
       {
         struct termios stored;

diff --git a/common/console.h b/common/console.h
@@ -5,7 +5,7 @@
  * Any other distribution or use of this source violates copyright.
 */ 
 #ifndef __CONSOLE_H__
-#define __CONSOLE_H__ "@(#)$Id: console.h,v 1.34 2003/09/12 22:29:25 mweiser Exp $"
+#define __CONSOLE_H__ "@(#)$Id: console.h,v 1.35 2003/11/01 14:20:13 mweiser Exp $"
 
 // ConIsScreen() returns non-zero if console represents the screen
 // also returns 0 if the console is not initialized.

diff --git a/common/convdes.cpp b/common/convdes.cpp
@@ -5,7 +5,7 @@
  *
 */ 
 const char *convdes_cpp(void) {
-return "@(#)$Id: convdes.cpp,v 1.15 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: convdes.cpp,v 1.16 2003/11/01 14:20:13 mweiser Exp $"; }
 
 /* DES convertion routines */
 

diff --git a/common/convdes.h b/common/convdes.h
@@ -10,7 +10,7 @@
  * ---------------------------------------------------------------
 */ 
 #ifndef __CONVDES_H__
-#define __CONVDES_H__ "@(#)$Id: convdes.h,v 1.10 2003/09/12 22:29:25 mweiser Exp $"
+#define __CONVDES_H__ "@(#)$Id: convdes.h,v 1.11 2003/11/01 14:20:13 mweiser Exp $"
 
 // odd_parity[n] = (n & 0xFE) | b
 // b set so that odd_parity[n] has an odd number of bits

diff --git a/common/coremem.cpp b/common/coremem.cpp
@@ -9,7 +9,7 @@
  * Created March 2001 by Cyrus Patel <[email protected]>
 */
 const char *probmem_cpp(void) {
-return "@(#)$Id: coremem.cpp,v 1.3 2003/09/12 22:29:25 mweiser Exp $"; }
+return "@(#)$Id: coremem.cpp,v 1.4 2003/11/01 14:20:13 mweiser Exp $"; }
 
 //#define TRACE
 

diff --git a/common/coremem.h b/common/coremem.h
@@ -12,7 +12,7 @@
 */
 
 #ifndef __COREMEM_H__
-#define __COREMEM_H__ "@(#)$Id: coremem.h,v 1.3 2003/09/12 22:29:25 mweiser Exp $"
+#define __COREMEM_H__ "@(#)$Id: coremem.h,v 1.4 2003/11/01 14:20:13 mweiser Exp $"
 
 #ifdef __cplusplus /* header may be included by cores */
 extern "C" {