cozis/ToastyFS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add second client to the simulation

Browse Source
This commit is contained in:
cozis
2026-01-24 11:23:19 +01:00
parent 3d44676a96
commit 18817203bf
2 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quakey/src/quakey.c
+11 -11
View File
@@ -1547,17 +1547,17 @@ static int mockfs_to_quakey_error(int err)
{ {
switch (err) { switch (err) {
case 0: return 0; case 0: return 0;
case MOCKFS_ERRNO_NOENT : return HOST_ERROR_NOENT; case MOCKFS_ERRNO_NOENT : return HOST_ERROR_NOENT;
case MOCKFS_ERRNO_PERM : return HOST_ERROR_PERM; case MOCKFS_ERRNO_PERM : return HOST_ERROR_PERM;
case MOCKFS_ERRNO_NOMEM : return HOST_ERROR_NOMEM; case MOCKFS_ERRNO_NOMEM : return HOST_ERROR_NOMEM;
case MOCKFS_ERRNO_NOTDIR: return HOST_ERROR_NOTDIR; case MOCKFS_ERRNO_NOTDIR : return HOST_ERROR_NOTDIR;
case MOCKFS_ERRNO_ISDIR : return HOST_ERROR_ISDIR; case MOCKFS_ERRNO_ISDIR : return HOST_ERROR_ISDIR;
case MOCKFS_ERRNO_INVAL : return HOST_ERROR_BADARG; case MOCKFS_ERRNO_INVAL : return HOST_ERROR_BADARG;
case MOCKFS_ERRNO_NOTEMPTY: return HOST_ERROR_NOTEMPTY; case MOCKFS_ERRNO_NOTEMPTY : return HOST_ERROR_NOTEMPTY;
case MOCKFS_ERRNO_NOSPC : return HOST_ERROR_NOSPC; case MOCKFS_ERRNO_NOSPC : return HOST_ERROR_NOSPC;
case MOCKFS_ERRNO_EXIST : return HOST_ERROR_EXIST; case MOCKFS_ERRNO_EXIST : return HOST_ERROR_EXIST;
case MOCKFS_ERRNO_BUSY : return HOST_ERROR_BUSY; case MOCKFS_ERRNO_BUSY : return HOST_ERROR_BUSY;
case MOCKFS_ERRNO_BADF : return HOST_ERROR_BADF; case MOCKFS_ERRNO_BADF : return HOST_ERROR_BADF;
default: default:
printf("Unexpected mockfs errno %d\n", err); printf("Unexpected mockfs errno %d\n", err);
assert(0); assert(0);
src/main.c
+27 -11
View File
@@ -128,10 +128,10 @@ int main(void)
if (ret < 0) if (ret < 0)
return -1; return -1;
// Client // Client 1
{ {
QuakeySpawn config = { QuakeySpawn config = {
.name = "client", .name = "client 1",
.state_size = sizeof(RandomClient), .state_size = sizeof(RandomClient),
.init_func = random_client_init, .init_func = random_client_init,
.tick_func = random_client_tick, .tick_func = random_client_tick,
@@ -141,7 +141,23 @@ int main(void)
.disk_size = 10<<20, .disk_size = 10<<20,
.platform = QUAKEY_LINUX, .platform = QUAKEY_LINUX,
}; };
quakey_spawn(quakey, config, "cli --server 127.0.0.3 8080"); quakey_spawn(quakey, config, "cli --server 127.0.0.4 8080");
}
// Client 2
{
QuakeySpawn config = {
.name = "client 2",
.state_size = sizeof(RandomClient),
.init_func = random_client_init,
.tick_func = random_client_tick,
.free_func = random_client_free,
.addrs = (char*[]) { "127.0.0.3" },
.num_addrs = 1,
.disk_size = 10<<20,
.platform = QUAKEY_LINUX,
};
quakey_spawn(quakey, config, "cli --server 127.0.0.4 8080");
} }
// Metadata Server // Metadata Server
@@ -152,12 +168,12 @@ int main(void)
.init_func = metadata_server_init, .init_func = metadata_server_init,
.tick_func = metadata_server_tick, .tick_func = metadata_server_tick,
.free_func = metadata_server_free, .free_func = metadata_server_free,
.addrs = (char*[]) { "127.0.0.3" }, .addrs = (char*[]) { "127.0.0.4" },
.num_addrs = 1, .num_addrs = 1,
.disk_size = 10<<20, .disk_size = 10<<20,
.platform = QUAKEY_LINUX, .platform = QUAKEY_LINUX,
}; };
quakey_spawn(quakey, config, "ms --addr 127.0.0.3 --port 8080"); quakey_spawn(quakey, config, "ms --addr 127.0.0.4 --port 8080");
} }
// Chunk Server 1 // Chunk Server 1
@@ -168,12 +184,12 @@ int main(void)
.init_func = chunk_server_init, .init_func = chunk_server_init,
.tick_func = chunk_server_tick, .tick_func = chunk_server_tick,
.free_func = chunk_server_free, .free_func = chunk_server_free,
.addrs = (char*[]) { "127.0.0.4" }, .addrs = (char*[]) { "127.0.0.5" },
.num_addrs = 1, .num_addrs = 1,
.disk_size = 10<<20, .disk_size = 10<<20,
.platform = QUAKEY_LINUX, .platform = QUAKEY_LINUX,
}; };
quakey_spawn(quakey, config, "cs --addr 127.0.0.4 --port 8081 --remote-addr 127.0.0.3 --remote-port 8080"); quakey_spawn(quakey, config, "cs --addr 127.0.0.5 --port 8081 --remote-addr 127.0.0.4 --remote-port 8080");
} }
// Chunk Server 2 // Chunk Server 2
@@ -184,12 +200,12 @@ int main(void)
.init_func = chunk_server_init, .init_func = chunk_server_init,
.tick_func = chunk_server_tick, .tick_func = chunk_server_tick,
.free_func = chunk_server_free, .free_func = chunk_server_free,
.addrs = (char*[]) { "127.0.0.5" }, .addrs = (char*[]) { "127.0.0.6" },
.num_addrs = 1, .num_addrs = 1,
.disk_size = 10<<20, .disk_size = 10<<20,
.platform = QUAKEY_LINUX, .platform = QUAKEY_LINUX,
}; };
quakey_spawn(quakey, config, "cs --addr 127.0.0.5 --port 8082 --remote-addr 127.0.0.3 --remote-port 8080"); quakey_spawn(quakey, config, "cs --addr 127.0.0.6 --port 8082 --remote-addr 127.0.0.4 --remote-port 8080");
} }
// Chunk Server 3 // Chunk Server 3
@@ -200,12 +216,12 @@ int main(void)
.init_func = chunk_server_init, .init_func = chunk_server_init,
.tick_func = chunk_server_tick, .tick_func = chunk_server_tick,
.free_func = chunk_server_free, .free_func = chunk_server_free,
.addrs = (char*[]) { "127.0.0.6" }, .addrs = (char*[]) { "127.0.0.7" },
.num_addrs = 1, .num_addrs = 1,
.disk_size = 10<<20, .disk_size = 10<<20,
.platform = QUAKEY_LINUX, .platform = QUAKEY_LINUX,
}; };
quakey_spawn(quakey, config, "cs --addr 127.0.0.6 --port 8083 --remote-addr 127.0.0.3 --remote-port 8080"); quakey_spawn(quakey, config, "cs --addr 127.0.0.7 --port 8083 --remote-addr 127.0.0.4 --remote-port 8080");
} }
while (simulation_running) while (simulation_running)