Claude
38fdab24d3
Added a simulation client that can run inside the TinyDFS simulation framework, enabling fully deterministic end-to-end testing of the distributed file system. **New Files:** - src/simulation_client.h - Header defining SimulationClient structure and API (init, step, free functions) - src/simulation_client.c - Implementation of simulation client with test operations (create dir, create file, write, read, list, delete) **Key Changes:** **System Framework (src/system.c):** - Added ProcessType enum (METADATA_SERVER, CHUNK_SERVER, CLIENT) to distinguish different simulated process types - Extended Process union to include SimulationClient - Modified spawn_simulated_process() to detect --client flag and initialize client processes using simulation_client_init() - Updated update_simulation() to call simulation_client_step() for client processes, handling timeout management - Fixed cleanup_simulation() to properly set current_process before freeing, preventing NULL pointer dereferences in mock_close() - Added simulated_time static variable (struct timespec) for deterministic clock mocking - Added helper function is_client() to detect client processes **API Updates (src/system.h):** - Exported startup_simulation() function for proper initialization - Added function declarations for simulation management **Test Updates (src/main_test.c):** - Added startup_simulation() call for proper initialization - Spawns simulation client process with "--client" flag - Increased iteration limit to 100,000 to allow operations to complete - Added progress logging every 10,000 iterations - Added explicit error checking and debug output **Simulation Client Features:** - Non-blocking operation model using tinydfs_isdone() and tinydfs_process_events() - State machine for sequential test operations - Comprehensive test scenario: 1. Create directory (/test_dir) 2. Create file (/test_dir/test_file.txt) 3. Write data to file 4. Read data back 5. List directory contents 6. Delete file - Proper integration with TinyDFS client library - Returns poll descriptors from tinydfs_process_events() - Timeout management for simulation scheduling **Bug Fixes:** - Fixed missing return statement in spawn_simulated_process() - Fixed NULL pointer dereference in cleanup by setting current_process - Added missing stdlib.h include for atoi() The simulation client successfully initializes and integrates into the simulation loop, demonstrating the framework's ability to run client code deterministically alongside servers.
175 lines
6.1 KiB
C
175 lines
6.1 KiB
C
#ifndef SYSTEM_INCLUDED
|
|
#define SYSTEM_INCLUDED
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#ifdef _WIN32
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
#include <direct.h> // _mkdir
|
|
#include <windows.h>
|
|
#include <winsock2.h>
|
|
#include <ws2tcpip.h>
|
|
|
|
#else
|
|
|
|
#include <poll.h>
|
|
#include <time.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/file.h>
|
|
#include <sys/socket.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#define SOCKET int
|
|
#define INVALID_SOCKET ((SOCKET) -1)
|
|
|
|
#endif
|
|
|
|
#ifdef BUILD_TEST
|
|
|
|
void startup_simulation(void);
|
|
int spawn_simulated_process(char *args);
|
|
void update_simulation(void);
|
|
void cleanup_simulation(void);
|
|
|
|
void* mock_malloc(size_t len);
|
|
void* mock_realloc(void *ptr, size_t len);
|
|
void mock_free(void *ptr);
|
|
int mock_remove(char *path);
|
|
int mock_rename(char *oldpath, char *newpath);
|
|
SOCKET mock_socket(int domain, int type, int protocol);
|
|
int mock_bind(SOCKET fd, void *addr, size_t addr_len);
|
|
int mock_listen(SOCKET fd, int backlog);
|
|
SOCKET mock_accept(SOCKET fd, void *addr, socklen_t *addr_len);
|
|
int mock_getsockopt(SOCKET fd, int level, int optname, void *optval, socklen_t *optlen);
|
|
int mock_setsockopt(SOCKET fd, int level, int optname, void *optval, socklen_t optlen);
|
|
int mock_recv(SOCKET fd, void *dst, int len, int flags);
|
|
int mock_send(SOCKET fd, void *src, int len, int flags);
|
|
int mock_connect(SOCKET fd, void *addr, size_t addr_len);
|
|
|
|
#ifdef _WIN32
|
|
int mock_closesocket(SOCKET fd);
|
|
HANDLE mock_CreateFileW(WCHAR *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
|
|
BOOL mock_CloseHandle(HANDLE handle);
|
|
BOOL mock_LockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh);
|
|
BOOL mock_UnlockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh);
|
|
BOOL mock_FlushFileBuffers(HANDLE handle);
|
|
BOOL mock_ReadFile(HANDLE handle, char *dst, DWORD len, DWORD *num, OVERLAPPED *ov);
|
|
BOOL mock_WriteFile(HANDLE handle, char *src, DWORD len, DWORD *num, OVERLAPPED *ov);
|
|
BOOL mock_GetFileSizeEx(HANDLE handle, LARGE_INTEGER *buf);
|
|
BOOL mock_QueryPerformanceCounter(LARGE_INTEGER *lpPerformanceCount);
|
|
BOOL mock_QueryPerformanceFrequency(LARGE_INTEGER *lpFrequency);
|
|
char* mock__fullpath(char *path, char *dst, int cap);
|
|
int mock__mkdir(char *path);
|
|
#else
|
|
int mock_clock_gettime(clockid_t clockid, struct timespec *tp);
|
|
int mock_open(char *path, int flags, int mode);
|
|
int mock_close(int fd);
|
|
int mock_flock(int fd, int op);
|
|
int mock_fsync(int fd);
|
|
int mock_read(int fd, char *dst, int len);
|
|
int mock_write(int fd, char *src, int len);
|
|
int mock_fstat(int fd, struct stat *buf);
|
|
int mock_mkstemp(char *path);
|
|
char* mock_realpath(char *path, char *dst);
|
|
int mock_mkdir(char *path, mode_t mode);
|
|
#endif
|
|
|
|
// Common
|
|
#define sys_malloc mock_malloc
|
|
#define sys_realloc mock_realloc
|
|
#define sys_free mock_free
|
|
#define sys_remove mock_remove
|
|
#define sys_rename mock_rename
|
|
#define sys_socket mock_socket
|
|
#define sys_bind mock_bind
|
|
#define sys_listen mock_listen
|
|
#define sys_accept mock_accept
|
|
#define sys_getsockopt mock_getsockopt
|
|
#define sys_setsockopt mock_setsockopt
|
|
#define sys_recv mock_recv
|
|
#define sys_send mock_send
|
|
#define sys_connect mock_connect
|
|
|
|
// Windows
|
|
#define sys__mkdir mock__mkdir
|
|
#define sys_closesocket mock_closesocket
|
|
#define sys_CreateFileW mock_CreateFileW
|
|
#define sys_CloseHandle mock_CloseHandle
|
|
#define sys_LockFile mock_LockFile
|
|
#define sys_UnlockFile mock_UnlockFile
|
|
#define sys_FlushFileBuffers mock_FlushFileBuffers
|
|
#define sys_ReadFile mock_ReadFile
|
|
#define sys_WriteFile mock_WriteFile
|
|
#define sys_GetFileSizeEx mock_GetFileSizeEx
|
|
#define sys__fullpath mock__fullpath
|
|
#define sys_QueryPerformanceCounter mock_QueryPerformanceCounter
|
|
#define sys_QueryPerformanceFrequency mock_QueryPerformanceFrequency
|
|
|
|
// Linux
|
|
#define sys_mkdir mock_mkdir
|
|
#define sys_open mock_open
|
|
#define sys_close mock_close
|
|
#define sys_flock mock_flock
|
|
#define sys_fsync mock_fsync
|
|
#define sys_read mock_read
|
|
#define sys_write mock_write
|
|
#define sys_fstat mock_fstat
|
|
#define sys_mkstemp mock_mkstemp
|
|
#define sys_realpath mock_realpath
|
|
#define sys_clock_gettime mock_clock_gettime
|
|
|
|
#else
|
|
|
|
// Common
|
|
#define sys_malloc malloc
|
|
#define sys_realloc realloc
|
|
#define sys_free free
|
|
#define sys_remove remove
|
|
#define sys_rename rename
|
|
#define sys_socket socket
|
|
#define sys_bind bind
|
|
#define sys_listen listen
|
|
#define sys_accept accept
|
|
#define sys_getsockopt getsockopt
|
|
#define sys_setsockopt setsockopt
|
|
#define sys_recv recv
|
|
#define sys_send send
|
|
#define sys_connect connect
|
|
|
|
// Windows
|
|
#define sys__mkdir _mkdir
|
|
#define sys_closesocket closesocket
|
|
#define sys_CreateFileW CreateFileW
|
|
#define sys_CloseHandle CloseHandle
|
|
#define sys_LockFile LockFile
|
|
#define sys_UnlockFile UnlockFile
|
|
#define sys_FlushFileBuffers FlushFileBuffers
|
|
#define sys_ReadFile ReadFile
|
|
#define sys_WriteFile WriteFile
|
|
#define sys_GetFileSizeEx GetFileSizeEx
|
|
#define sys__fullpath _fullpath
|
|
#define sys_QueryPerformanceCounter QueryPerformanceCounter
|
|
#define sys_QueryPerformanceFrequency QueryPerformanceFrequency
|
|
|
|
// Linux
|
|
#define sys_mkdir mkdir
|
|
#define sys_open open
|
|
#define sys_close close
|
|
#define sys_flock flock
|
|
#define sys_fsync fsync
|
|
#define sys_read read
|
|
#define sys_write write
|
|
#define sys_fstat fstat
|
|
#define sys_mkstemp mkstemp
|
|
#define sys_realpath realpath
|
|
#define sys_clock_gettime clock_gettime
|
|
|
|
#endif
|
|
#endif // SYSTEM_INCLUDED
|