chore: format internal header files

Jef Roosens 2023-02-02 16:14:26 +01:00 committed by Chewing_Bever
parent f3d5ad1c68
commit f2f69b47f8
Signed by: Jef Roosens
GPG Key ID: B75D4F293C7052DB
7 changed files with 73 additions and 40 deletions

5
.editorconfig 100644
View File

@ -0,0 +1,5 @@
root = true
[*.{c,h}]
indent_style = space
indent_size = 2

View File

@ -12,6 +12,7 @@ LIB := $(BUILD_DIR)/$(LIB_FILENAME)
SRCS != find '$(SRC_DIR)' -iname '*.c'
SRCS_H != find $(INC_DIRS) -iname '*.h'
SRCS_H_INTERNAL != find $(SRC_DIR) -iname '*.h'
SRCS_TEST != find '$(TEST_DIR)' -iname '*.c'
OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
@ -92,11 +93,11 @@ $(BUILD_DIR)/$(TEST_DIR)/%.c.o: $(TEST_DIR)/%.c
# =====MAINTENANCE=====
.PHONY: lint
lint:
clang-format -n --Werror $(SRCS) $(SRCS_H)
clang-format -n --Werror $(SRCS) $(SRCS_H) $(SRCS_H_INTERNAL)
.PHONY: fmt
fmt:
clang-format -i $(SRCS) $(SRCS_H)
clang-format -i $(SRCS) $(SRCS_H) $(SRCS_H_INTERNAL)
.PHONY: clean
clean:

View File

@ -1,9 +1,9 @@
#ifndef VIETER_JOB_QUEUE
#define VIETER_JOB_QUEUE
#include <stdint.h>
#include <stdbool.h>
#include "vieter_cron.h"
#include <stdbool.h>
#include <stdint.h>
/*
* The order of these do not imply that they happen in this order. New states
@ -12,21 +12,29 @@
* other things.
*/
typedef enum vieter_job_state {
vieter_job_queued = 0,
vieter_job_dispatched = 1,
vieter_job_finished = 2
vieter_job_state_queued = 0,
vieter_job_state_ready = 1,
vieter_job_state_build_finished = 2
} vieter_job_state;
// This macro should be kept in sync with the above enum
#define VIETER_JOB_STATES 3
typedef struct vieter_job {
int id;
uint64_t next_scheduled_time;
vieter_cron_expression *ce;
bool single;
vieter_job_state state;
uint64_t state_transition_times[VIETER_JOB_STATES];
int id;
uint64_t next_scheduled_time;
vieter_cron_expression *ce;
bool single;
vieter_job_state state;
uint64_t state_transition_times[VIETER_JOB_STATES];
bool dispatched;
void *build_config;
} vieter_job;
typedef struct vieter_job_queue vieter_job_queue;
vieter_job_queue *vieter_job_queue_init();
void vieter_job_queue_insert(int id);
#endif

View File

@ -5,16 +5,16 @@
#include <stdlib.h>
typedef struct vieter_heap_node {
uint64_t key;
void *data;
struct vieter_heap_node *largest_order;
union {
// Roots point to next tree in the heap, other nodes point to their first
// neighbour.
struct vieter_heap_node *next_tree;
struct vieter_heap_node *next_largest_order;
} ptr;
uint8_t order;
uint64_t key;
void *data;
struct vieter_heap_node *largest_order;
union {
// Roots point to next tree in the heap, other nodes point to their first
// neighbour.
struct vieter_heap_node *next_tree;
struct vieter_heap_node *next_largest_order;
} ptr;
uint8_t order;
} vieter_heap_node;
/*
@ -36,7 +36,8 @@ void vieter_heap_tree_free(vieter_heap_node *root);
* Given the roots of the smallest trees in two heaps, merge them into a single
* large heap.
*/
vieter_heap_node *vieter_heap_tree_merge(vieter_heap_node *root_a, vieter_heap_node *root_b);
vieter_heap_node *vieter_heap_tree_merge(vieter_heap_node *root_a,
vieter_heap_node *root_b);
/*
* Given the roots of two trees of the same order, merge them into a heap of one

View File

@ -0,0 +1,10 @@
#ifndef VIETER_JOB_QUEUE_INTERNAL
#define VIETER_JOB_QUEUE_INTERNAL
#include "vieter_tree.h"
struct vieter_job_queue {
vieter_tree *tree;
};
#endif

View File

@ -16,7 +16,7 @@ struct vieter_tree {
bool vieter_tree_validate(vieter_tree *tree);
struct vieter_tree_iterator {
vieter_tree_node *current_node;
bool started;
bool done;
vieter_tree_node *current_node;
bool started;
bool done;
};

View File

@ -2,8 +2,8 @@
#define VIETER_TREE_NODE
#include "vieter_tree.h"
#include <stdint.h>
#include <stdbool.h>
#include <stdint.h>
typedef enum vieter_tree_node_flag {
vieter_tree_node_black = ((uint8_t)1) << 0,
@ -13,11 +13,11 @@ typedef enum vieter_tree_node_flag {
} vieter_tree_node_flag;
typedef struct vieter_tree_node {
uint64_t key;
void *data;
struct vieter_tree_node *parent;
struct vieter_tree_node *children[2];
uint8_t flags;
uint64_t key;
void *data;
struct vieter_tree_node *parent;
struct vieter_tree_node *children[2];
uint8_t flags;
} vieter_tree_node;
/*
@ -33,27 +33,33 @@ void vieter_tree_node_free(vieter_tree_node *node);
/*
* Insert a new key into the given tree.
*/
vieter_tree_error vieter_tree_node_insert(vieter_tree_node *root, uint64_t key, void *data);
vieter_tree_error vieter_tree_node_insert(vieter_tree_node *root, uint64_t key,
void *data);
/*
* Return the node representing the requested value.
*/
vieter_tree_error vieter_tree_node_search_node(vieter_tree_node **out, vieter_tree_node *root, uint64_t key);
vieter_tree_error vieter_tree_node_search_node(vieter_tree_node **out,
vieter_tree_node *root,
uint64_t key);
/*
* Search for the data represented by the given key.
*/
vieter_tree_error vieter_tree_node_search(void **out, vieter_tree_node *root, uint64_t key);
vieter_tree_error vieter_tree_node_search(void **out, vieter_tree_node *root,
uint64_t key);
/*
* Remove the data associated with the given key.
*/
vieter_tree_error vieter_tree_node_remove(void **out, vieter_tree_node **root_ptr, uint64_t key);
vieter_tree_error
vieter_tree_node_remove(void **out, vieter_tree_node **root_ptr, uint64_t key);
/*
* Set a node's bit flag to the given value.
*/
void vieter_tree_node_set(vieter_tree_node *node, vieter_tree_node_flag flag, bool value);
void vieter_tree_node_set(vieter_tree_node *node, vieter_tree_node_flag flag,
bool value);
/*
* Get whether a node's bit flag is set.
@ -70,12 +76,14 @@ void vieter_tree_node_add_child(vieter_tree_node *parent, uint64_t key,
/*
* Replace a node's children array.
*/
void vieter_tree_node_set_children(vieter_tree_node *parent, vieter_tree_node **children);
void vieter_tree_node_set_children(vieter_tree_node *parent,
vieter_tree_node **children);
/*
* Set a node's left or right child to the given node.
*/
void vieter_tree_node_set_child(vieter_tree_node *parent, vieter_tree_node *child, bool right);
void vieter_tree_node_set_child(vieter_tree_node *parent,
vieter_tree_node *child, bool right);
/*
* Return the in-order successor of the given node, or NULL if it's the last