diff -ru ../torque-2.5.8-snap.201108291517.orig/src/cmds/qsub.c ./src/cmds/qsub.c --- ../torque-2.5.8-snap.201108291517.orig/src/cmds/qsub.c 2011-08-14 07:11:28.000000000 +0200 +++ ./src/cmds/qsub.c 2011-08-29 23:56:24.318696840 +0200 @@ -2975,13 +2975,13 @@ { /* NOTE: mothballed, server can be specified via '-q' */ - int PBSPort; + /* int PBSPort; */ /* FORMAT: --port=X */ - ptr = optarg + strlen("port="); + /* ptr = optarg + strlen("port="); - PBSPort = (int)strtol(ptr, NULL, 0); + PBSPort = (int)strtol(ptr, NULL, 0);*/ } else { diff -ru ../torque-2.5.8-snap.201108291517.orig/src/iff/iff2.c ./src/iff/iff2.c --- ../torque-2.5.8-snap.201108291517.orig/src/iff/iff2.c 2010-08-21 00:39:30.000000000 +0200 +++ ./src/iff/iff2.c 2011-08-29 23:55:23.218075238 +0200 @@ -150,15 +150,8 @@ char *ptr; - int PBSLOGLEVEL = 0; - strcpy(pbs_current_user, "PBS_Server"); - if ((ptr = getenv("PBSLOGLEVEL")) != NULL) - { - PBSLOGLEVEL = (int)strtol(ptr, NULL, 10); - } - /* Need to unset LOCALDOMAIN if set, want local host name */ for (i = 0;envp[i];++i) diff -ru ../torque-2.5.8-snap.201108291517.orig/src/lib/Libnet/net_client.c ./src/lib/Libnet/net_client.c --- ../torque-2.5.8-snap.201108291517.orig/src/lib/Libnet/net_client.c 2011-02-23 20:14:59.000000000 +0100 +++ ./src/lib/Libnet/net_client.c 2011-08-29 23:40:15.568246756 +0200 @@ -178,8 +178,6 @@ { int n, val, rc; - int MaxNumDescriptors = 0; - fd_set *BigFDSet = NULL; struct timeval tv; @@ -197,8 +195,6 @@ /* calculate needed size for fd_set in select() */ - MaxNumDescriptors = get_max_num_descriptors(); - BigFDSet = (fd_set *)calloc(1,sizeof(char) * get_fdset_size()); FD_SET(sockd, BigFDSet); diff -ru ../torque-2.5.8-snap.201108291517.orig/src/lib/Libnet/rm.c ./src/lib/Libnet/rm.c --- ../torque-2.5.8-snap.201108291517.orig/src/lib/Libnet/rm.c 2010-07-20 19:57:37.000000000 +0200 +++ ./src/lib/Libnet/rm.c 2011-08-29 23:42:04.826208931 +0200 @@ -1045,6 +1045,8 @@ int bucket; +#else + int MaxNumDescriptors = 0; #endif /* RPP */ int i, num; @@ -1053,13 +1055,11 @@ fd_set *FDSet; - int MaxNumDescriptors = 0; pbs_errno = 0; flushreq(); - MaxNumDescriptors = get_max_num_descriptors(); FDSet = (fd_set *)calloc(1,sizeof(char) * get_fdset_size()); #if RPP @@ -1147,6 +1147,8 @@ tv.tv_usec = 0; + MaxNumDescriptors = get_max_num_descriptors(); + num = select(MaxNumDescriptors, FDSet, NULL, NULL, &tv); if (num == -1) diff -ru ../torque-2.5.8-snap.201108291517.orig/src/lib/Libutils/u_threadpool.c ./src/lib/Libutils/u_threadpool.c --- ../torque-2.5.8-snap.201108291517.orig/src/lib/Libutils/u_threadpool.c 2011-06-13 18:11:04.000000000 +0200 +++ ./src/lib/Libutils/u_threadpool.c 2011-08-29 23:43:02.515020745 +0200 @@ -200,7 +200,6 @@ { char *id = "work_thread"; - int expired; int rc; void *(*func)(void *); @@ -229,7 +228,6 @@ pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED,NULL); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE,NULL); - expired = FALSE; request_pool->tp_idle_threads++; while ((request_pool->tp_first == NULL) && @@ -249,7 +247,6 @@ if (rc == ETIMEDOUT) { - expired = TRUE; break; } } @@ -263,8 +260,6 @@ if ((mywork = request_pool->tp_first) != NULL) { - expired = FALSE; - func = mywork->work_func; arg = mywork->work_arg; diff -ru ../torque-2.5.8-snap.201108291517.orig/src/resmom/checkpoint.c ./src/resmom/checkpoint.c --- ../torque-2.5.8-snap.201108291517.orig/src/resmom/checkpoint.c 2011-07-25 18:22:19.000000000 +0200 +++ ./src/resmom/checkpoint.c 2011-08-29 23:52:18.480289115 +0200 @@ -1203,7 +1203,6 @@ char path[MAXPATHLEN + 1]; char oldp[MAXPATHLEN + 1]; char file[MAXPATHLEN + 1]; - int filelen; task *ptask; assert(pjob != NULL); @@ -1226,7 +1225,6 @@ mkdir(path, 0755); - filelen = strlen(path); strcpy(file, path); #ifdef _CRAY diff -ru ../torque-2.5.8-snap.201108291517.orig/src/resmom/linux/mom_mach.c ./src/resmom/linux/mom_mach.c --- ../torque-2.5.8-snap.201108291517.orig/src/resmom/linux/mom_mach.c 2011-08-02 23:42:25.000000000 +0200 +++ ./src/resmom/linux/mom_mach.c 2011-08-29 23:50:41.821632793 +0200 @@ -882,14 +882,11 @@ { char *id = "overcpu_proc"; - ulong memsize; struct dirent *dent; ulong cputime; proc_stat_t *ps; - memsize = 0; - rewinddir(pdir); while ((dent = readdir(pdir)) != NULL) @@ -1028,12 +1025,9 @@ { char *id = "overmem_proc"; - unsigned long long memsize; int i; proc_stat_t *ps; - memsize = 0; - if (LOGLEVEL >= 6) { sprintf(log_buffer, "proc_array loop start - jobid = %s", diff -ru ../torque-2.5.8-snap.201108291517.orig/src/resmom/start_exec.c ./src/resmom/start_exec.c --- ../torque-2.5.8-snap.201108291517.orig/src/resmom/start_exec.c 2011-08-25 17:03:02.000000000 +0200 +++ ./src/resmom/start_exec.c 2011-08-29 23:54:35.696702725 +0200 @@ -1885,10 +1885,8 @@ #endif /* !SHELL_USE_ARGV */ job *pjob; - task *ptask; pjob = (job *)TJE->pjob; - ptask = (task *)TJE->ptask; if (LOGLEVEL >= 4) { diff -ru ../torque-2.5.8-snap.201108291517.orig/src/server/req_getcred.c ./src/server/req_getcred.c --- ../torque-2.5.8-snap.201108291517.orig/src/server/req_getcred.c 2010-11-02 20:48:04.000000000 +0100 +++ ./src/server/req_getcred.c 2011-08-29 23:43:53.828184806 +0200 @@ -218,7 +218,7 @@ suseconds_t millisecs; struct tm *timeinfo; char mungeFileName[MAXPATHLEN + MAXNAMLEN+1]; - int fd, newfd; + int fd; char buf[MUNGE_SIZE]; char munge_buf[MUNGE_SIZE]; int bytes_written; @@ -349,7 +349,6 @@ else { close(fd_pipe[0]); - newfd = dup2(fd_pipe[1], 1); strcpy(execname, "unmunge"); strcpy(com1, "unmunge"); strcpy(com2, "--input="); diff -ru ../torque-2.5.8-snap.201108291517.orig/src/server/req_jobobit.c ./src/server/req_jobobit.c --- ../torque-2.5.8-snap.201108291517.orig/src/server/req_jobobit.c 2011-07-25 18:22:20.000000000 +0200 +++ ./src/server/req_jobobit.c 2011-08-29 23:44:46.653265208 +0200 @@ -2231,13 +2231,13 @@ { #ifdef USESAVEDRESOURCES char id[] = "req_jobobit"; + int have_resc_used = FALSE; #endif /* USESAVEDRESOURCES */ int alreadymailed = 0; int bad; char acctbuf[RESC_USED_BUF]; int accttail; int exitstatus; - int have_resc_used = FALSE; char mailbuf[RESC_USED_BUF]; int newstate; int newsubst; @@ -2390,10 +2390,10 @@ accttail = strlen(acctbuf); - have_resc_used = get_used(patlist, acctbuf); - #ifdef USESAVEDRESOURCES + have_resc_used = get_used(patlist, acctbuf); + /* if we don't have resources from the obit, use what the job already had */ if (!have_resc_used) diff -ru ../torque-2.5.8-snap.201108291517.orig/src/server/req_modify.c ./src/server/req_modify.c --- ../torque-2.5.8-snap.201108291517.orig/src/server/req_modify.c 2010-10-13 22:24:32.000000000 +0200 +++ ./src/server/req_modify.c 2011-08-29 23:46:18.608182696 +0200 @@ -335,13 +335,6 @@ struct work_task *ptask) { - job *pjob; - - struct batch_request *preq; - - preq = (struct batch_request *)ptask->wt_parm1; - pjob = (job *)preq->rq_extra; - release_req(ptask); return; diff -ru ../torque-2.5.8-snap.201108291517.orig/src/server/req_register.c ./src/server/req_register.c --- ../torque-2.5.8-snap.201108291517.orig/src/server/req_register.c 2011-06-18 00:15:57.000000000 +0200 +++ ./src/server/req_register.c 2011-08-29 23:46:57.486033757 +0200 @@ -2422,7 +2422,6 @@ struct dependnames *pn; char *BPtr = 0; - int BSpace = -1; if (!attr) return (-1); @@ -2465,7 +2464,6 @@ *pal->al_value = '\0'; BPtr = pal->al_value; - BSpace = pal->al_tsize; /* this is actually a little larger than the actual buffer */ for (nxdp = pdp; nxdp; nxdp = (struct depend *)GET_NEXT(nxdp->dp_link)) { diff -ru ../torque-2.5.8-snap.201108291517.orig/src/server/req_stat.c ./src/server/req_stat.c --- ../torque-2.5.8-snap.201108291517.orig/src/server/req_stat.c 2011-07-25 18:22:20.000000000 +0200 +++ ./src/server/req_stat.c 2011-08-29 23:47:29.692253547 +0200 @@ -350,8 +350,6 @@ pbs_queue *pque = NULL; int exec_only = 0; - int IsTruncated = 0; - long DTime; /* delta time - only report full attribute list if J->MTime > DTime */ static svrattrl *dpal = NULL; @@ -366,9 +364,6 @@ /* See pbs_server_attributes(1B) for details on "poll_jobs" behaviour */ - /* NOTE: If IsTruncated is true, should walk all queues and walk jobs in each queue - until max_reported is reached (NYI) */ - if (dpal == NULL) { /* build 'delta' attribute list */ @@ -443,9 +438,6 @@ } else { - if ((type == tjstTruncatedServer) || (type == tjstTruncatedQueue)) - IsTruncated = TRUE; - pjob = (job *)GET_NEXT(svr_alljobs); } } /* END if (pjob == NULL) */ diff -ru ../torque-2.5.8-snap.201108291517.orig/src/server/stat_job.c ./src/server/stat_job.c --- ../torque-2.5.8-snap.201108291517.orig/src/server/stat_job.c 2011-01-13 21:22:14.000000000 +0100 +++ ./src/server/stat_job.c 2011-08-29 23:48:03.722372482 +0200 @@ -303,22 +303,12 @@ int found = 0; unsigned long remaining = 0; - unsigned long upperBound = 0; if (((pattr + JOB_ATR_resource)->at_val.at_list.ll_next != NULL) && ((pattr + JOB_ATR_resource)->at_flags & ATR_VFLAG_SET)) { pres = (resource *)GET_NEXT((pattr + JOB_ATR_resource)->at_val.at_list); - if ((pattr + JOB_ATR_comp_time)->at_flags & ATR_VFLAG_SET) - { - upperBound = (pattr + JOB_ATR_comp_time)->at_val.at_long; - } - else - { - upperBound = (unsigned long)time_now; - } - /* find the walltime resource */ for (;pres != NULL;pres = (resource *)GET_NEXT(pres->rs_link)) { diff -ru ../torque-2.5.8-snap.201108291517.orig/src/server/svr_jobfunc.c ./src/server/svr_jobfunc.c --- ../torque-2.5.8-snap.201108291517.orig/src/server/svr_jobfunc.c 2011-08-15 20:11:53.000000000 +0200 +++ ./src/server/svr_jobfunc.c 2011-08-29 23:49:00.667224682 +0200 @@ -959,7 +959,7 @@ static resource_def *mppwidthresc = NULL; static resource_def *mppnppn = NULL; static resource_def *procresc = NULL; - static resource_def *gpuresc = NULL; + /*static resource_def *gpuresc = NULL;*/ static time_t UpdateTime = 0; static time_t now; @@ -983,7 +983,7 @@ mppwidthresc = find_resc_def(svr_resc_def, "mppwidth", svr_resc_size); mppnppn = find_resc_def(svr_resc_def, "mppnppn", svr_resc_size); procresc = find_resc_def(svr_resc_def, "procs", svr_resc_size); - gpuresc = find_resc_def(svr_resc_def, "gpus", svr_resc_size); + /*gpuresc = find_resc_def(svr_resc_def, "gpus", svr_resc_size);*/ SvrNodeCt = 0;