Remove TOD from the hdf5 code, as it is no longer used outside of the old

code.

src/common/slurm_acct_gather_profile.c

@@ -363,13 +363,6 @@ extern char *acct_gather_profile_dataset_str(
 
         while (dataset && (dataset->type != PROFILE_FIELD_NOT_SET)) {
 		switch (dataset->type) {
-		case PROFILE_FIELD_TOD:
-			cur_loc += snprintf(str+cur_loc, str_len-cur_loc,
-					    "%s%s=%s",
-					    cur_loc ? " " : "",
-					    dataset->name, (char *)data);
-			data += TOD_LEN;
-			break;
 		case PROFILE_FIELD_UINT64:
 			cur_loc += snprintf(str+cur_loc, str_len-cur_loc,
 					    "%s%s=%"PRIu64,

src/common/slurm_acct_gather_profile.h

@@ -67,7 +67,6 @@
 #include "src/slurmd/slurmstepd/slurmstepd_job.h"
 
 #define NO_PARENT -1
-#define TOD_LEN 24
 
 typedef enum {
 	PROFILE_ENERGY,
@@ -79,7 +78,6 @@ typedef enum {
 
 typedef enum {
 	PROFILE_FIELD_NOT_SET,
-	PROFILE_FIELD_TOD,
 	PROFILE_FIELD_UINT64,
 	PROFILE_FIELD_DOUBLE
 } acct_gather_profile_field_type_t;

src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c

@@ -100,8 +100,6 @@ const char plugin_name[] = "AcctGatherProfile hdf5 plugin";
 const char plugin_type[] = "acct_gather_profile/hdf5";
 const uint32_t plugin_version = SLURM_VERSION_NUMBER;
 
-hid_t typTOD;
-
 typedef struct {
 	char *dir;
 	uint32_t def;
@@ -500,9 +498,6 @@ extern int acct_gather_profile_p_create_dataset(
 	type_size = sizeof(uint64_t) * 2; /* size for time field */
 	while (dataset_loc && (dataset_loc->type != PROFILE_FIELD_NOT_SET)) {
 		switch (dataset_loc->type) {
-		case PROFILE_FIELD_TOD:
-			type_size += TOD_LEN;
-			break;
 		case PROFILE_FIELD_UINT64:
 			type_size += sizeof(uint64_t);
 			break;
@@ -534,10 +529,6 @@ extern int acct_gather_profile_p_create_dataset(
 	offset = sizeof(uint64_t) * 2;
 	while (dataset_loc && (dataset_loc->type != PROFILE_FIELD_NOT_SET)) {
 		switch (dataset_loc->type) {
-		case PROFILE_FIELD_TOD:
-			field_id = typTOD;
-			field_size = TOD_LEN;
-			break;
 		case PROFILE_FIELD_UINT64:
 			field_id = H5T_NATIVE_UINT64;
 			field_size = sizeof(uint64_t);

src/plugins/acct_gather_profile/hdf5/hdf5_api.c

@@ -48,19 +48,13 @@
 
 #include "hdf5_api.h"
 
-static hid_t typTOD;
-
 extern void profile_init(void)
 {
-	typTOD = H5Tcopy (H5T_C_S1);
-	H5Tset_size (typTOD, TOD_LEN); /* create string of length TOD_LEN */
-
 	return;
 }
 
 extern void profile_fini(void)
 {
-	H5Tclose(typTOD);
 	H5close(); /* make sure all H5 Objects are closed */
 
 	return;

src/plugins/acct_gather_profile/hdf5/sh5util/libsh5util_old/hdf5_api.h

@@ -98,6 +98,7 @@
 
 // Data types supported by all HDF5 plugins of this type
 
+#define TOD_LEN 24
 #define TOD_FMT "%F %T"
 
 /*