intermediate work on C++ compile (resolves compile bugs in current public stuff)

.gitignore

@@ -440,3 +440,10 @@ src/tools/test/printjob/test_printjob
 src/tools/test/printserverdb/test_printserverdb
 src/tools/test/printtracking/test_printtracking
 src/tools/test/tracejob/test_tracejob
+.project
+.cproject
+cscope.out
+*.orig
+*.rej
+*.patch
+coverage_results.file

configure.ac

@@ -69,13 +69,16 @@ dnl  be created in the include directory.
 AM_CONFIG_HEADER([src/include/pbs_config.h])
 
 dnl
-dnl Find our svn revision number for program outputs
+dnl Find our git revision hash for program outputs
 dnl
-AC_PATH_PROG(svnversioncommand, svnversion)
-if test "X$svnversioncommand" != "X" && test `$svnversioncommand -n '.'` != "exported"; then
-  AC_DEFINE_UNQUOTED(SVN_VERSION, ["`svnversion -n`"], [repository svn version])
+githash="`git rev-parse HEAD`"
+success=$?
+if test "X$success" != "X0" ; then
+  AC_DEFINE_UNQUOTED(GIT_HASH, ["$githash"], [repository svn version])
 else
-  AC_DEFINE_UNQUOTED(SVN_VERSION, ["unknown"], [repository svn version])
+  dnl current hash is a file checked in to the git repo in the base directory
+  dnl containing the most recent hash
+  AC_DEFINE_UNQUOTED(GIT_HASH, ["`cat current_hash`"], [repository svn version])
 fi
 
 

current_hash

@@ -0,0 +1 @@
+39f78e588b3a47a6c7bed1004ec7b5d0ccf24288

parse_cov_results.py

@@ -3,17 +3,22 @@
 import sys
 import getopt
 import re
+import os
 
 # re patterns for the following line: 
 #     TOTALCOV -- '../../MConfig.c': Lines(1020) - executed:1.37%
 #
 line_prog = re.compile(".*TOTALCOV -- '\.\./\.\./(.*)': Lines\(([0-9]+)\)- executed:(.+)%.*")
+count_pat = re.compile(r'.*[fF]ailures?:\s*(\d+),\s*[eE]rrors?: (\d+)')
+loc_pat = re.compile(r"Entering directory `(.*)'$")
 
 # Given file name, open and parse it, expecting output generated by 'gcov' coverage tool
 # argument:  file path to gcov output file
 # argument:  Diction to store results from the file
 def process_file(file, report):
+    root = ''
     if (file != None):
+        root = os.path.dirname(os.path.abspath(file))
         try:
             input = open(file, 'r', 1)
         except IOError as (errno, strerror):
@@ -31,11 +36,28 @@ def process_file(file, report):
     #
     # Remember the file name until we encounter its corresponding 'Lines executed' line
     # When we get both, add to the Dictionary and reset the file name
+    errors_written = False
     filename = None
     for line in input.readlines():
         result = line_prog.search(line)
         if result != None:
             report[result.group(1)] = [result.group(3), result.group(2)]
+        else:
+            m = loc_pat.search(line)
+            if m:
+                filename = m.group(1)
+                if root:
+                    filename = filename[len(root) + 1:]
+            else:
+                m = count_pat.search(line)
+                if m:
+                    if int(m.group(1)) or int(m.group(2)):
+                        if not errors_written:
+                            sys.stderr.write('\nSOME TESTS DID NOT PASS.\n\n')
+                            errors_written = True
+                        sys.stderr.write('%s\n  %s\n' % (filename, line.rstrip()))
+    if errors_written:
+        sys.stderr.write('\n')
 
     input.close()
 

src/cmds/pbsnodes.c

@@ -712,7 +712,7 @@ int main(
         if ((optarg != NULL) && !strcmp(optarg, "version"))
           {
           fprintf(stderr, "Version: %s\nRevision: %s\n",
-            PACKAGE_VERSION, SVN_VERSION);
+            PACKAGE_VERSION, GIT_HASH);
 
           exit(0);
           }

src/cmds/qstat.c

@@ -2207,7 +2207,7 @@ int main(
         if ((optarg != NULL) && !strcmp(optarg, "version"))
           {
           fprintf(stderr, "Version: %s\nRevision: %s\n",
-            PACKAGE_VERSION, SVN_VERSION);
+            PACKAGE_VERSION, GIT_HASH);
 
           exit(0);
           }

src/cmds/qsub_functions.c

@@ -4043,7 +4043,7 @@ void process_early_opts(
         TShowAbout_exit();
       else if (strcmp(name, "version") == 0)
         {
-        fprintf(stderr, "version: %s\n", PACKAGE_VERSION);
+        fprintf(stderr, "Version: %s\nRevision: %s\n", PACKAGE_VERSION, GIT_HASH);
         exit(0);
         }
       }

src/cmds/test/qsub_functions/scaffolding.c

@@ -65,7 +65,7 @@ int locate_job(char *job_id, char *parent_server, char *located_server)
   exit(1);
   }
 
-void port_forwarder( struct pfwdsock *socks, int (*connfunc)(char *, int, char *), char *phost, int pport, char *EMsg) 
+void port_forwarder( struct pfwdsock *socks, int (*connfunc)(char *, long, char *), char *phost, int pport, char *EMsg)
   {
   fprintf(stderr, "The call to port_forwarder to be mocked!!\n");
   exit(1);
@@ -77,7 +77,7 @@ int cnt2server(char *SpecServer)
   exit(1);
   }
 
-int x11_connect_display( char *display, int alsounused, char *EMsg) 
+int x11_connect_display( char *display, long alsounused, char *EMsg)
   {
   fprintf(stderr, "The call to x11_connect_display to be mocked!!\n");
   exit(1);

src/daemon_client/trq_auth_daemon.c

@@ -164,7 +164,7 @@ int daemonize_trqauthd(char *server_ip, int server_port, void *(*process_meth)(v
       {
          openlog("daemonize_trqauthd", LOG_PID | LOG_NOWAIT, LOG_DAEMON);
          syslog(LOG_ALERT, "Failed to create client_logs directory: errno: %d", errno);
-         log_err(errno,"daemonize_trqauthd", (char *)"Failed to create client_logs directory");
+         log_err(errno,"daemonize_trqauthd", "Failed to create client_logs directory");
          closelog();
       }
     pthread_mutex_lock(log_mutex);

src/include/attribute.h

@@ -209,10 +209,10 @@ typedef struct pbs_attribute pbs_attribute;
 
 struct attribute_def
   {
-  char *at_name;
-  int (*at_decode)(pbs_attribute *patr, char *name, char *rn, char *val, int perm);
+  const char *at_name;
+  int (*at_decode)(pbs_attribute *patr, const char *name, char *rn, char *val, int perm);
   int (*at_encode)(pbs_attribute *pattr, tlist_head *phead,
-                      char *aname, char *rsname, int mode, int perm);
+                      const char *aname, const char *rsname, int mode, int perm);
   int (*at_set)(pbs_attribute *pattr, pbs_attribute *new_attr, enum batch_op);
   int (*at_comp)(pbs_attribute *pattr, pbs_attribute *with);
   void (*at_free)(pbs_attribute *pattr);
@@ -343,7 +343,7 @@ extern long attr_ifelse_long(pbs_attribute *, pbs_attribute *, long);
 extern void free_null(pbs_attribute *attr);
 extern void free_noop(pbs_attribute *attr);
 extern svrattrl *attrlist_alloc(int szname, int szresc, int szval);
-extern svrattrl *attrlist_create(char *aname, char *rname, int szval);
+extern svrattrl *attrlist_create(const char *aname, const char *rname, int szval);
 extern void free_attrlist(tlist_head *attrhead);
 extern int  attr_atomic_set(svrattrl *plist, pbs_attribute *old,
                                   pbs_attribute *new_attr, attribute_def *pdef, int limit,
@@ -353,51 +353,51 @@ extern int  attr_atomic_node_set(svrattrl *plist, pbs_attribute *old,
                                        int unkn, int privil, int *badattr);
 extern void attr_atomic_kill(pbs_attribute *temp, attribute_def *pdef, int);
 
-int  decode_b(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_c(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_l(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_ll(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_size(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_str(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_time(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_arst(pbs_attribute *patr, char *name, char *rn, char *val, int);
+int  decode_b(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_c(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_l(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_ll(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_size(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_str(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_time(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_arst(pbs_attribute *patr, const char *name, char *rn, char *val, int);
 int  decode_arst_direct(pbs_attribute *patr, char *val);
-int  decode_arst_merge(pbs_attribute *,char *,char *,char *);
-int  decode_resc(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_depend(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_hold(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_uacl(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_unkn(pbs_attribute *patr, char *name, char *rn, char *val, int);
-int  decode_tv(pbs_attribute *patr, char *name,  char *rescn,	char *val, int);
+int  decode_arst_merge(pbs_attribute *,const char *,char *,char *);
+int  decode_resc(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_depend(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_hold(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_uacl(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_unkn(pbs_attribute *patr, const char *name, char *rn, char *val, int);
+int  decode_tv(pbs_attribute *patr, const char *name,  char *rescn,	char *val, int);
 
-int  encode_b(pbs_attribute *attr, tlist_head *phead, char *atname,
-                           char *rsname, int mode, int perm);
-int  encode_c(pbs_attribute *attr, tlist_head *phead, char *atname,
-                           char *rsname, int mode, int perm);
-int encode_l(pbs_attribute *attr, tlist_head *phead, char *atname,
-                           char *rsname, int mode, int perm);
-int encode_ll(pbs_attribute *attr, tlist_head *phead, char *atname,
-                           char *rsname, int mode, int perm);
-int encode_size(pbs_attribute *attr, tlist_head *phead, char *atname,
-                              char *rsname, int mode, int perm);
-int encode_str(pbs_attribute *attr, tlist_head *phead, char *atname,
-                             char *rsname, int mode, int perm);
-int encode_time(pbs_attribute *attr, tlist_head *phead, char *atname,
-                             char *rsname, int mode, int perm);
-int encode_arst(pbs_attribute *attr, tlist_head *phead, char *atname,
-                             char *rsname, int mode, int perm);
-int encode_resc(pbs_attribute *attr, tlist_head *phead, char *atname,
-                             char *rsname, int mode, int perm);
-int encode_inter(pbs_attribute *attr, tlist_head *phead, char *atname,
-                              char *rsname, int mode, int perm);
-int encode_unkn(pbs_attribute *attr, tlist_head *phead, char *atname,
-                             char *rsname, int mode, int perm);
-int encode_depend(pbs_attribute *attr, tlist_head *phead, char *atname,
-                               char *rsname, int mode, int perm);
-int encode_hold(pbs_attribute *attr, tlist_head *phead, char *atname,
-                             char *rsname, int mode, int perm);
-int encode_tv(pbs_attribute *attr, tlist_head *phead, char *atname,
-							char *rsname, int mode, int perm);
+int encode_b(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                           const char *rsname, int mode, int perm);
+int encode_c(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                           const char *rsname, int mode, int perm);
+int encode_l(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                           const char *rsname, int mode, int perm);
+int encode_ll(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                           const char *rsname, int mode, int perm);
+int encode_size(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                              const char *rsname, int mode, int perm);
+int encode_str(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                             const char *rsname, int mode, int perm);
+int encode_time(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                             const char *rsname, int mode, int perm);
+int encode_arst(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                             const char *rsname, int mode, int perm);
+int encode_resc(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                             const char *rsname, int mode, int perm);
+int encode_inter(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                              const char *rsname, int mode, int perm);
+int encode_unkn(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                             const char *rsname, int mode, int perm);
+int encode_depend(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                               const char *rsname, int mode, int perm);
+int encode_hold(pbs_attribute *attr, tlist_head *phead, const char *atname,
+                             const char *rsname, int mode, int perm);
+int encode_tv(pbs_attribute *attr, tlist_head *phead, const char *atname,
+							const char *rsname, int mode, int perm);
 
 
 extern int set_b(pbs_attribute *attr, pbs_attribute *new_attr, enum batch_op);
@@ -447,25 +447,25 @@ struct dynamic_string;
 
 extern int   acl_check(pbs_attribute *, char *canidate, int type);
 int          acl_check_my_array_string(struct array_strings *, char *, int);
-extern char *arst_string(char *str, pbs_attribute *pattr);
+extern char *arst_string(const char *str, pbs_attribute *pattr);
 extern void  attrl_fixlink(tlist_head *svrattrl);
-extern void  recov_acl(pbs_attribute *, attribute_def *, char *, char *);
-extern int   save_acl(pbs_attribute *, attribute_def *,  char *, char *);
+extern void  recov_acl(pbs_attribute *, attribute_def *, const char *, const char *);
+extern int   save_acl(pbs_attribute *, attribute_def *,  const char *, const char *);
 extern int   save_attr(attribute_def *, pbs_attribute *, int, int, char *, size_t *, size_t);
 extern int   save_attr_xml(attribute_def *, pbs_attribute *, int, int);
 extern int   write_buffer(char *,int,int);
 extern int   size_to_str(struct size_value,char *,int);
 extern int   attr_to_str(struct dynamic_string *ds, attribute_def *,struct pbs_attribute,int);
 extern int   str_to_attr(char *,char *,struct pbs_attribute *,struct attribute_def *);
 
-extern int      encode_state(pbs_attribute *, tlist_head *, char *, char *, int, int);
-extern int      encode_props(pbs_attribute*, tlist_head*, char*, char*, int, int);
-extern int      encode_jobs(pbs_attribute*, tlist_head*, char*, char*, int, int);
-extern int      encode_ntype(pbs_attribute*, tlist_head*, char*, char*, int, int);
-extern int      decode_state(pbs_attribute*, char*, char*, char*, int);
-extern int      decode_props(pbs_attribute*, char*, char*, char*, int);
-extern int      decode_ntype(pbs_attribute*, char*, char*, char*, int);
-extern int      decode_null(pbs_attribute*, char*, char*, char*, int);
+extern int      encode_state(pbs_attribute *, tlist_head *, const char *, const char *, int, int);
+extern int      encode_props(pbs_attribute*, tlist_head*, const char*, const char*, int, int);
+extern int      encode_jobs(pbs_attribute*, tlist_head*, const char*, const char*, int, int);
+extern int      encode_ntype(pbs_attribute*, tlist_head*, const char*, const char*, int, int);
+extern int      decode_state(pbs_attribute*, const char*, char*, char*, int);
+extern int      decode_props(pbs_attribute*, const char*, char*, char*, int);
+extern int      decode_ntype(pbs_attribute*, const char*, char*, char*, int);
+extern int      decode_null(pbs_attribute*, const char*, char*, char*, int);
 extern int      comp_null(pbs_attribute*, pbs_attribute*);
 extern int      count_substrings(char*, int*);
 extern int      set_node_state(pbs_attribute*, pbs_attribute*, enum batch_op);
@@ -495,7 +495,7 @@ extern int 		job_radix_action (pbs_attribute *new_attr, void *pobj, int actmode)
 
 /* Token manipulation functions */
 
-extern int  decode_tokens(pbs_attribute *, char *, char *, char *, int);
+extern int  decode_tokens(pbs_attribute *, const char *, char *, char *, int);
 
 int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
 

src/include/batch_request.h

@@ -410,7 +410,7 @@ extern batch_request_holder brh;
 
 batch_request *alloc_br (int type);
 extern void    reply_ack (struct batch_request *);
-extern void    req_reject (int code, int aux, struct batch_request *, char *, char *);
+extern void    req_reject (int code, int aux, struct batch_request *, const char *, const char *);
 extern void    reply_badattr (int code, int aux, svrattrl *, struct batch_request *);
 extern void    reply_text (struct batch_request *, int code, char *text);
 extern int     reply_jobid (struct batch_request *, char *, int);

src/include/cmds.h

@@ -124,7 +124,7 @@ int parse_equal_string(char *, char **, char **);
 int parse_jobid(char *, char **, char **, char **);
 int prepare_path(char *, char*,char *);
 void prt_error(char *, char *, int);
-void set_attr(struct attrl **, char *, char *);
+void set_attr(struct attrl **, const char *, const char *);
 int set_resources(struct attrl **, char *, int);
 int cnt2server(char *server);
 void prt_job_err(char *, int, char *);

src/include/csv.h

@@ -7,8 +7,8 @@
 
 extern int csv_length(char *csv_str);
 extern char *csv_nth(char *csv_str, int n);
-extern char *csv_find_string(char *csv_str, char *search_str);
-extern char *csv_find_value(char *csv_str, char *search_str);
+extern char *csv_find_string(char *csv_str, const char *search_str);
+extern char *csv_find_value(char *csv_str, const char *search_str);
 /* Note that csv_nth returns a pointer to a static buffer */
 
 

src/include/mom_func.h

@@ -103,8 +103,8 @@ struct var_table
 
 struct sig_tbl
   {
-  char *sig_name;
-  int   sig_val;
+  const char *sig_name;
+  int          sig_val;
   };
 
 #define NUM_LCL_ENV_VAR  10
@@ -198,13 +198,13 @@ extern void  post_resume(job *, int);
 
 #endif /* _CRAY */
 
-extern void  bld_env_variables(struct var_table *, char *, char *);
+extern void  bld_env_variables(struct var_table *, const char *, const char *);
 extern int   expand_path(job *,char *,int,char *);
 extern pid_t fork_me(int sock);
 extern int   get_la(double *);
 extern void  init_abort_jobs(int);
 extern int   init_groups(char *, int, int, int *);
-int   kill_job(job *, int sig, const char *killer_id_name, char *why_killed_reason);
+int   kill_job(job *, int sig, const char *killer_id_name, const char *why_killed_reason);
 extern void  mom_deljob(job *);
 extern void  mom_freenodes(job *);
 extern void  scan_for_exiting();
@@ -242,7 +242,7 @@ extern struct passwd *check_pwd(job *);
 extern int   task_save(task *) ;
 extern void  DIS_rpp_reset(void);
 extern void  checkret(char **, long);
-extern char *get_job_envvar(job *, char *);
+extern char *get_job_envvar(job *, const char *);
 extern int   mom_open_socket_to_jobs_server(job* pjob, const char *id, void *(*message_hander)(void *));
 void         clear_servers();
 

src/include/net_connect.h

@@ -200,7 +200,7 @@ int  get_connecthost(int sock, char *, int);
 void set_localhost_name(char *, size_t);
 pbs_net_t get_hostaddr(int *, char *);
 int  get_fullhostname(char *, char *, int, char *);
-unsigned int  get_svrport(char *, char *, unsigned int);
+unsigned int  get_svrport(const char *, const char *, unsigned int);
 int  init_network(unsigned int, void *(*readfunc)(void *));
 void net_close(int);
 int  wait_request(time_t waittime, long *);

src/include/pbs_ifl.h

@@ -691,7 +691,7 @@ char *trq_get_if_name(void);
 /* used by Moab */
 int closerm(int);
 char *getreq(int);
-unsigned int get_svrport(char *, char *, unsigned int);
+unsigned int get_svrport(const char *, const char *, unsigned int);
 int openrm(char *, unsigned int);
 int addreq(int, char *);
 int pbs_stagein(int, char *, char *, char *);