Turn anonymous enum to work_queue_category_mode_t

As recommended by compiler warning when testing for spack.

Author: btovar

work_queue/src/work_queue.c

@@ -183,7 +183,7 @@ struct work_queue {
 	time_t resources_last_update_time;
 	int    busy_waiting_flag;
 
-	category_mode_t allocation_default_mode;
+	work_queue_category_mode_t allocation_default_mode;
 
 	FILE *logfile;
 	FILE *transactions_logfile;
@@ -7198,7 +7198,7 @@ void work_queue_specify_category_first_allocation_guess(struct work_queue *q,  c
 	category_specify_first_allocation_guess(c, rm);
 }
 
-int work_queue_specify_category_mode(struct work_queue *q, const char *category, category_mode_t mode) {
+int work_queue_specify_category_mode(struct work_queue *q, const char *category, work_queue_category_mode_t mode) {
 
 	switch(mode) {
 		case CATEGORY_ALLOCATION_MODE_FIXED:
@@ -7217,7 +7217,7 @@ int work_queue_specify_category_mode(struct work_queue *q, const char *category,
 	}
 	else {
 		struct category *c = work_queue_category_lookup_or_create(q, category);
-		category_specify_allocation_mode(c, mode);
+		category_specify_allocation_mode(c, (category_mode_t) mode);
 		write_transaction_category(q, c);
 	}
 
@@ -7272,7 +7272,7 @@ struct category *work_queue_category_lookup_or_create(struct work_queue *q, cons
 
 	if(!c->wq_stats) {
 		c->wq_stats = calloc(1, sizeof(struct work_queue_stats));
-		category_specify_allocation_mode(c, q->allocation_default_mode);
+		category_specify_allocation_mode(c, (category_mode_t) q->allocation_default_mode);
 	}
 
 	return c;

work_queue/src/work_queue.h

@@ -95,30 +95,22 @@ typedef enum {
 
 /** Here we repeat the category_mode_t declaration but with work_queue names.
  * This is needed to generate uniform names in the API and bindings. */
-enum {
+typedef enum {
+/**< When monitoring is disabled, all tasks run as
+  WORK_QUEUE_ALLOCATION_MODE_FIXED. If monitoring is enabled and resource
+  exhaustion occurs: */
     WORK_QUEUE_ALLOCATION_MODE_FIXED          = CATEGORY_ALLOCATION_MODE_FIXED,
+/**< If maximum values are specified for cores, memory,
+disk or gpus (either a user-label or category-label) and one of those resources
+is exceeded, the task fails.  Otherwise it is retried until a large enough
+worker connects to the manager, using the maximum values specified, and the
+maximum values so far seen for resources not specified. */
     WORK_QUEUE_ALLOCATION_MODE_MAX            = CATEGORY_ALLOCATION_MODE_MAX,
+/**< As above, but tasks are tried with an automatically computed first-allocation to minimize resource waste. */
     WORK_QUEUE_ALLOCATION_MODE_MIN_WASTE      = CATEGORY_ALLOCATION_MODE_MIN_WASTE,
+/**< As above, but maximizing throughput. */
     WORK_QUEUE_ALLOCATION_MODE_MAX_THROUGHPUT = CATEGORY_ALLOCATION_MODE_MAX_THROUGHPUT
-};
-
-// typedef enum {
-// /**< When monitoring is disabled, all tasks run as
-//   WORK_QUEUE_ALLOCATION_MODE_FIXED. If monitoring is enabled and resource
-//   exhaustion occurs: */
-// 	WORK_QUEUE_ALLOCATION_MODE_FIXED = 0,   /**< Task fails. (default) */
-// 	WORK_QUEUE_ALLOCATION_MODE_MAX,         /**< If maximum values are specified for cores, memory,
-// 											  disk or gpus (either a user-label or category-label) and
-// 											  one of those resources is exceeded, the task fails.
-// 											  Otherwise it is retried until a large enough worker
-// 											  connects to the manager, using the maximum values
-// 											  specified, and the maximum values so far seen for
-// 											  resources not specified. */
-// 
-// 	WORK_QUEUE_ALLOCATION_MODE_MIN_WASTE,   /**< As above, but tasks are tried with an automatically
-// 											  computed first-allocation to minimize resource waste. */
-// 	WORK_QUEUE_ALLOCATION_MODE_MAX_THROUGHPUT /**< As above, but maximizing throughput. */
-// } wq_category_mode_t;
+} work_queue_category_mode_t;
 
 
 extern int wq_option_scheduler;	               /**< Initial setting for algorithm to assign tasks to
@@ -864,10 +856,10 @@ int work_queue_specify_draining_by_hostname(struct work_queue *q, const char *ho
 /** Turn on or off first-allocation labeling for a given category. By default, cores, memory, and disk are labeled, and gpus are unlabeled. Turn on/off other specific resources use @ref work_queue_enable_category_resource
 @param q A work queue object.
 @param category A category name.
-@param mode     One of @ref category_mode_t.
+@param mode     One of @ref work_queue_category_mode_t.
 @returns 1 if mode is valid, 0 otherwise.
 */
-int work_queue_specify_category_mode(struct work_queue *q, const char *category, category_mode_t mode);
+int work_queue_specify_category_mode(struct work_queue *q, const char *category, work_queue_category_mode_t mode);
 
 /** Turn on or off first-allocation labeling for a given category and resource. This function should be use to fine-tune the defaults from @ref work_queue_specify_category_mode.
 @param q A work queue object.