Attachment #7480 for ticket #5407

View | Details | Raw Unified | Return to ticket 5407
Collapse All | Expand All




					     tmp_char,
					     (curr_inx == field_count));
			break;
                case PRINT_TIMELIMIT_RAW:
                        switch (type) {
                        case JOB:
                                if (job->timelimit == INFINITE)
                                        tmp_char = "UNLIMITED";
                                else if (job->timelimit == NO_VAL)
                                        tmp_char = "Partition_Limit";
                                else if (job->timelimit) {
                                        tmp_char = xstrdup_printf("%u",
							job->timelimit);
                                }
                                break;
                        case JOBSTEP:
                                break;
                        case JOBCOMP:
                                tmp_char = job_comp->timelimit;
                                break;
                        default:
                                break;
                        }
                        field->print_routine(field,
                                             tmp_char,
                                             (curr_inx == field_count));
                        break;
		case PRINT_TOTALCPU:
			switch(type) {
			case JOB:

Lines 124-129 print_field_t fields[] = { Link Here

(-)a/src/sacct/sacct.c (+1 lines)
124	{10, "SystemCPU", print_fields_str, PRINT_SYSTEMCPU},	124	{10, "SystemCPU", print_fields_str, PRINT_SYSTEMCPU},
125	{15, "SystemComment", print_fields_str, PRINT_SYSTEM_COMMENT},	125	{15, "SystemComment", print_fields_str, PRINT_SYSTEM_COMMENT},
126	{10, "Timelimit", print_fields_str, PRINT_TIMELIMIT},	126	{10, "Timelimit", print_fields_str, PRINT_TIMELIMIT},
		127	{10, "TimelimitRaw", print_fields_str, PRINT_TIMELIMIT_RAW},
127	{10, "TotalCPU", print_fields_str, PRINT_TOTALCPU},	128	{10, "TotalCPU", print_fields_str, PRINT_TOTALCPU},
128	{14, "TRESUsageInAve", print_fields_str, PRINT_TRESUIA},	129	{14, "TRESUsageInAve", print_fields_str, PRINT_TRESUIA},
129	{14, "TRESUsageInMax", print_fields_str, PRINT_TRESUIM},	130	{14, "TRESUsageInMax", print_fields_str, PRINT_TRESUIM},

Lines 166-171 typedef enum { Link Here

(-)a/src/sacct/sacct.h (+1 lines)
166	PRINT_SYSTEMCPU,	166	PRINT_SYSTEMCPU,
167	PRINT_SYSTEM_COMMENT,	167	PRINT_SYSTEM_COMMENT,
168	PRINT_TIMELIMIT,	168	PRINT_TIMELIMIT,
		169	PRINT_TIMELIMIT_RAW,
169	PRINT_TOTALCPU,	170	PRINT_TOTALCPU,
170	PRINT_TRESUIA,	171	PRINT_TRESUIA,
171	PRINT_TRESUIM,	172	PRINT_TRESUIM,

Return to ticket 5407

Lines 2190-2195 extern void print_fields(type_t type, void *object) Link Here

(-)a/src/sacct/print.c (+24 lines)
2190	tmp_char,	2190	tmp_char,
2191	(curr_inx == field_count));	2191	(curr_inx == field_count));
2192	break;	2192	break;
		2193	case PRINT_TIMELIMIT_RAW:
		2194	switch (type) {
		2195	case JOB:
		2196	if (job->timelimit == INFINITE)
		2197	tmp_char = "UNLIMITED";
		2198	else if (job->timelimit == NO_VAL)
		2199	tmp_char = "Partition_Limit";
		2200	else if (job->timelimit) {
		2201	tmp_char = xstrdup_printf("%u",
		2202	job->timelimit);
		2203	}
		2204	break;
		2205	case JOBSTEP:
		2206	break;
		2207	case JOBCOMP:
		2208	tmp_char = job_comp->timelimit;
		2209	break;
		2210	default:
		2211	break;
		2212	}
		2213	field->print_routine(field,
		2214	tmp_char,
		2215	(curr_inx == field_count));
		2216	break;
2193	case PRINT_TOTALCPU:	2217	case PRINT_TOTALCPU:
2194	switch(type) {	2218	switch(type) {
2195	case JOB:	2219	case JOB: