EH: CS-173 Job counter should be greater than 10 mio.

jgabler-hpc · jgabler-hpc · commit edc867f79fa4 · 2025-02-11T16:06:31.000+01:00
diff --git a/source/clients/common/ocs_client_job.cc b/source/clients/common/ocs_client_job.cc
@@ -87,7 +87,7 @@ void cull_show_job(const lListElem *job, int flags, bool show_binding) {
 
    if (!(flags & FLG_QALTER)) {
       if (lGetUlong(job, JB_job_number))
-         printf("job_number:                 %d\n", (int) lGetUlong(job, JB_job_number));
+         printf("job_number:                 " sge_uu32 "\n", lGetUlong(job, JB_job_number));
       else
          printf("job_number:                 %s\n", MSG_JOB_UNASSIGNED);
    }
diff --git a/source/clients/common/ocs_client_print.cc b/source/clients/common/ocs_client_print.cc
@@ -451,7 +451,7 @@ static int sge_print_job(lListElem *job, lListElem *jatep, lListElem *qep, int p
          if (!(full_listing & QSTAT_DISPLAY_FULL)) {
             int line_length = queue_name_length - 10 + 1;
             char *seperator = sge_malloc(line_length);
-            const char *part1 = "%s%-7.7s %s %s%s%s%s%s %-10.10s %-12.12s %s%-5.5s %s%s%s%s%s%s%s%s%s%-";
+            const char *part1 = "%s%-10.10s %s %s%s%s%s%s %-10.10s %-12.12s %s%-5.5s %s%s%s%s%s%s%s%s%s%-";
             const char *part3 = ".";
             const char *part5 = "s %s %s%s%s%s%s%s";
             size_t part6_size = strlen(part1) + strlen(part3) + strlen(part5) + 256;
@@ -490,15 +490,16 @@ static int sge_print_job(lListElem *job, lListElem *jatep, lListElem *qep, int p
       /* job number / ja task id */
       if (print_jobid) {
          if (hide_data) {
-            sge_dstring_sprintf_append(&output, "%7s ", "*");
+            // maximum job id is U_LONG32_MAX = 4294967295 = 10 digits
+            sge_dstring_sprintf_append(&output, "%10s ", "*");
          } else {
-            sge_dstring_sprintf_append(&output, "%7d ", (int)lGetUlong(job, JB_job_number));
+            sge_dstring_sprintf_append(&output, "%10" sge_fuu32 " ", lGetUlong(job, JB_job_number));
          }
       } else {
-         sge_dstring_sprintf_append(&output, "        ");
+         sge_dstring_sprintf_append(&output, "           ");
       }
    } else {
-      snprintf(jobid, sizeof(jobid) - 1, "%d", (int)lGetUlong(job, JB_job_number));
+      snprintf(jobid, sizeof(jobid) - 1, sge_uu32, lGetUlong(job, JB_job_number));
       ret = report_handler->report_job_begin(report_handler, cqname, jobid, alpp);
       if (ret != QHOST_SUCCESS) {
          DRETURN(ret);
diff --git a/source/clients/qacct/ocs_qacct.cc b/source/clients/qacct/ocs_qacct.cc
@@ -1372,8 +1372,8 @@ static void qacct_usage(FILE *err_fp)
 #define SHOWJOB_STRING_NO_DATA "%-35.34s-/-\n"
 #define SHOWJOB_STRING_20      "%-35.34s%-20s\n"
 #define SHOWJOB_STRING_20_NOLF "%-35.34s%-20s"
-#define SHOWJOB_U32_20         "%-35.34s%-20" sge_fu32 "\n"
-#define SHOWJOB_U32_FAILED     "%-35.34s%-3" sge_fu32" %s %s\n"
+#define SHOWJOB_U32_20         "%-35.34s%-20" sge_fuu32 "\n"
+#define SHOWJOB_U32_FAILED     "%-35.34s%-3" sge_fuu32" %s %s\n"
 #define SHOWJOB_FLOAT_0        "%-35.34s%-13.0f\n"
 #define SHOWJOB_FLOAT_3        "%-35.34s%-13.3f\n"
 #define SHOWJOB_FLOAT_18_0     "%-35.34s%-18.0f\n"
diff --git a/source/clients/qsh/ocs_qsh.cc b/source/clients/qsh/ocs_qsh.cc
@@ -2277,7 +2277,7 @@ static void delete_job(u_long32 job_id, lList *jlp)
       return;
    }
 
-   snprintf(job_str, sizeof(job_str), sge_u32, job_id);
+   snprintf(job_str, sizeof(job_str), sge_uu32, job_id);
    lAddElemStr(&idlp, ID_str, job_str, ID_Type);
 
    alp = sge_gdi(SGE_JB_LIST, SGE_GDI_DEL, &idlp, nullptr, nullptr);
diff --git a/source/clients/qstat/ocs_qstat.cc b/source/clients/qstat/ocs_qstat.cc
@@ -870,7 +870,7 @@ static int job_stdout_job(job_handler_t* handler, u_long32 jid, job_summary_t *s
       int i;
       int line_length = qstat_env->longest_queue_length-10+1;
       char * seperator = sge_malloc(line_length);
-      const char *part1 = "%s%-7.7s %s %s%s%s%s%s %-10.10s %-12.12s %s%-5.5s %s%s%s%s%s%s%s%s%s%-";
+      const char *part1 = "%s%-10.10s %s %s%s%s%s%s %-10.10s %-12.12s %s%-5.5s %s%s%s%s%s%s%s%s%s%-";
       const char *part3 = ".";
 	   const char *part5 = "s %s %s%s%s%s%s%s";
       size_t part6_size = strlen(part1) + strlen(part3) + strlen(part5) + 20;
@@ -936,12 +936,13 @@ static int job_stdout_job(job_handler_t* handler, u_long32 jid, job_summary_t *s
    /* job number / ja task id */
    if (print_job_id) {
       if (hide_data) {
-         sge_dstring_sprintf_append(&job_output, "%7s ", "*");
+         // maximum job id is U_LONG32_MAX = 4294967295 = 10 digits
+         sge_dstring_sprintf_append(&job_output, "%10s ", "*");
       } else {
-         sge_dstring_sprintf_append(&job_output, "%7d ", (int)jid);
+         sge_dstring_sprintf_append(&job_output, "%10" sge_fuu32 " ", jid);
       }
    } else {
-      sge_dstring_sprintf_append(&job_output, "        ");
+      sge_dstring_sprintf_append(&job_output, "           ");
    }
    
    if (print_job_id) {
@@ -2157,7 +2158,7 @@ qstat_show_job(lList *jid_list, u_long32 isXML, qstat_env_t *qstat_env) {
       for_each_rw(elem1, jlp) {
          char buffer[256];
  
-         snprintf(buffer, sizeof(buffer), sge_U32CFormat, sge_u32c(lGetUlong(elem1, JB_job_number)));
+         snprintf(buffer, sizeof(buffer), sge_uu32, lGetUlong(elem1, JB_job_number));
          elem2 = lGetElemStrRW(jid_list, ST_name, buffer);     
          
          if (elem2) {
diff --git a/source/clients/qstat/ocs_qstat_xml.cc b/source/clients/qstat/ocs_qstat_xml.cc
@@ -417,7 +417,7 @@ static int qstat_xml_job(job_handler_t* handler, u_long32 jid, job_summary_t *su
    sge_time = !sge_ext;
    sge_time = sge_time | tsk_ext | sge_urg | sge_pri;
    
-   xml_append_Attr_I(attribute_list, "JB_job_number", jid); 
+   xml_append_Attr_U(attribute_list, "JB_job_number", jid);
    xml_append_Attr_D(attribute_list, "JAT_prio", summary->nprior);
    if( sge_ext) {
       xml_append_Attr_D(attribute_list, "JAT_ntix", summary->ntckts);
diff --git a/source/common/basis_types.h b/source/common/basis_types.h
@@ -124,12 +124,14 @@
 #  define sge_uu32   "%u"
 #  define sge_x32    "%x"
 #  define sge_fu32   "d"
+#  define sge_fuu32   "u"
 #else
 #  define sge_u64    "%llu"
 #  define sge_u32    "%ld"
 #  define sge_uu32   "%lu"
 #  define sge_x32    "%lx"
 #  define sge_fu32   "ld"
+#  define sge_fuu32   "lu"
 #endif
 
 #define uid_t_fmt "%u"
diff --git a/source/daemons/execd/exec_job.cc b/source/daemons/execd/exec_job.cc
@@ -448,7 +448,7 @@ int sge_exec_job(lListElem *jep, lListElem *jatep, lListElem *petep, char *err_s
       pe_task_id = lGetString(petep, PET_id);
    }
 
-   DPRINTF("job: %ld jatask: %ld petask: %s\n", job_id, ja_task_id, pe_task_id != nullptr ? pe_task_id : "none");
+   DPRINTF("job: " sge_uu32 " jatask: " sge_uu32 " petask: %s\n", job_id, ja_task_id, pe_task_id != nullptr ? pe_task_id : "none");
 
    master_q = responsible_queue(jep, jatep, petep);
    SGE_ASSERT((master_q));
@@ -462,8 +462,7 @@ int sge_exec_job(lListElem *jep, lListElem *jatep, lListElem *petep, char *err_s
       DRETURN(-3); /* error only relevant for this user */
    }
 
-   sge_get_active_job_file_path(&active_dir, job_id,
-                                ja_task_id, pe_task_id, nullptr);
+   sge_get_active_job_file_path(&active_dir, job_id, ja_task_id, pe_task_id, nullptr);
 
    umask(022);
 
@@ -806,7 +805,7 @@ int sge_exec_job(lListElem *jep, lListElem *jatep, lListElem *petep, char *err_s
       } else {
          if (lGetString(jep, JB_script_file) != nullptr) {
             /* JG: TODO: use some function to create path */
-            str_script_file = sge_dstring_sprintf(&dstr_script_file, "%s/%s/" sge_u32, execd_spool_dir, EXEC_DIR,
+            str_script_file = sge_dstring_sprintf(&dstr_script_file, "%s/%s/" sge_uu32, execd_spool_dir, EXEC_DIR,
                                                   job_id);
          } else {
             /*
@@ -849,7 +848,7 @@ int sge_exec_job(lListElem *jep, lListElem *jatep, lListElem *petep, char *err_s
             token = sge_strtok(buffer, delim);
             while (token != nullptr) {
                if (is_first_token) {
-                  sge_dstring_sprintf(&new_qrsh_command, "%s/%s/" sge_u32,
+                  sge_dstring_sprintf(&new_qrsh_command, "%s/%s/" sge_uu32,
                                       execd_spool_dir, EXEC_DIR, job_id);
                   is_first_token = 0;
                } else {
@@ -1489,7 +1488,7 @@ int sge_exec_job(lListElem *jep, lListElem *jatep, lListElem *petep, char *err_s
    } else {
       fprintf(fp, "job_name=%s\n", lGetString(jep, JB_job_name));
    }
-   fprintf(fp, "job_id=" sge_u32 "\n", job_id);
+   fprintf(fp, "job_id=" sge_uu32 "\n", job_id);
    fprintf(fp, "ja_task_id=" sge_u32 "\n", job_is_array(jep) ? ja_task_id : 0);
    if (petep != nullptr) {
       fprintf(fp, "pe_task_id=%s\n", pe_task_id);
@@ -1977,13 +1976,13 @@ int sge_exec_job(lListElem *jep, lListElem *jatep, lListElem *petep, char *err_s
        lGetString(jep, JB_cred)) {
 
       char ccname[1024];
-      snprintf(ccname, sizeof(ccname), "KRB5CCNAME=FILE:/tmp/krb5cc_%s_" sge_u32, "sge", job_id);
+      snprintf(ccname, sizeof(ccname), "KRB5CCNAME=FILE:/tmp/krb5cc_%s_" sge_uu32, "sge", job_id);
       putenv(ccname);
    }
 
    DPRINTF("**********************CHILD*********************\n");
    shepherd_name = SGE_SHEPHERD;
-   snprintf(ps_name, sizeof(ps_name), "%s-" sge_u32, shepherd_name, job_id);
+   snprintf(ps_name, sizeof(ps_name), "%s-" sge_uu32, shepherd_name, job_id);
 
    pag_cmd = mconf_get_pag_cmd();
    shepherd_cmd = mconf_get_shepherd_cmd();
@@ -2030,7 +2029,7 @@ int sge_exec_job(lListElem *jep, lListElem *jatep, lListElem *petep, char *err_s
 
    fp = fopen("error", "w");
    if (fp) {
-      fprintf(fp, "failed to exec shepherd for job" sge_u32"\n", job_id);
+      fprintf(fp, "failed to exec shepherd for job" sge_uu32"\n", job_id);
       FCLOSE(fp);
    }
 
diff --git a/source/daemons/execd/get_path.cc b/source/daemons/execd/get_path.cc
@@ -226,12 +226,12 @@ expand_path(dstring *dstr_exp_path, const char *in_path, u_long32 job_id, u_long
             s = t + sizeof("$HOME") - 1;
          }
          if (!strncmp(t, "$JOB_ID", sizeof("$JOB_ID") - 1)) {
-            sge_dstring_sprintf_append(dstr_exp_path, sge_u32, job_id);
+            sge_dstring_sprintf_append(dstr_exp_path, sge_uu32, job_id);
             s = t + sizeof("$JOB_ID") - 1;
          }
          if (ja_task_id) {
             if (!strncmp(t, "$TASK_ID", sizeof("$TASK_ID") - 1)) {
-               sge_dstring_sprintf_append(dstr_exp_path, sge_u32, ja_task_id);
+               sge_dstring_sprintf_append(dstr_exp_path, sge_uu32, ja_task_id);
                s = t + sizeof("$TASK_ID") - 1;
             }
          }
diff --git a/source/daemons/execd/load_avg.cc b/source/daemons/execd/load_avg.cc
@@ -922,7 +922,7 @@ void update_job_usage(const char* qualified_hostname)
             /* search matching job report */
             if (!(jr = get_job_report(job_id, ja_task_id, pe_task_id))) {
                /* should not happen in theory */
-               ERROR("could not find job report for job " sge_u32"." sge_u32" " "task " SFN " contained in job usage from ptf", job_id, ja_task_id, pe_task_id);
+               ERROR("could not find job report for job " sge_uu32"." sge_uu32" " "task " SFN " contained in job usage from ptf", job_id, ja_task_id, pe_task_id);
 #ifdef COMPILE_DC
 #ifdef DEBUG_DC
                ptf_show_registered_jobs();
diff --git a/source/daemons/qmaster/sge_advance_reservation_qmaster.cc b/source/daemons/qmaster/sge_advance_reservation_qmaster.cc
@@ -705,20 +705,18 @@ sge_get_ar_id(monitoring_t *monitor) {
 
    DENTER(TOP_LAYER);
 
-   sge_mutex_lock("ar_id_mutex", "sge_get_ar_id", __LINE__,
-                  &ar_id_control.ar_id_mutex);
+   sge_mutex_lock("ar_id_mutex", "sge_get_ar_id", __LINE__, &ar_id_control.ar_id_mutex);
 
-   ar_id_control.ar_id++;
-   ar_id_control.changed = true;
-   if (ar_id_control.ar_id > MAX_SEQNUM) {
-      DPRINTF("highest ar number MAX_SEQNUM %d exceeded, starting over with 1\n", MAX_SEQNUM);
-      ar_id_control.ar_id = 1;
+   if (ar_id_control.ar_id >= MAX_SEQNUM) {
+      DPRINTF("highest ar number MAX_SEQNUM %d reached, starting over with 1\n", MAX_SEQNUM);
+      ar_id_control.ar_id = 0;
       is_store_ar = true;
    }
+   ar_id_control.ar_id++;
+   ar_id_control.changed = true;
    ar_id = ar_id_control.ar_id;
 
-   sge_mutex_unlock("ar_id_mutex", "sge_get_ar_id", __LINE__,
-                    &ar_id_control.ar_id_mutex);
+   sge_mutex_unlock("ar_id_mutex", "sge_get_ar_id", __LINE__, &ar_id_control.ar_id_mutex);
 
    if (is_store_ar) {
       sge_store_ar_id(nullptr, monitor);
diff --git a/source/daemons/qmaster/sge_give_jobs.cc b/source/daemons/qmaster/sge_give_jobs.cc
@@ -1840,7 +1840,7 @@ sge_to_zombies(lListElem *job, lListElem *ja_task) {
       }
 
    } else {
-      WARNING("It is impossible to move task " sge_u32" of job " sge_u32 " to the list of finished jobs\n", ja_task_id, job_id);
+      WARNING("It is impossible to move task " sge_uu32" of job " sge_uu32 " to the list of finished jobs\n", ja_task_id, job_id);
    }
 
    DRETURN(True);
diff --git a/source/daemons/qmaster/sge_job_qmaster.cc b/source/daemons/qmaster/sge_job_qmaster.cc
@@ -1185,7 +1185,7 @@ sge_gdi_mod_job(const sge_gdi_packet_class_t *packet, sge_gdi_task_class_t *task
       const char *job_id_str = nullptr;
       char job_id[40];
       if (!job_name_flag) {
-         snprintf(job_id, sizeof(job_id), sge_u32, lGetPosUlong(jep, job_id_pos));
+         snprintf(job_id, sizeof(job_id), sge_uu32, lGetPosUlong(jep, job_id_pos));
          job_id_str = job_id;
       } else {
          /* format: <delimiter>old_name<delimiter>new_name */
@@ -1369,7 +1369,7 @@ sge_gdi_mod_job(const sge_gdi_packet_class_t *packet, sge_gdi_task_class_t *task
       const char *job_id_str = nullptr;
       char job_id[40];
       if (!job_name_flag) {
-         snprintf(job_id, sizeof(job_id), sge_u32, lGetPosUlong(jep, job_id_pos));
+         snprintf(job_id, sizeof(job_id), sge_uu32, lGetPosUlong(jep, job_id_pos));
          job_id_str = job_id;
       } else {
          job_id_str = job_mod_name;
@@ -3015,14 +3015,11 @@ sge_get_job_number(monitoring_t *monitor) {
 
    DENTER(TOP_LAYER);
 
-   sge_mutex_lock("job_number_mutex", "sge_get_job_number", __LINE__,
-                  &job_number_control.job_number_mutex);
+   sge_mutex_lock("job_number_mutex", "sge_get_job_number", __LINE__, &job_number_control.job_number_mutex);
 
-   job_number_control.job_number++;
-   job_number_control.changed = true;
-   if (job_number_control.job_number > MAX_SEQNUM) {
-      DPRINTF("highest job number MAX_SEQNUM %d exceeded, starting over with 1\n", MAX_SEQNUM);
-      job_number_control.job_number = 1;
+   if (job_number_control.job_number >= MAX_SEQNUM) {
+      DPRINTF("highest job number MAX_SEQNUM " sge_uu32 " reached, starting over with 1\n", MAX_SEQNUM);
+      job_number_control.job_number = 0;
       is_store_job = true;
       /*
        * We need to sleep at least for one second to make sure
@@ -3032,10 +3029,11 @@ sge_get_job_number(monitoring_t *monitor) {
        */
       sge_usleep(1000000);
    }
+   job_number_control.job_number++;
+   job_number_control.changed = true;
    job_nr = job_number_control.job_number;
 
-   sge_mutex_unlock("job_number_mutex", "sge_get_job_number", __LINE__,
-                    &job_number_control.job_number_mutex);
+   sge_mutex_unlock("job_number_mutex", "sge_get_job_number", __LINE__, &job_number_control.job_number_mutex);
 
    if (is_store_job) {
       sge_store_job_number(nullptr, monitor);
diff --git a/source/daemons/qmaster/sge_job_verify.cc b/source/daemons/qmaster/sge_job_verify.cc
@@ -584,7 +584,7 @@ sge_job_verify_adjust(lListElem *jep, lList **alpp, lList **lpp,
     */
    if (lGetString(jep, JB_script_file)) {
       dstring string = DSTRING_INIT;
-      sge_dstring_sprintf(&string, "%s/%d", EXEC_DIR, (int) lGetUlong(jep, JB_job_number));
+      sge_dstring_sprintf(&string, "%s/" sge_uu32, EXEC_DIR, lGetUlong(jep, JB_job_number));
       lSetString(jep, JB_exec_file, sge_dstring_get_string(&string));
       sge_dstring_free(&string);
    }
diff --git a/source/daemons/qmaster/sge_qmod_qmaster.cc b/source/daemons/qmaster/sge_qmod_qmaster.cc
@@ -1041,7 +1041,10 @@ sge_signal_queue(int how, lListElem *qep, lListElem *jep, lListElem *jatep, moni
 
    u_long64 now = sge_get_gmt64();
 
-   DEBUG("queue_signal: %d, queue: %s, job: %d, jatask: %d", how, (qep ? lGetString(qep, QU_full_name) : "none"), (int) (jep ? lGetUlong(jep, JB_job_number) : -1), (int) (jatep ? lGetUlong(jatep, JAT_task_number) : -1) );
+   DEBUG("queue_signal: %d, queue: %s, job: " sge_uu32 ", jatask: " sge_uu32, how,
+      (qep != nullptr ? lGetString(qep, QU_full_name) : "none"),
+      jep != nullptr ? lGetUlong(jep, JB_job_number) : 0,
+      jatep != nullptr ? lGetUlong(jatep, JAT_task_number) : 0);
 
    if (!jep && (how == SGE_SIGSTOP || how == SGE_SIGCONT)) {
       sge_propagate_queue_suspension(lGetString(qep, QU_full_name), how);
diff --git a/source/libs/sched/load_correction.cc b/source/libs/sched/load_correction.cc
@@ -137,9 +137,9 @@ int correct_load(lList *running_jobs, lList *queue_list, lList *host_list,
 #endif
             if (monitor_next_run) {
                char log_string[2048 + 1];
-               snprintf(log_string, sizeof(log_string), "JOB " sge_u32"." sge_u32" [" sge_u32"] in queue " SFN
-                          " increased absolute lc of host " SFN " by " sge_u32" to "
-                          sge_u32"", job_id, ja_task_id, slots, qnm, hnm,
+               snprintf(log_string, sizeof(log_string), "JOB " sge_uu32"." sge_uu32" [" sge_uu32"] in queue " SFN
+                          " increased absolute lc of host " SFN " by " sge_uu32" to "
+                          sge_uu32"", job_id, ja_task_id, slots, qnm, hnm,
                           (u_long32)(host_lcf*100), lGetUlong(hep, EH_load_correction_factor));
                schedd_log(log_string, nullptr, true);
             }
diff --git a/source/libs/sched/schedd_message.cc b/source/libs/sched/schedd_message.cc
@@ -383,7 +383,7 @@ void schedd_mes_add(lList **monitor_alpp, bool monitor_next_run, u_long32 job_id
          sge_dstring_init(&msg_log_ds, msg_log, sizeof(msg_log));
 
          if (job_id) {
-            msg_log_str = sge_dstring_sprintf(&msg_log_ds, "Job " sge_u32" %s", job_id, msg_str);
+            msg_log_str = sge_dstring_sprintf(&msg_log_ds, "Job " sge_uu32" %s", job_id, msg_str);
          } else {
             msg_log_str = sge_dstring_sprintf(&msg_log_ds, "Your job %s", msg_str);
          }
@@ -510,13 +510,13 @@ void schedd_mes_add_join(bool monitor_next_run, u_long32 job_number, u_long32 me
          }
 
          if (do_logging) {
-            msg_log_str = sge_dstring_sprintf(&msg_log_ds, "Job " sge_u32" %s", job_number, msg_str);
+            msg_log_str = sge_dstring_sprintf(&msg_log_ds, "Job " sge_uu32" %s", job_number, msg_str);
             schedd_log(msg_log_str, nullptr, monitor_next_run);
          }
       } else {
          if (do_logging) {
             if (job_number) {
-               msg_log_str = sge_dstring_sprintf(&msg_log_ds, "Job " sge_u32" %s", job_number, msg_str);
+               msg_log_str = sge_dstring_sprintf(&msg_log_ds, "Job " sge_uu32" %s", job_number, msg_str);
             } else {
                msg_log_str = sge_dstring_sprintf(&msg_log_ds, "Your job %s", msg_str);
             }
diff --git a/source/libs/sgeobj/sge_cull_xml.cc b/source/libs/sgeobj/sge_cull_xml.cc
@@ -378,9 +378,9 @@ static void lWriteElemXML_(const lListElem *ep, int nesting_level, FILE *fp, int
                break;
                case lUlongT:
                   if (!fp) {
-                     DPRINTF( sge_u32, lGetPosUlong(ep, i));
+                     DPRINTF( sge_uu32, lGetPosUlong(ep, i));
                   } else {
-                     fprintf(fp, sge_u32, lGetPosUlong(ep, i));
+                     fprintf(fp, sge_uu32, lGetPosUlong(ep, i));
                   }
                   break;
             case lUlong64T:
@@ -578,6 +578,12 @@ lListElem *xml_append_Attr_I(lList *attributeList, const char *name, int value)
    return append_Attr_S(attributeList, name, buffer);
 }
 
+lListElem *xml_append_Attr_U(lList *attributeList, const char *name, u_long32 value) {
+   char buffer[20];
+   snprintf(buffer, sizeof(buffer), sge_uu32, value);
+   return append_Attr_S(attributeList, name, buffer);
+}
+
 static bool lAttributesToString_(const lList *attr_list, dstring *attr){
    const lListElem *attr_elem = nullptr;
    
diff --git a/source/libs/sgeobj/sge_cull_xml.h b/source/libs/sgeobj/sge_cull_xml.h
@@ -57,4 +57,5 @@ lListElem *xml_append_Attr_D(lList *attributeList, const char *name, double valu
 lListElem *xml_append_Attr_D8(lList *attributeList, const char *name, double value);
 lListElem *xml_append_Attr_S(lList *attributeList, const char *name, const char *value);
 lListElem *xml_append_Attr_I(lList *attributeList, const char *name, int value);
+lListElem *xml_append_Attr_U(lList *attributeList, const char *name, u_long32 value);
 bool escape_string(const char *string, dstring *target);
diff --git a/source/libs/sgeobj/sge_job.cc b/source/libs/sgeobj/sge_job.cc
diff --git a/source/libs/uti/sge.h b/source/libs/uti/sge.h
diff --git a/source/libs/uti/sge_spool.cc b/source/libs/uti/sge_spool.cc
diff --git a/test/libs/spool/test_spool_performance.cc b/test/libs/spool/test_spool_performance.cc

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ void cull_show_job(const lListElem *job, int flags, bool show_binding) {`
`87`	`87`
`88`	`88`	`if (!(flags & FLG_QALTER)) {`
`89`	`89`	`if (lGetUlong(job, JB_job_number))`
`90`		`- printf("job_number: %d\n", (int) lGetUlong(job, JB_job_number));`
	`90`	`+ printf("job_number: " sge_uu32 "\n", lGetUlong(job, JB_job_number));`
`91`	`91`	`else`
`92`	`92`	`printf("job_number: %s\n", MSG_JOB_UNASSIGNED);`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2277,7 +2277,7 @@ static void delete_job(u_long32 job_id, lList *jlp)`
`2277`	`2277`	`return;`
`2278`	`2278`	`}`
`2279`	`2279`
`2280`		`- snprintf(job_str, sizeof(job_str), sge_u32, job_id);`
	`2280`	`+ snprintf(job_str, sizeof(job_str), sge_uu32, job_id);`
`2281`	`2281`	`lAddElemStr(&idlp, ID_str, job_str, ID_Type);`
`2282`	`2282`
`2283`	`2283`	`alp = sge_gdi(SGE_JB_LIST, SGE_GDI_DEL, &idlp, nullptr, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -226,12 +226,12 @@ expand_path(dstring dstr_exp_path, const char in_path, u_long32 job_id, u_long`
`226`	`226`	`s = t + sizeof("$HOME") - 1;`
`227`	`227`	`}`
`228`	`228`	`if (!strncmp(t, "$JOB_ID", sizeof("$JOB_ID") - 1)) {`
`229`		`- sge_dstring_sprintf_append(dstr_exp_path, sge_u32, job_id);`
	`229`	`+ sge_dstring_sprintf_append(dstr_exp_path, sge_uu32, job_id);`
`230`	`230`	`s = t + sizeof("$JOB_ID") - 1;`
`231`	`231`	`}`
`232`	`232`	`if (ja_task_id) {`
`233`	`233`	`if (!strncmp(t, "$TASK_ID", sizeof("$TASK_ID") - 1)) {`
`234`		`- sge_dstring_sprintf_append(dstr_exp_path, sge_u32, ja_task_id);`
	`234`	`+ sge_dstring_sprintf_append(dstr_exp_path, sge_uu32, ja_task_id);`
`235`	`235`	`s = t + sizeof("$TASK_ID") - 1;`
`236`	`236`	`}`
`237`	`237`	`}`