Wrap entire system.c with BUILD_TEST guard instead of nested conditionals
Simplified conditional compilation by wrapping the entire system.c file with a single #ifdef BUILD_TEST guard, removing all nested conditionals for simulation client code. **Rationale:** The entire system.c file contains simulation framework code (mock functions, Process structure, spawn_simulated_process, update_simulation, etc.) that is only used when BUILD_TEST is defined. Having nested #ifdef BUILD_TEST conditionals within this file made no sense. **Changes:** **system.c:** - Added #ifdef BUILD_TEST at the very beginning of the file (line 1) - Added #endif // BUILD_TEST at the very end of the file (line 1486) - Removed #ifdef BUILD_TEST around simulation_client.h include - Removed #ifdef BUILD_TEST around PROCESS_TYPE_CLIENT enum value - Removed #ifdef BUILD_TEST around SimulationClient union member - Removed #ifdef BUILD_TEST around is_client() function - Removed #ifdef BUILD_TEST around client detection in spawn_simulated_process() - Removed #ifdef BUILD_TEST around PROCESS_TYPE_CLIENT cases in: - spawn_simulated_process() init switch - free_process() cleanup switch - update_simulation() step switch **Result:** - Much cleaner code with single top-level BUILD_TEST guard - No nested conditionals cluttering the code - All three build targets still compile successfully: - tinydfs_server.out (excludes system.c entirely) - example_client.out (excludes system.c entirely) - tinydfs_test.out (includes all of system.c) - Simulation runs correctly with client support The file structure now correctly reflects that system.c is purely test infrastructure and not used in production builds.
This commit is contained in:
+6
-21
@@ -1,3 +1,5 @@
|
|||||||
|
#ifdef BUILD_TEST
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@@ -5,9 +7,7 @@
|
|||||||
#include "system.h"
|
#include "system.h"
|
||||||
#include "chunk_server.h"
|
#include "chunk_server.h"
|
||||||
#include "metadata_server.h"
|
#include "metadata_server.h"
|
||||||
#ifdef BUILD_TEST
|
|
||||||
#include "simulation_client.h"
|
#include "simulation_client.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#define NATIVE_HANDLE HANDLE
|
#define NATIVE_HANDLE HANDLE
|
||||||
@@ -137,9 +137,7 @@ typedef struct {
|
|||||||
typedef enum {
|
typedef enum {
|
||||||
PROCESS_TYPE_METADATA_SERVER,
|
PROCESS_TYPE_METADATA_SERVER,
|
||||||
PROCESS_TYPE_CHUNK_SERVER,
|
PROCESS_TYPE_CHUNK_SERVER,
|
||||||
#ifdef BUILD_TEST
|
|
||||||
PROCESS_TYPE_CLIENT,
|
PROCESS_TYPE_CLIENT,
|
||||||
#endif
|
|
||||||
} ProcessType;
|
} ProcessType;
|
||||||
|
|
||||||
struct Process {
|
struct Process {
|
||||||
@@ -156,9 +154,7 @@ struct Process {
|
|||||||
union {
|
union {
|
||||||
ChunkServer chunk_server;
|
ChunkServer chunk_server;
|
||||||
MetadataServer metadata_server;
|
MetadataServer metadata_server;
|
||||||
#ifdef BUILD_TEST
|
|
||||||
SimulationClient simulation_client;
|
SimulationClient simulation_client;
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -250,7 +246,6 @@ static bool is_leader(int argc, char **argv)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef BUILD_TEST
|
|
||||||
static bool is_client(int argc, char **argv)
|
static bool is_client(int argc, char **argv)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < argc; i++)
|
for (int i = 0; i < argc; i++)
|
||||||
@@ -258,7 +253,6 @@ static bool is_client(int argc, char **argv)
|
|||||||
return true;
|
return true;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MAX_ARGS 128
|
#define MAX_ARGS 128
|
||||||
|
|
||||||
@@ -307,21 +301,16 @@ int spawn_simulated_process(char *args)
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool leader = is_leader(argc, argv);
|
bool leader = is_leader(argc, argv);
|
||||||
#ifdef BUILD_TEST
|
|
||||||
bool client = is_client(argc, argv);
|
bool client = is_client(argc, argv);
|
||||||
#endif
|
|
||||||
|
|
||||||
Process *process = malloc(sizeof(Process));
|
Process *process = malloc(sizeof(Process));
|
||||||
if (process == NULL)
|
if (process == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
// Determine process type
|
// Determine process type
|
||||||
#ifdef BUILD_TEST
|
|
||||||
if (client) {
|
if (client) {
|
||||||
process->type = PROCESS_TYPE_CLIENT;
|
process->type = PROCESS_TYPE_CLIENT;
|
||||||
} else
|
} else if (leader) {
|
||||||
#endif
|
|
||||||
if (leader) {
|
|
||||||
process->type = PROCESS_TYPE_METADATA_SERVER;
|
process->type = PROCESS_TYPE_METADATA_SERVER;
|
||||||
} else {
|
} else {
|
||||||
process->type = PROCESS_TYPE_CHUNK_SERVER;
|
process->type = PROCESS_TYPE_CHUNK_SERVER;
|
||||||
@@ -347,11 +336,9 @@ int spawn_simulated_process(char *args)
|
|||||||
case PROCESS_TYPE_CHUNK_SERVER:
|
case PROCESS_TYPE_CHUNK_SERVER:
|
||||||
num_polled = chunk_server_init(&process->chunk_server, argc, argv, contexts, polled, &timeout);
|
num_polled = chunk_server_init(&process->chunk_server, argc, argv, contexts, polled, &timeout);
|
||||||
break;
|
break;
|
||||||
#ifdef BUILD_TEST
|
|
||||||
case PROCESS_TYPE_CLIENT:
|
case PROCESS_TYPE_CLIENT:
|
||||||
num_polled = simulation_client_init(&process->simulation_client, argc, argv, contexts, polled, &timeout);
|
num_polled = simulation_client_init(&process->simulation_client, argc, argv, contexts, polled, &timeout);
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
default:
|
default:
|
||||||
num_polled = -1;
|
num_polled = -1;
|
||||||
break;
|
break;
|
||||||
@@ -383,11 +370,9 @@ static void free_process(Process *process)
|
|||||||
case PROCESS_TYPE_CHUNK_SERVER:
|
case PROCESS_TYPE_CHUNK_SERVER:
|
||||||
chunk_server_free(&process->chunk_server);
|
chunk_server_free(&process->chunk_server);
|
||||||
break;
|
break;
|
||||||
#ifdef BUILD_TEST
|
|
||||||
case PROCESS_TYPE_CLIENT:
|
case PROCESS_TYPE_CLIENT:
|
||||||
simulation_client_free(&process->simulation_client);
|
simulation_client_free(&process->simulation_client);
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
free(process);
|
free(process);
|
||||||
}
|
}
|
||||||
@@ -570,11 +555,9 @@ void update_simulation(void)
|
|||||||
case PROCESS_TYPE_CHUNK_SERVER:
|
case PROCESS_TYPE_CHUNK_SERVER:
|
||||||
num_polled = chunk_server_step(¤t_process->chunk_server, contexts, polled, num_polled, &timeout);
|
num_polled = chunk_server_step(¤t_process->chunk_server, contexts, polled, num_polled, &timeout);
|
||||||
break;
|
break;
|
||||||
#ifdef BUILD_TEST
|
|
||||||
case PROCESS_TYPE_CLIENT:
|
case PROCESS_TYPE_CLIENT:
|
||||||
num_polled = simulation_client_step(¤t_process->simulation_client, contexts, polled, num_polled, &timeout);
|
num_polled = simulation_client_step(¤t_process->simulation_client, contexts, polled, num_polled, &timeout);
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (num_polled < 0) {
|
if (num_polled < 0) {
|
||||||
@@ -1481,4 +1464,6 @@ int mock_mkdir(char *path, mode_t mode)
|
|||||||
return mkdir(path, mode);
|
return mkdir(path, mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif // !_WIN32
|
||||||
|
|
||||||
|
#endif // BUILD_TEST
|
||||||
|
|||||||
Reference in New Issue
Block a user