From 9d5223ec6eeb5b3d6c8f4024b1c28e5ea8f5b285 Mon Sep 17 00:00:00 2001 From: ax-6 Date: Fri, 16 Aug 2024 03:32:57 +0800 Subject: [PATCH] Updated a version that has some unknown bugs. Not complete. --- aq/CMakeLists.txt | 2 + aqvm/base/base.c | 4 +- aqvm/base/file/CMakeLists.txt | 20 +- aqvm/base/file/file.c | 154 +++++++------- aqvm/base/file/identifier/identifier.c | 24 ++- aqvm/base/file/identifier/identifier.h | 5 +- aqvm/base/file/identifier/unix/identifier.c | 17 +- aqvm/base/file/identifier/unix/identifier.h | 5 +- .../base/file/identifier/windows/identifier.c | 21 +- .../base/file/identifier/windows/identifier.h | 5 +- .../file/read_write_lock/read_write_lock.c | 22 +- aqvm/base/file/unix/CMakeLists.txt | 11 + aqvm/base/file/unix/file.c | 17 ++ aqvm/base/file/unix/file.h | 17 ++ aqvm/base/file/windows/file.c | 5 +- aqvm/base/file/windows/file.h | 4 +- aqvm/base/hash/hash.c | 6 +- aqvm/base/hash/table/table.c | 8 +- aqvm/base/io/io.c | 188 +++++++++--------- aqvm/base/linked_list/linked_list.c | 30 +-- aqvm/base/logging/logging.c | 8 +- aqvm/base/memory/memory.c | 4 +- aqvm/base/process/file_lock/file_lock.c | 12 +- aqvm/base/process/file_lock/unix/file_lock.c | 10 +- .../process/file_lock/windows/file_lock.c | 12 +- aqvm/base/threading/file_lock/file_lock.c | 19 +- aqvm/base/threading/mutex/mutex.c | 32 +-- aqvm/base/threading/mutex/mutex.h | 2 +- aqvm/base/threading/mutex/unix/mutex.c | 20 +- aqvm/base/threading/mutex/windows/mutex.c | 22 +- aqvm/base/time/time.c | 98 ++++----- aqvm/base/time/unix/time.c | 30 +-- aqvm/base/time/windows/time.c | 26 +-- 33 files changed, 464 insertions(+), 396 deletions(-) create mode 100644 aqvm/base/file/unix/CMakeLists.txt create mode 100644 aqvm/base/file/unix/file.c create mode 100644 aqvm/base/file/unix/file.h diff --git a/aq/CMakeLists.txt b/aq/CMakeLists.txt index a5005cc..ca94d1a 100644 --- a/aq/CMakeLists.txt +++ b/aq/CMakeLists.txt @@ -8,6 +8,8 @@ include_directories(${PROJECT_SOURCE_DIR}) set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/aq.c) +SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) + add_executable(aq ${SOURCES}) target_link_libraries(aq PRIVATE Aqvm) \ No newline at end of file diff --git a/aqvm/base/base.c b/aqvm/base/base.c index 887b022..7d53722 100644 --- a/aqvm/base/base.c +++ b/aqvm/base/base.c @@ -11,7 +11,7 @@ int AqvmBase_InitilizeBase() { if (AqvmBaseIo_InitializeIo() != 0) { - // TODO + // TODO(logging) return -1; } return 0; @@ -19,7 +19,7 @@ int AqvmBase_InitilizeBase() { int AqvmBase_CloseBase() { if (AqvmBaseIo_CloseIo() != 0) { - // TODO + // TODO(logging) return -1; } return 0; diff --git a/aqvm/base/file/CMakeLists.txt b/aqvm/base/file/CMakeLists.txt index 8a74732..f411ca0 100644 --- a/aqvm/base/file/CMakeLists.txt +++ b/aqvm/base/file/CMakeLists.txt @@ -8,18 +8,22 @@ include_directories(${PROJECT_SOURCE_DIR}) set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/file.c) -if (WIN32) +add_subdirectory(identifier) + +if(UNIX) +add_subdirectory(unix) +elseif (WIN32) add_subdirectory(windows) endif() -add_subdirectory(identifier) - add_library(AqvmBaseFile STATIC ${SOURCES}) -if (WIN32) -target_link_libraries(AqvmBaseFile PRIVATE AqvmBaseFileWindows) -endif() - target_link_libraries(AqvmBaseFile PRIVATE AqvmBaseFileIdentifier) target_link_libraries(AqvmBaseFile PRIVATE AqvmBaseMemory) -target_link_libraries(AqvmBaseFile PRIVATE AqvmBaseThreadingFileLock) \ No newline at end of file +target_link_libraries(AqvmBaseFile PRIVATE AqvmBaseThreadingFileLock) + +if(UNIX) +target_link_libraries(AqvmBaseFile PRIVATE AqvmBaseFileUnix) +elseif (WIN32) +target_link_libraries(AqvmBaseFile PRIVATE AqvmBaseFileWindows) +endif() \ No newline at end of file diff --git a/aqvm/base/file/file.c b/aqvm/base/file/file.c index eb41683..bc68667 100644 --- a/aqvm/base/file/file.c +++ b/aqvm/base/file/file.c @@ -15,13 +15,13 @@ int AqvmBaseFile_LockFile(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } /*int result = AqvmBaseThreadingMutex_LockMutex(&stream->mutex); if (result != 0) { - // TODO + // TODO(logging) return -2; }*/ return 0; @@ -29,13 +29,13 @@ int AqvmBaseFile_LockFile(struct AqvmBaseFile_File* stream) { int AqvmBaseFile_UnlockFile(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } /*int result = AqvmBaseThreadingMutex_UnlockMutex(&stream->mutex); if (result != 0) { - // TODO + // TODO(logging) return -2; }*/ return 0; @@ -43,22 +43,22 @@ int AqvmBaseFile_UnlockFile(struct AqvmBaseFile_File* stream) { int AqvmBaseFile_LockStream(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (stream->file == stdin) { if (AqvmBaseThreadingMutex_LockMutex(AqvmBaseIo_inputMutex) != 0) { - // TODO + // TODO(logging) return -2; } } else if (stream->file == stdout || stream->file == stderr) { if (AqvmBaseThreadingMutex_LockMutex(AqvmBaseIo_outputMutex) != 0) { - // TODO + // TODO(logging) return -3; } } else { if (AqvmBaseProcessFileLock_LockFile(stream) != 0) { - // TODO + // TODO(logging) return -4; } } @@ -68,22 +68,22 @@ int AqvmBaseFile_LockStream(struct AqvmBaseFile_File* stream) { int AqvmBaseFile_UnlockStream(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (stream->file == stdin) { if (AqvmBaseThreadingMutex_UnlockMutex(AqvmBaseIo_inputMutex) != 0) { - // TODO + // TODO(logging) return -2; } } else if (stream->file == stdout || stream->file == stderr) { if (AqvmBaseThreadingMutex_UnlockMutex(AqvmBaseIo_outputMutex) != 0) { - // TODO + // TODO(logging) return -3; } } else { if (AqvmBaseProcessFileLock_UnlockFile(stream) != 0) { - // TODO + // TODO(logging) return -4; } } @@ -93,15 +93,15 @@ int AqvmBaseFile_UnlockStream(struct AqvmBaseFile_File* stream) { int AqvmBaseFile_CheckStream(struct AqvmBaseFile_File* stream) { if (stream == NULL) { - // TODO + // TODO(logging) return -1; } if (stream->file == NULL) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseFile_ferror(stream) != 0) { - // TODO + // TODO(logging) return -3; } @@ -110,7 +110,7 @@ int AqvmBaseFile_CheckStream(struct AqvmBaseFile_File* stream) { void AqvmBaseFile_clearerr(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return; } @@ -119,21 +119,21 @@ void AqvmBaseFile_clearerr(struct AqvmBaseFile_File* stream) { int AqvmBaseFile_fclose(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } int result = fclose(stream->file); AqvmBaseMemory_free(stream->identifier); if (AqvmBaseThreadingFileLock_RemoveFileLock(stream) != 0) { - // TODO + // TODO(logging) AqvmBaseMemory_free(stream); return -2; } AqvmBaseMemory_free(stream); if (result != 0) { - // TODO + // TODO(logging) return -3; } @@ -142,7 +142,7 @@ int AqvmBaseFile_fclose(struct AqvmBaseFile_File* stream) { int AqvmBaseFile_feof(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } @@ -152,7 +152,7 @@ int AqvmBaseFile_feof(struct AqvmBaseFile_File* stream) { int AqvmBaseFile_ferror(struct AqvmBaseFile_File* stream) { if (stream == NULL || stream->file == NULL) { - // TODO + // TODO(logging) return -1; } @@ -162,24 +162,24 @@ int AqvmBaseFile_ferror(struct AqvmBaseFile_File* stream) { int AqvmBaseFile_fflush(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -2; } int result = fflush(stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -3; } if (result < 0) { - // TODO + // TODO(logging) return -4; } @@ -188,23 +188,23 @@ int AqvmBaseFile_fflush(struct AqvmBaseFile_File* stream) { int AqvmBaseFile_fgetpos(struct AqvmBaseFile_File* stream, fpos_t* pos) { if (AqvmBaseFile_CheckStream(stream) != 0 || pos == NULL) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -2; } int result = fgetpos(stream->file, pos); if (result != 0) { - // TODO + // TODO(logging) return -3; } if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -4; } @@ -214,20 +214,20 @@ int AqvmBaseFile_fgetpos(struct AqvmBaseFile_File* stream, fpos_t* pos) { struct AqvmBaseFile_File* AqvmBaseFile_fopen(const char* filename, const char* mode) { if (filename == NULL || mode == NULL) { - // TODO + // TODO(logging) return NULL; } struct AqvmBaseFile_File* stream = (struct AqvmBaseFile_File*)AqvmBaseMemory_malloc(sizeof(struct AqvmBaseFile_File)); if (stream == NULL) { - // TODO + // TODO(logging) return NULL; } stream->identifier = (AqvmBaseFileIdentifier_Identifier*)AqvmBaseMemory_malloc( sizeof(AqvmBaseFileIdentifier_Identifier)); if (stream->identifier == NULL) { - // TODO + // TODO(logging) AqvmBaseMemory_free(stream); return NULL; } @@ -236,13 +236,13 @@ struct AqvmBaseFile_File* AqvmBaseFile_fopen(const char* filename, if (stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) { AqvmBaseMemory_free(stream->identifier); AqvmBaseMemory_free(stream); - // TODO + // TODO(logging) return NULL; } if (AqvmBaseFileIdentifier_GetIdentifier(filename, stream->identifier) != 0) { - // TODO + // TODO(logging) fclose(stream->file); AqvmBaseMemory_free(stream->identifier); AqvmBaseMemory_free(stream); @@ -262,19 +262,19 @@ struct AqvmBaseFile_File* AqvmBaseFile_fopen(const char* filename, size_t AqvmBaseFile_fread(void* ptr, size_t size, size_t nmemb, struct AqvmBaseFile_File* stream) { if (ptr == NULL || AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return 0; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return 0; } size_t result = fread(ptr, size, nmemb, stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return 0; } @@ -285,28 +285,28 @@ struct AqvmBaseFile_File* AqvmBaseFile_freopen( const char* filename, const char* mode, struct AqvmBaseFile_File* stream) { if (filename == NULL || mode == NULL || AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return NULL; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return NULL; } FILE* new_file = freopen(filename, mode, stream->file); if (new_file == NULL) { if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) } - // TODO + // TODO(logging) return NULL; } stream->file = new_file; if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return NULL; } @@ -316,24 +316,24 @@ struct AqvmBaseFile_File* AqvmBaseFile_freopen( int AqvmBaseFile_fseek(struct AqvmBaseFile_File* stream, long int offset, int whence) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -2; } int result = fseek(stream->file, offset, whence); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -3; } if (result != 0) { - // TODO + // TODO(logging) return -4; } @@ -342,24 +342,24 @@ int AqvmBaseFile_fseek(struct AqvmBaseFile_File* stream, long int offset, int AqvmBaseFile_fsetpos(struct AqvmBaseFile_File* stream, const fpos_t* pos) { if (AqvmBaseFile_CheckStream(stream) != 0 || pos == NULL) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -2; } int result = fsetpos(stream->file, pos); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -3; } if (result != 0) { - // TODO + // TODO(logging) return -4; } @@ -368,24 +368,24 @@ int AqvmBaseFile_fsetpos(struct AqvmBaseFile_File* stream, const fpos_t* pos) { long int AqvmBaseFile_ftell(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1L; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -1L; } long int result = ftell(stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -1L; } if (result == -1L) { - // TODO + // TODO(logging) return -1L; } @@ -395,19 +395,19 @@ long int AqvmBaseFile_ftell(struct AqvmBaseFile_File* stream) { size_t AqvmBaseFile_fwrite(const void* ptr, size_t size, size_t nmemb, struct AqvmBaseFile_File* stream) { if (ptr == NULL || AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return 0; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return 0; } size_t result = fwrite(ptr, size, nmemb, stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return 0; } @@ -416,13 +416,13 @@ size_t AqvmBaseFile_fwrite(const void* ptr, size_t size, size_t nmemb, int AqvmBaseFile_remove(const char* filename) { if (filename == NULL) { - // TODO + // TODO(logging) return -1; } int result = remove(filename); if (result != 0) { - // TODO + // TODO(logging) return -2; } return 0; @@ -430,13 +430,13 @@ int AqvmBaseFile_remove(const char* filename) { int AqvmBaseFile_rename(const char* old_filename, const char* new_filename) { if (old_filename == NULL || new_filename == NULL) { - // TODO + // TODO(logging) return -1; } int result = rename(old_filename, new_filename); if (result != 0) { - // TODO + // TODO(logging) return -2; } return 0; @@ -444,36 +444,36 @@ int AqvmBaseFile_rename(const char* old_filename, const char* new_filename) { void AqvmBaseFile_rewind(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return; } rewind(stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return; } } void AqvmBaseFile_setbuf(struct AqvmBaseFile_File* stream, char* buffer) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return; } setbuf(stream->file, buffer); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return; } } @@ -481,24 +481,24 @@ void AqvmBaseFile_setbuf(struct AqvmBaseFile_File* stream, char* buffer) { int AqvmBaseFile_setvbuf(struct AqvmBaseFile_File* stream, char* buffer, int mode, size_t size) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -2; } int result = setvbuf(stream->file, buffer, mode, size); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -3; } if (result != 0) { - // TODO + // TODO(logging) return -4; } @@ -509,26 +509,26 @@ struct AqvmBaseFile_File* AqvmBaseFile_tmpfile() { struct AqvmBaseFile_File* stream = (struct AqvmBaseFile_File*)AqvmBaseMemory_malloc(sizeof(struct AqvmBaseFile_File)); if (stream == NULL) { - // TODO + // TODO(logging) return NULL; } stream->file = tmpfile(); if (stream->file == NULL || AqvmBaseFile_ferror(stream) != 0) { AqvmBaseMemory_free(stream); - // TODO + // TODO(logging) return NULL; } stream->identifier = (AqvmBaseFileIdentifier_Identifier*)AqvmBaseMemory_malloc( sizeof(AqvmBaseFileIdentifier_Identifier)); if (stream->identifier == NULL) { - // TODO + // TODO(logging) fclose(stream->file); AqvmBaseMemory_free(stream); return NULL; } if (AqvmBaseThreadingFileLock_AddFileLock(stream) != 0) { - // TODO + // TODO(logging) fclose(stream->file); AqvmBaseMemory_free(stream->identifier); AqvmBaseMemory_free(stream); @@ -538,10 +538,10 @@ struct AqvmBaseFile_File* AqvmBaseFile_tmpfile() { } char* AqvmBaseFile_tmpnam(char* str) { - // TODO + // TODO(logging) char* result = tmpnam(str); if (result == NULL) { - // TODO + // TODO(logging) return NULL; } return result; diff --git a/aqvm/base/file/identifier/identifier.c b/aqvm/base/file/identifier/identifier.c index 1604ec3..b8214b3 100644 --- a/aqvm/base/file/identifier/identifier.c +++ b/aqvm/base/file/identifier/identifier.c @@ -15,24 +15,25 @@ #endif int AqvmBaseFileIdentifier_GetIdentifier( - const char* filename, AqvmBaseFileIdentifier_Identifier* identifier) { - if (filename == NULL || identifier == NULL) { - // TODO + const struct AqvmBaseFile_File* file, + AqvmBaseFileIdentifier_Identifier* identifier) { + if (file == NULL || file->file == NULL || identifier == NULL) { + // TODO(logging) return -1; } #ifdef __unix__ - if (AqvmBaseFileIdentifierUnix_GetIdentifier(filename, identifier) != 0) { - // TODO + if (AqvmBaseFileIdentifierUnix_GetIdentifier(file, identifier) != 0) { + // TODO(logging) return -2; } #elif _WIN32 - if (AqvmBaseFileIdentifierWindows_GetIdentifier(filename, identifier) != 0) { - // TODO + if (AqvmBaseFileIdentifierWindows_GetIdentifier(file, identifier) != 0) { + // TODO(logging) return -3; } #else - // TODO + // TODO(logging) return -4; #endif @@ -43,6 +44,7 @@ uint32_t AqvmBaseFileIdentifier_GetIdentifierHash( const AqvmBaseFileIdentifier_Identifier* identifier) { if (identifier == NULL) { // TODO + printf("%s %d\n", __FILE__, __LINE__); return 0; } @@ -51,7 +53,7 @@ uint32_t AqvmBaseFileIdentifier_GetIdentifierHash( #elif _WIN32 return AqvmBaseFileIdentifierWindows_GetIdentifierHash(identifier); #else - // TODO + // TODO(logging) return 0; #endif } @@ -60,7 +62,7 @@ bool AqvmBaseFileIdentifier_IsEqual( const AqvmBaseFileIdentifier_Identifier* identifier1, const AqvmBaseFileIdentifier_Identifier* identifier2) { if (identifier1 == NULL || identifier2 == NULL) { - // TODO + // TODO(logging) return false; } @@ -69,7 +71,7 @@ bool AqvmBaseFileIdentifier_IsEqual( #elif _WIN32 return AqvmBaseFileIdentifierWindows_IsEqual(identifier1, identifier2); #else - // TODO + // TODO(logging) return false; #endif } \ No newline at end of file diff --git a/aqvm/base/file/identifier/identifier.h b/aqvm/base/file/identifier/identifier.h index ee75fc2..004bc56 100644 --- a/aqvm/base/file/identifier/identifier.h +++ b/aqvm/base/file/identifier/identifier.h @@ -23,8 +23,11 @@ typedef AqvmBaseFileIdentifierWindows_Identifier typedef void AqvmBaseFileIdentifier_Identifier; #endif +struct AqvmBaseFile_File; + int AqvmBaseFileIdentifier_GetIdentifier( - const char* filename, AqvmBaseFileIdentifier_Identifier* identifier); + const struct AqvmBaseFile_File* file, + AqvmBaseFileIdentifier_Identifier* identifier); uint32_t AqvmBaseFileIdentifier_GetIdentifierHash( const AqvmBaseFileIdentifier_Identifier* identifier); diff --git a/aqvm/base/file/identifier/unix/identifier.c b/aqvm/base/file/identifier/unix/identifier.c index 385604f..d697330 100644 --- a/aqvm/base/file/identifier/unix/identifier.c +++ b/aqvm/base/file/identifier/unix/identifier.c @@ -8,19 +8,20 @@ #include #include +#include "aqvm/base/file/unix/file.h" #include "aqvm/base/hash/hash.h" int AqvmBaseFileIdentifierUnix_GetIdentifier( - const char* filename, AqvmBaseFileIdentifierUnix_Identifier* identifier) { - if (filename == NULL || identifier == NULL) { - // TODO + const struct AqvmBaseFile_File* file, + AqvmBaseFileIdentifierUnix_Identifier* identifier) { + if (file == NULL || file->file == NULL || identifier == NULL) { + // TODO(logging) return -1; } - struct stat st; - + struct stat st = AqvmBaseFileUnix_ConvertFileToStat(file); if (stat(filename, &st) != 0) { - // TODO + // TODO(logging) return -2; } @@ -33,7 +34,7 @@ int AqvmBaseFileIdentifierUnix_GetIdentifier( uint32_t AqvmBaseFileIdentifierUnix_GetIdentifierHash( const AqvmBaseFileIdentifierUnix_Identifier* identifier) { if (identifier == NULL) { - // TODO + // TODO(logging) return 0; } uint32_t hash[2]; @@ -48,7 +49,7 @@ bool AqvmBaseFileIdentifierUnix_IsEqual( const AqvmBaseFileIdentifierUnix_Identifier* identifier1, const AqvmBaseFileIdentifierUnix_Identifier* identifier2) { if (identifier1 == NULL || identifier2 == NULL) { - // TODO + // TODO(logging) return false; } diff --git a/aqvm/base/file/identifier/unix/identifier.h b/aqvm/base/file/identifier/unix/identifier.h index d541f43..d05ce28 100644 --- a/aqvm/base/file/identifier/unix/identifier.h +++ b/aqvm/base/file/identifier/unix/identifier.h @@ -11,13 +11,16 @@ #include #include +struct AqvmBaseFile_File; + typedef struct { dev_t st_dev; ino_t st_ino; } AqvmBaseFileIdentifierUnix_Identifier; int AqvmBaseFileIdentifierUnix_GetIdentifier( - const char* filename, AqvmBaseFileIdentifierUnix_Identifier* identifier); + const struct AqvmBaseFile_File* file, + AqvmBaseFileIdentifierUnix_Identifier* identifier); uint32_t AqvmBaseFileIdentifierUnix_GetIdentifierHash( const AqvmBaseFileIdentifierUnix_Identifier* identifier); diff --git a/aqvm/base/file/identifier/windows/identifier.c b/aqvm/base/file/identifier/windows/identifier.c index 6da341a..c9bc26a 100644 --- a/aqvm/base/file/identifier/windows/identifier.c +++ b/aqvm/base/file/identifier/windows/identifier.c @@ -7,20 +7,21 @@ #include +#include "aqvm/base/file/windows/file.h" #include "aqvm/base/hash/hash.h" int AqvmBaseFileIdentifierWindows_GetIdentifier( - const char* filename, + const struct AqvmBaseFile_File* file, AqvmBaseFileIdentifierWindows_Identifier* identifier) { - if (filename == NULL || identifier == NULL) { - // TODO + if (file == NULL || file->file == NULL || identifier == NULL) { + // TODO(logging) return -1; } - HANDLE handle_file = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + HANDLE handle_file; + handle_file = AqvmBaseFileWindows_ConvertFileToHandle(file); if (handle_file == INVALID_HANDLE_VALUE) { - // TODO + // TODO(logging) return -2; } @@ -30,12 +31,12 @@ int AqvmBaseFileIdentifierWindows_GetIdentifier( identifier->nFileIndexHigh = file_info.nFileIndexHigh; identifier->nFileIndexLow = file_info.nFileIndexLow; } else { - // TODO + // TODO(logging) return -3; } if (CloseHandle(handle_file) == FALSE) { - // TODO + // TODO(logging) return -4; } @@ -45,7 +46,7 @@ int AqvmBaseFileIdentifierWindows_GetIdentifier( uint32_t AqvmBaseFileIdentifierWindows_GetIdentifierHash( const AqvmBaseFileIdentifierWindows_Identifier* identifier) { if (identifier == NULL) { - // TODO + // TODO(logging) return 0; } uint32_t hash[3]; @@ -61,7 +62,7 @@ bool AqvmBaseFileIdentifierWindows_IsEqual( const AqvmBaseFileIdentifierWindows_Identifier* identifier1, const AqvmBaseFileIdentifierWindows_Identifier* identifier2) { if (identifier1 == NULL || identifier2 == NULL) { - // TODO + // TODO(logging) return false; } diff --git a/aqvm/base/file/identifier/windows/identifier.h b/aqvm/base/file/identifier/windows/identifier.h index e890f5c..6d90503 100644 --- a/aqvm/base/file/identifier/windows/identifier.h +++ b/aqvm/base/file/identifier/windows/identifier.h @@ -10,6 +10,8 @@ #include #include +struct AqvmBaseFile_File; + typedef struct { DWORD dwVolumeSerialNumber; DWORD nFileIndexHigh; @@ -17,7 +19,8 @@ typedef struct { } AqvmBaseFileIdentifierWindows_Identifier; int AqvmBaseFileIdentifierWindows_GetIdentifier( - const char* filename, AqvmBaseFileIdentifierWindows_Identifier* identifier); + const struct AqvmBaseFile_File* file, + AqvmBaseFileIdentifierWindows_Identifier* identifier); uint32_t AqvmBaseFileIdentifierWindows_GetIdentifierHash( const AqvmBaseFileIdentifierWindows_Identifier* identifier); diff --git a/aqvm/base/file/read_write_lock/read_write_lock.c b/aqvm/base/file/read_write_lock/read_write_lock.c index d6a2db1..e610000 100644 --- a/aqvm/base/file/read_write_lock/read_write_lock.c +++ b/aqvm/base/file/read_write_lock/read_write_lock.c @@ -12,11 +12,11 @@ AqvmBaseFileReadWriteLock_CreateReadWriteLock() { (struct AqvmBaseFileReadWriteLock_ReadWriteLock*)AqvmBaseMemory_malloc( sizeof(struct AqvmBaseFileReadWriteLock_ReadWriteLock)); if (read_write_lock == NULL) { - // TODO + // TODO(logging) return NULL; } if (AqvmBaseThreadingMutex_CreateMutex(&read_write_lock->mutex) == NULL) { - // TODO + // TODO(logging) return NULL; } read_write_lock->read_count = 0; @@ -26,14 +26,14 @@ AqvmBaseFileReadWriteLock_CreateReadWriteLock() { int AqvmBaseFileReadWriteLock_DestroyReadWriteLock( struct AqvmBaseFileReadWriteLock_ReadWriteLock* read_write_lock) { if (read_write_lock == NULL) { - // TODO + // TODO(logging) return -1; } int result = AqvmBaseThreadingMutex_DestoryMutex(&read_write_lock->mutex); AqvmBaseMemory_free(read_write_lock); if (result != 0) { - // TODO + // TODO(logging) return -2; } return 0; @@ -42,13 +42,13 @@ int AqvmBaseFileReadWriteLock_DestroyReadWriteLock( int AqvmBaseFileReadWriteLock_LockReadLock( struct AqvmBaseFileReadWriteLock_ReadWriteLock* read_write_lock) { if (read_write_lock == NULL) { - // TODO + // TODO(logging) return -1; } if (read_write_lock->read_count == 0 && AqvmBaseThreadingMutex_LockMutex(&read_write_lock->mutex) != 0) { - // TODO + // TODO(logging) return -2; } ++read_write_lock->read_count; @@ -58,12 +58,12 @@ int AqvmBaseFileReadWriteLock_LockReadLock( int AqvmBaseFileReadWriteLock_LockWriteLock( struct AqvmBaseFileReadWriteLock_ReadWriteLock* read_write_lock) { if (read_write_lock == NULL) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseThreadingMutex_LockMutex(&read_write_lock->mutex) != 0) { - // TODO + // TODO(logging) return -2; } return 0; @@ -72,19 +72,19 @@ int AqvmBaseFileReadWriteLock_LockWriteLock( int AqvmBaseFileReadWriteLock_UnlockLock( struct AqvmBaseFileReadWriteLock_ReadWriteLock* read_write_lock) { if (read_write_lock == NULL) { - // TODO + // TODO(logging) return -1; } if (read_write_lock->read_count == 0 && AqvmBaseThreadingMutex_UnlockMutex(&read_write_lock->mutex) != 0) { - // TODO + // TODO(logging) return -2; } else { --read_write_lock->read_count; if (read_write_lock->read_count == 0 && AqvmBaseThreadingMutex_UnlockMutex(&read_write_lock->mutex) != 0) { - // TODO + // TODO(logging) return -3; } } diff --git a/aqvm/base/file/unix/CMakeLists.txt b/aqvm/base/file/unix/CMakeLists.txt new file mode 100644 index 0000000..e737363 --- /dev/null +++ b/aqvm/base/file/unix/CMakeLists.txt @@ -0,0 +1,11 @@ +# Copyright 2024 AQ author, All Rights Reserved. +# This program is licensed under the AQ License. You can find the AQ license in +# the root directory. + +cmake_minimum_required(VERSION 3.10) + +include_directories(${PROJECT_SOURCE_DIR}) + +set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/file.c) + +add_library(AqvmBaseFileUnix STATIC ${SOURCES}) \ No newline at end of file diff --git a/aqvm/base/file/unix/file.c b/aqvm/base/file/unix/file.c new file mode 100644 index 0000000..3fc5c38 --- /dev/null +++ b/aqvm/base/file/unix/file.c @@ -0,0 +1,17 @@ +#ifdef __unix__ +#include "aqvm/base/file/windows/file.h" + +#include +#include + +#include "aqvm/base/file/file.h" + +struct stat AqvmBaseFileUnix_ConvertFileToStat( + const struct AqvmBaseFile_File* file) { + struct stat st; + if (fstat(_fileno(file->file), &st) == -1) { + // TODO(logging) + } + return st; +} +#endif \ No newline at end of file diff --git a/aqvm/base/file/unix/file.h b/aqvm/base/file/unix/file.h new file mode 100644 index 0000000..5891714 --- /dev/null +++ b/aqvm/base/file/unix/file.h @@ -0,0 +1,17 @@ +#ifdef __unix__ +// Copyright 2024 AQ author, All Rights Reserved. +// This program is licensed under the AQ License. You can find the AQ license in +// the root directory. + +#ifndef AQ_AQVM_BASE_FILE_UNIX_FILE_H_ +#define AQ_AQVM_BASE_FILE_UNIX_FILE_H_ + +#include + +#include "aqvm/base/file/file.h" + +struct stat AqvmBaseFileUnix_ConvertFileToStat( + const struct AqvmBaseFile_File* file); + +#endif +#endif \ No newline at end of file diff --git a/aqvm/base/file/windows/file.c b/aqvm/base/file/windows/file.c index 887cd71..6f4e014 100644 --- a/aqvm/base/file/windows/file.c +++ b/aqvm/base/file/windows/file.c @@ -7,10 +7,11 @@ #include "aqvm/base/file/file.h" -HANDLE AqvmBaseFileWindows_ConvertFileToHandle(struct AqvmBaseFile_File* file) { +HANDLE AqvmBaseFileWindows_ConvertFileToHandle( + const struct AqvmBaseFile_File* file) { HANDLE handle = (HANDLE)_get_osfhandle(_fileno(file->file)); if (handle == INVALID_HANDLE_VALUE) { - // TODO + // TODO(logging) } return handle; } diff --git a/aqvm/base/file/windows/file.h b/aqvm/base/file/windows/file.h index 8feb0b8..8b0623e 100644 --- a/aqvm/base/file/windows/file.h +++ b/aqvm/base/file/windows/file.h @@ -6,12 +6,12 @@ #ifndef AQ_AQVM_BASE_FILE_WINDOWS_FILE_H_ #define AQ_AQVM_BASE_FILE_WINDOWS_FILE_H_ -#include #include #include "aqvm/base/file/file.h" -HANDLE AqvmBaseFileWindows_ConvertFileToHandle(struct AqvmBaseFile_File* file); +HANDLE AqvmBaseFileWindows_ConvertFileToHandle( + const struct AqvmBaseFile_File* file); #endif #endif \ No newline at end of file diff --git a/aqvm/base/hash/hash.c b/aqvm/base/hash/hash.c index fd8baac..d07d092 100644 --- a/aqvm/base/hash/hash.c +++ b/aqvm/base/hash/hash.c @@ -10,7 +10,7 @@ int AqvmBaseHash_Hash(int data) { if (data > INT_MAX - ((5381 << 5) + 5381) || data < INT_MIN + ((5381 << 5) + 5381)) { - // TODO + // TODO(logging) return 0; } return ((5381 << 5) + 5381) + data; @@ -18,7 +18,7 @@ int AqvmBaseHash_Hash(int data) { uint32_t AqvmBaseHash_HashString(const char* str) { if (str == NULL) { - // TODO + // TODO(logging) return 0; } uint32_t hash = 5381; @@ -31,7 +31,7 @@ uint32_t AqvmBaseHash_HashString(const char* str) { uint32_t AqvmBaseHash_HashUnsignedIntArray(const uint32_t* data, size_t size) { if (data == NULL) { - // TODO + // TODO(logging) return 0; } uint32_t hash = 5381; diff --git a/aqvm/base/hash/table/table.c b/aqvm/base/hash/table/table.c index 2ade11e..1e6c54a 100644 --- a/aqvm/base/hash/table/table.c +++ b/aqvm/base/hash/table/table.c @@ -12,7 +12,7 @@ int AqvmBaseHashTable_CloseHashTable( struct AqvmBaseHashTable_HashTable* hash_table) { if (hash_table == NULL) { - // TODO + // TODO(logging) return -1; } @@ -29,7 +29,7 @@ int AqvmBaseHashTable_CloseHashTable( int AqvmBaseHashTable_InitializeHashTable( struct AqvmBaseHashTable_HashTable* hash_table, size_t capacity) { if (hash_table == NULL || capacity == 0) { - // TODO + // TODO(logging) return -1; } @@ -38,12 +38,12 @@ int AqvmBaseHashTable_InitializeHashTable( hash_table->data = (struct AqvmBaseLinkedList_LinkedList*)AqvmBaseMemory_malloc( sizeof(struct AqvmBaseLinkedList_LinkedList) * capacity); if (hash_table->data == NULL) { - // TODO + // TODO(logging) return -2; } for (size_t i = 0; i < capacity; i++) { if (AqvmBaseLinkedList_InitializeLinkedList(&hash_table->data[i])!=0) { - // TODO + // TODO(logging) return -3; } } diff --git a/aqvm/base/io/io.c b/aqvm/base/io/io.c index 3ba00fc..ca782a6 100644 --- a/aqvm/base/io/io.c +++ b/aqvm/base/io/io.c @@ -30,7 +30,7 @@ int AqvmBaseIo_InitializeIo() { AqvmBaseIo_inputMutex = AqvmBaseThreadingMutex_CreateMutex(); AqvmBaseIo_outputMutex = AqvmBaseThreadingMutex_CreateMutex(); if (AqvmBaseIo_inputMutex == NULL || AqvmBaseIo_outputMutex == NULL) { - // TODO + // TODO(logging) return -1; } @@ -39,11 +39,11 @@ int AqvmBaseIo_InitializeIo() { int AqvmBaseIo_CloseIo() { if (AqvmBaseThreadingMutex_DestroyMutex(AqvmBaseIo_inputMutex) != 0) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseThreadingMutex_DestroyMutex(AqvmBaseIo_outputMutex) != 0) { - // TODO + // TODO(logging) return -1; } return 0; @@ -55,12 +55,12 @@ int AqvmBaseIo_OutputLog(struct AqvmBaseFile_File* stream, const char* time, va_list other_info) { if (AqvmBaseFile_CheckStream(stream) != 0 || time == NULL || type == NULL || code == NULL || message == NULL) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -2; } @@ -68,7 +68,7 @@ int AqvmBaseIo_OutputLog(struct AqvmBaseFile_File* stream, const char* time, stream->file, "{\"Time\":\"%s\",\"Type\":\"%s\",\"Code\":\"%s\",\"Message\":\"%s\"", time, type, code, message) < 0) { - // TODO + // TODO(logging) return -3; } @@ -77,7 +77,7 @@ int AqvmBaseIo_OutputLog(struct AqvmBaseFile_File* stream, const char* time, if (name != NULL) value = va_arg(system_info, char*); while (name != NULL && value != NULL) { if (fprintf(stream->file, ",\"%s\":\"%s\"", name, value) != 0) { - // TODO + // TODO(logging) return -4; } name = va_arg(system_info, char*); @@ -89,7 +89,7 @@ int AqvmBaseIo_OutputLog(struct AqvmBaseFile_File* stream, const char* time, if (name != NULL) value = va_arg(system_info, char*); while (name != NULL && value != NULL) { if (fprintf(stream->file, ",\"%s\":\"%s\"", name, value) != 0) { - // TODO + // TODO(logging) return -5; } name = va_arg(other_info, char*); @@ -97,12 +97,12 @@ int AqvmBaseIo_OutputLog(struct AqvmBaseFile_File* stream, const char* time, } if (fprintf(stream->file, "}\n") < 0) { - // TODO + // TODO(logging) return -6; } if (AqvmBaseFile_UnlockStream(stream) < 0) { - // TODO + // TODO(logging) return -7; } @@ -111,23 +111,23 @@ int AqvmBaseIo_OutputLog(struct AqvmBaseFile_File* stream, const char* time, int AqvmBaseIo_fgetc(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -2; } if (stream->file == stdout || stream->file == stderr) { - // TODO + // TODO(logging) return -3; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -4; } int result = fgetc(stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -5; } @@ -135,7 +135,7 @@ int AqvmBaseIo_fgetc(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_feof(stream) != 0) { return EOF; } - // TODO + // TODO(logging) return -6; } @@ -144,23 +144,23 @@ int AqvmBaseIo_fgetc(struct AqvmBaseFile_File* stream) { char* AqvmBaseIo_fgets(char* str, int n, struct AqvmBaseFile_File* stream) { if (str == NULL || n <= 0 || AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return NULL; } if (stream->file == stdout || stream->file == stderr) { - // TODO + // TODO(logging) return NULL; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return NULL; } char* result = fgets(str, n, stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return NULL; } @@ -168,7 +168,7 @@ char* AqvmBaseIo_fgets(char* str, int n, struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_feof(stream) != 0) { return NULL; } - // TODO + // TODO(logging) return NULL; } @@ -178,16 +178,16 @@ char* AqvmBaseIo_fgets(char* str, int n, struct AqvmBaseFile_File* stream) { int AqvmBaseIo_fprintf(struct AqvmBaseFile_File* stream, const char* format, ...) { if (format == NULL || AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (stream->file == stdin) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -3; } @@ -197,12 +197,12 @@ int AqvmBaseIo_fprintf(struct AqvmBaseFile_File* stream, const char* format, va_end(arg); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -4; } if (result < 0) { - // TODO + // TODO(logging) return -5; } @@ -211,28 +211,28 @@ int AqvmBaseIo_fprintf(struct AqvmBaseFile_File* stream, const char* format, int AqvmBaseIo_fputc(int character, struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -2; } if (stream->file == stdin) { - // TODO + // TODO(logging) return -3; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -4; } int result = fputc(character, stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -5; } if (result == EOF) { - // TODO + // TODO(logging) return -6; } @@ -241,28 +241,28 @@ int AqvmBaseIo_fputc(int character, struct AqvmBaseFile_File* stream) { int AqvmBaseIo_fputs(const char* str, struct AqvmBaseFile_File* stream) { if (str == NULL || AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (stream->file == stdin) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -3; } int result = fputs(str, stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -4; } if (result == EOF) { - // TODO + // TODO(logging) return -5; } @@ -272,16 +272,16 @@ int AqvmBaseIo_fputs(const char* str, struct AqvmBaseFile_File* stream) { int AqvmBaseIo_fscanf(struct AqvmBaseFile_File* stream, const char* format, ...) { if (format == NULL || AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -2; } if (stream->file == stdout || stream->file == stderr) { - // TODO + // TODO(logging) return -3; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -4; } @@ -291,12 +291,12 @@ int AqvmBaseIo_fscanf(struct AqvmBaseFile_File* stream, const char* format, va_end(arg); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -5; } if (result == EOF) { - // TODO + // TODO(logging) return -6; } @@ -308,19 +308,19 @@ int AqvmBaseIo_getc(struct AqvmBaseFile_File* stream) { return -2; } if (stream->file == stdout || stream->file == stderr) { - // TODO + // TODO(logging) return -3; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -4; } int result = getc(stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -5; } @@ -328,7 +328,7 @@ int AqvmBaseIo_getc(struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_feof(stream) != 0) { return EOF; } else { - // TODO + // TODO(logging) return -6; } } @@ -338,19 +338,19 @@ int AqvmBaseIo_getc(struct AqvmBaseFile_File* stream) { int AqvmBaseIo_getchar(void) { if (AqvmBaseFile_CheckStream(AqvmBaseIo_stdin) != 0) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseFile_LockStream(AqvmBaseIo_stdin) != 0) { - // TODO + // TODO(logging) return -3; } int result = getchar(); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stdin) != 0) { - // TODO + // TODO(logging) return -4; } @@ -358,7 +358,7 @@ int AqvmBaseIo_getchar(void) { if (AqvmBaseFile_feof(AqvmBaseIo_stdin) != 0) { return EOF; } else { - // TODO + // TODO(logging) return -5; } } @@ -372,14 +372,14 @@ int AqvmBaseIo_perror(const char* str) { } if (AqvmBaseFile_LockStream(AqvmBaseIo_stderr) != 0) { - // TODO + // TODO(logging) return -2; } perror(str); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stderr) != 0) { - // TODO + // TODO(logging) return -3; } @@ -392,7 +392,7 @@ int AqvmBaseIo_printf(const char* format, ...) { } if (AqvmBaseFile_LockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -2; } @@ -402,12 +402,12 @@ int AqvmBaseIo_printf(const char* format, ...) { va_end(arg); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -3; } if (result < 0) { - // TODO + // TODO(logging) return -4; } @@ -416,28 +416,28 @@ int AqvmBaseIo_printf(const char* format, ...) { int AqvmBaseIo_putc(int character, struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (stream->file == stdin) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -3; } int result = putc(character, stream->file); if (AqvmBaseFile_UnlockStream(stream) != 0) { - // TODO + // TODO(logging) return -4; } if (result == EOF) { - // TODO + // TODO(logging) return -5; } @@ -446,24 +446,24 @@ int AqvmBaseIo_putc(int character, struct AqvmBaseFile_File* stream) { int AqvmBaseIo_putchar(int character) { if (AqvmBaseFile_CheckStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseFile_LockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -3; } int result = putchar(character); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -4; } if (result == EOF) { - // TODO + // TODO(logging) return -5; } @@ -472,24 +472,24 @@ int AqvmBaseIo_putchar(int character) { int AqvmBaseIo_puts(const char* str) { if (str == NULL || AqvmBaseFile_CheckStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -2; } int result = puts(str); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -3; } if (result == EOF) { - // TODO + // TODO(logging) return -4; } @@ -498,12 +498,12 @@ int AqvmBaseIo_puts(const char* str) { int AqvmBaseIo_scanf(const char* format, ...) { if (format == NULL || AqvmBaseFile_CheckStream(AqvmBaseIo_stdin) != 0) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -2; } @@ -513,12 +513,12 @@ int AqvmBaseIo_scanf(const char* format, ...) { va_end(arg); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -3; } if (result == EOF) { - // TODO + // TODO(logging) return -4; } @@ -528,7 +528,7 @@ int AqvmBaseIo_scanf(const char* format, ...) { int AqvmBaseIo_snprintf(char* str, size_t size, const char* format, ...) { if (str == NULL || format == NULL || AqvmBaseFile_CheckStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -1; } @@ -538,7 +538,7 @@ int AqvmBaseIo_snprintf(char* str, size_t size, const char* format, ...) { va_end(arg); if (result < 0) { - // TODO + // TODO(logging) return -2; } @@ -548,7 +548,7 @@ int AqvmBaseIo_snprintf(char* str, size_t size, const char* format, ...) { int AqvmBaseIo_sprintf(char* str, const char* format, ...) { if (str == NULL || format == NULL || AqvmBaseFile_CheckStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -1; } @@ -558,7 +558,7 @@ int AqvmBaseIo_sprintf(char* str, const char* format, ...) { va_end(arg); if (result < 0) { - // TODO + // TODO(logging) return -2; } @@ -568,7 +568,7 @@ int AqvmBaseIo_sprintf(char* str, const char* format, ...) { int AqvmBaseIo_sscanf(const char* str, const char* format, ...) { if (str == NULL || format == NULL || AqvmBaseFile_CheckStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -1; } @@ -578,7 +578,7 @@ int AqvmBaseIo_sscanf(const char* str, const char* format, ...) { va_end(arg); if (result == EOF) { - // TODO + // TODO(logging) return -2; } @@ -587,28 +587,28 @@ int AqvmBaseIo_sscanf(const char* str, const char* format, ...) { int AqvmBaseIo_ungetc(int character, struct AqvmBaseFile_File* stream) { if (AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (stream->file == stdout || stream->file == stderr) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseFile_LockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -3; } int result = ungetc(character, stream->file); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -4; } if (result == EOF) { - // TODO + // TODO(logging) return -5; } @@ -618,28 +618,28 @@ int AqvmBaseIo_ungetc(int character, struct AqvmBaseFile_File* stream) { int AqvmBaseIo_vfprintf(struct AqvmBaseFile_File* stream, const char* format, va_list arg) { if (format == NULL || AqvmBaseFile_CheckStream(stream) != 0) { - // TODO + // TODO(logging) return -1; } if (stream->file == stdin) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseFile_LockStream(stream) != 0) { - // TODO + // TODO(logging) return -3; } int result = vfprintf(stream->file, format, arg); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -4; } if (result < 0) { - // TODO + // TODO(logging) return -5; } @@ -648,24 +648,24 @@ int AqvmBaseIo_vfprintf(struct AqvmBaseFile_File* stream, const char* format, int AqvmBaseIo_vprintf(const char* format, va_list arg) { if (format == NULL || AqvmBaseFile_CheckStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -2; } int result = vprintf(format, arg); if (result < 0) { - // TODO + // TODO(logging) return -3; } va_end(arg); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -4; } @@ -675,24 +675,24 @@ int AqvmBaseIo_vprintf(const char* format, va_list arg) { int AqvmBaseIo_vsprintf(char* str, const char* format, va_list arg) { if (str == NULL || format == NULL || AqvmBaseFile_CheckStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseFile_LockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -2; } int result = vsprintf(str, format, arg); if (AqvmBaseFile_UnlockStream(AqvmBaseIo_stdout) != 0) { - // TODO + // TODO(logging) return -4; } if (result < 0) { - // TODO + // TODO(logging) return -5; } diff --git a/aqvm/base/linked_list/linked_list.c b/aqvm/base/linked_list/linked_list.c index eb3eb93..82cdead 100644 --- a/aqvm/base/linked_list/linked_list.c +++ b/aqvm/base/linked_list/linked_list.c @@ -11,7 +11,7 @@ int AqvmBaseLinkedList_AddNode(struct AqvmBaseLinkedList_LinkedList* list, void* data) { if (list == NULL) { - // TODO + // TODO(logging) return -1; } @@ -19,7 +19,7 @@ int AqvmBaseLinkedList_AddNode(struct AqvmBaseLinkedList_LinkedList* list, (struct AqvmBaseLinkedList_Node*)AqvmBaseMemory_malloc( sizeof(struct AqvmBaseLinkedList_Node)); if (new_node == NULL) { - // TODO + // TODO(logging) return -2; } new_node->data = data; @@ -34,7 +34,7 @@ int AqvmBaseLinkedList_AddNode(struct AqvmBaseLinkedList_LinkedList* list, int AqvmBaseLinkedList_CloseLinkedList( struct AqvmBaseLinkedList_LinkedList* list) { if (list == NULL) { - // TODO + // TODO(logging) return -1; } @@ -52,14 +52,14 @@ int AqvmBaseLinkedList_CloseLinkedList( int AqvmBaseLinkedList_DeleteNode(struct AqvmBaseLinkedList_LinkedList* list, size_t index) { if (list == NULL || index >= list->capacity) { - // TODO + // TODO(logging) return -1; } struct AqvmBaseLinkedList_Node* delete_node = list->head; for (size_t i = 0; i != index; ++i) delete_node = delete_node->next; if (delete_node == NULL) { - // TODO + // TODO(logging) return -2; } if (list->head == delete_node) list->head = delete_node->next; @@ -74,14 +74,14 @@ int AqvmBaseLinkedList_DeleteNode(struct AqvmBaseLinkedList_LinkedList* list, void* AqvmBaseLinkedList_GetData(struct AqvmBaseLinkedList_LinkedList* list, size_t index) { if (list == NULL || index >= list->capacity) { - // TODO + // TODO(logging) return NULL; } struct AqvmBaseLinkedList_Node* get_node = list->head; for (size_t i = 0; i != index; ++i) get_node = get_node->next; if (get_node == NULL) { - // TODO + // TODO(logging) return NULL; } return get_node->data; @@ -90,7 +90,7 @@ void* AqvmBaseLinkedList_GetData(struct AqvmBaseLinkedList_LinkedList* list, int AqvmBaseLinkedList_InitializeLinkedList( struct AqvmBaseLinkedList_LinkedList* linked_list) { if (linked_list == NULL) { - // TODO + // TODO(logging) return -1; } linked_list->head = NULL; @@ -102,14 +102,14 @@ int AqvmBaseLinkedList_InitializeLinkedList( int AqvmBaseLinkedList_InsertNode(struct AqvmBaseLinkedList_LinkedList* list, size_t index, void* data) { if (list == NULL || index >= list->capacity) { - // TODO + // TODO(logging) return -1; } struct AqvmBaseLinkedList_Node* prev_node = list->head; for (size_t i = 0; i != index; ++i) prev_node = prev_node->next; if (prev_node == NULL) { - // TODO + // TODO(logging) return -2; } @@ -117,7 +117,7 @@ int AqvmBaseLinkedList_InsertNode(struct AqvmBaseLinkedList_LinkedList* list, (struct AqvmBaseLinkedList_Node*)AqvmBaseMemory_malloc( sizeof(struct AqvmBaseLinkedList_Node)); if (insert_node == NULL) { - // TODO + // TODO(logging) return -3; } insert_node->data = data; @@ -136,7 +136,7 @@ int AqvmBaseLinkedList_InsertNode(struct AqvmBaseLinkedList_LinkedList* list, int AqvmBaseLinkedList_PrependNode(struct AqvmBaseLinkedList_LinkedList* list, void* data) { if (list == NULL) { - // TODO + // TODO(logging) return -1; } @@ -144,7 +144,7 @@ int AqvmBaseLinkedList_PrependNode(struct AqvmBaseLinkedList_LinkedList* list, (struct AqvmBaseLinkedList_Node*)AqvmBaseMemory_malloc( sizeof(struct AqvmBaseLinkedList_Node)); if (new_node == NULL) { - // TODO + // TODO(logging) return -2; } new_node->data = data; @@ -163,14 +163,14 @@ int AqvmBaseLinkedList_PrependNode(struct AqvmBaseLinkedList_LinkedList* list, int AqvmBaseLinkedList_SetData(struct AqvmBaseLinkedList_LinkedList* list, size_t index, void* data) { if (list == NULL || index >= list->capacity) { - // TODO + // TODO(logging) return -1; } struct AqvmBaseLinkedList_Node* set_node = list->head; for (size_t i = 0; i != index; ++i) set_node = set_node->next; if (set_node == NULL) { - // TODO + // TODO(logging) return -2; } set_node->data = data; diff --git a/aqvm/base/logging/logging.c b/aqvm/base/logging/logging.c index abe1cb3..15a49fb 100644 --- a/aqvm/base/logging/logging.c +++ b/aqvm/base/logging/logging.c @@ -19,7 +19,7 @@ void AqvmBaseLogging_OutputLog(const char* type, const char* code, const char* message, ...) { char time_str[31]; if (AqvmBaseTime_GetCurrentTimeString(time_str) != 0) { - // TODO + // TODO(logging) // return; } @@ -65,7 +65,7 @@ int AqvmBaseLogging_OutputLogToConsole(const char* time, const char* type, int result = AqvmBaseIo_OutputLog(AqvmBaseIo_stderr, time, type, code, message, system_info, other_info); if (result != 0) { - // TODO + // TODO(logging) return -1; } return 0; @@ -76,14 +76,14 @@ int AqvmBaseLogging_OutputLogToFile(const char* time, const char* type, va_list system_info, va_list other_info) { struct AqvmBaseFile_File* log_ptr = AqvmBaseFile_fopen(".aqvm_log.log", "a"); if (log_ptr == NULL) { - // TODO + // TODO(logging) return -1; } int result = AqvmBaseIo_OutputLog(log_ptr, time, type, code, message, system_info, other_info); if (result != 0) { - // TODO + // TODO(logging) // return -2; } diff --git a/aqvm/base/memory/memory.c b/aqvm/base/memory/memory.c index 2a60b3a..f4d60fb 100644 --- a/aqvm/base/memory/memory.c +++ b/aqvm/base/memory/memory.c @@ -10,14 +10,14 @@ void* AqvmBaseMemory_malloc(size_t size) { void* ptr = malloc(size); if (ptr == NULL) { - // TODO + // TODO(logging) } return ptr; } int AqvmBaseMemory_free(void* ptr) { if (ptr == NULL) { - // TODO + // TODO(logging) return -1; } free(ptr); diff --git a/aqvm/base/process/file_lock/file_lock.c b/aqvm/base/process/file_lock/file_lock.c index 17f6c67..0a01118 100644 --- a/aqvm/base/process/file_lock/file_lock.c +++ b/aqvm/base/process/file_lock/file_lock.c @@ -15,18 +15,18 @@ int AqvmBaseProcessFileLock_LockFile(struct AqvmBaseFile_File* file) { #ifdef __unix__ if (AqvmBaseProcessFileLockUnix_LockFile(file) != 0) { - // TODO + // TODO(logging) return -1; } return 0; #elif _WIN32 if (AqvmBaseProcessFileLockWindows_LockFile(file) != 0) { - // TODO + // TODO(logging) return -1; } return 0; #else - // TODO + // TODO(logging) return -2; #endif } @@ -34,18 +34,18 @@ int AqvmBaseProcessFileLock_LockFile(struct AqvmBaseFile_File* file) { int AqvmBaseProcessFileLock_UnlockFile(struct AqvmBaseFile_File* file) { #ifdef __unix__ if (AqvmBaseProcessFileLockUnix_UnlockFile(file) != 0) { - // TODO + // TODO(logging) return -1; } return 0; #elif _WIN32 if (AqvmBaseProcessFileLockWindows_UnlockFile(file) != 0) { - // TODO + // TODO(logging) return -1; } return 0; #else - // TODO + // TODO(logging) return -2; #endif } \ No newline at end of file diff --git a/aqvm/base/process/file_lock/unix/file_lock.c b/aqvm/base/process/file_lock/unix/file_lock.c index 1f11de8..e7a4d70 100644 --- a/aqvm/base/process/file_lock/unix/file_lock.c +++ b/aqvm/base/process/file_lock/unix/file_lock.c @@ -13,11 +13,11 @@ int AqvmBaseProcessFileLockUnix_LockFile(struct AqvmBaseFile_File* file) { if (AqvmBaseFile_CheckStream(file) != 0) { - // TODO + // TODO(logging) return -1; } if (file->file == stdin || file->file == stdout || file->file == stderr) { - // TODO + // TODO(logging) return -2; } @@ -40,11 +40,11 @@ int AqvmBaseProcessFileLockUnix_LockFile(struct AqvmBaseFile_File* file) { int AqvmBaseProcessFileLockUnix_UnlockFile(struct AqvmBaseFile_File* file) { if (AqvmBaseFile_CheckStream(file) != 0) { - // TODO + // TODO(logging) return -1; } if (file->file == stdin || file->file == stdout || file->file == stderr) { - // TODO + // TODO(logging) return -2; } @@ -57,7 +57,7 @@ int AqvmBaseProcessFileLockUnix_UnlockFile(struct AqvmBaseFile_File* file) { file_lock.l_type = F_UNLCK; if (fcntl(fd, F_SETLK, &file_lock) == -1) { - // TODO + // TODO(logging) return -4; } return 0; diff --git a/aqvm/base/process/file_lock/windows/file_lock.c b/aqvm/base/process/file_lock/windows/file_lock.c index d4b2783..1798419 100644 --- a/aqvm/base/process/file_lock/windows/file_lock.c +++ b/aqvm/base/process/file_lock/windows/file_lock.c @@ -12,18 +12,18 @@ int AqvmBaseProcessFileLockWindows_LockFile(struct AqvmBaseFile_File* file) { if (file == NULL || file->file == NULL) { - // TODO + // TODO(logging) return -1; } HANDLE handle_file = AqvmBaseFileWindows_ConvertFileToHandle(file); if (handle_file == INVALID_HANDLE_VALUE) { - // TODO + // TODO(logging) return -2; } if (!LockFile(handle_file, 0, 0, MAXDWORD, MAXDWORD)) { - // TODO + // TODO(logging) return -3; } return 0; @@ -31,18 +31,18 @@ int AqvmBaseProcessFileLockWindows_LockFile(struct AqvmBaseFile_File* file) { int AqvmBaseProcessFileLockWindows_UnlockFile(struct AqvmBaseFile_File* file) { if (file == NULL || file->file == NULL) { - // TODO + // TODO(logging) return -1; } HANDLE handle_file = AqvmBaseFileWindows_ConvertFileToHandle(file); if (handle_file == INVALID_HANDLE_VALUE) { - // TODO + // TODO(logging) return -2; } if (!UnlockFile(handle_file, 0, 0, MAXDWORD, MAXDWORD)) { - // TODO + // TODO(logging) return -3; } return 0; diff --git a/aqvm/base/threading/file_lock/file_lock.c b/aqvm/base/threading/file_lock/file_lock.c index db99167..f5a9ce1 100644 --- a/aqvm/base/threading/file_lock/file_lock.c +++ b/aqvm/base/threading/file_lock/file_lock.c @@ -10,8 +10,8 @@ #include "aqvm/base/file/identifier/identifier.h" #include "aqvm/base/file/read_write_lock/read_write_lock.h" #include "aqvm/base/hash/table/table.h" -#include "aqvm/base/memory/memory.h" #include "aqvm/base/linked_list/linked_list.h" +#include "aqvm/base/memory/memory.h" #include "aqvm/base/pair.h" struct AqvmBaseHashTable_HashTable AqvmBaseThreadingFileLock_fileLockTable; @@ -19,7 +19,7 @@ struct AqvmBaseHashTable_HashTable AqvmBaseThreadingFileLock_fileLockTable; int AqvmBaseThreadingFileLock_CloseFileLockTable() { if (AqvmBaseHashTable_CloseHashTable( &AqvmBaseThreadingFileLock_fileLockTable) != 0) { - // TODO + // TODO(logging) return -1; } return 0; @@ -35,16 +35,17 @@ int AqvmBaseThreadingFileLock_InitializeFileLockTable() { int AqvmBaseThreadingFileLock_AddFileLock(struct AqvmBaseFile_File* file) { if (file == NULL || file->identifier == NULL) { - // TODO + // TODO(logging) return -1; } file->lock = AqvmBaseThreadingFileLock_GetFileLock(file); if (file->lock == NULL) { struct AqvmBase_Pair* file_lock_pair = - (struct AqvmBase_Pair*)AqvmBaseMemory_malloc(sizeof(struct AqvmBase_Pair)); + (struct AqvmBase_Pair*)AqvmBaseMemory_malloc( + sizeof(struct AqvmBase_Pair)); if (file_lock_pair == NULL) { - // TODO + // TODO(logging) return -2; } file_lock_pair->key = file->identifier; @@ -55,7 +56,7 @@ int AqvmBaseThreadingFileLock_AddFileLock(struct AqvmBaseFile_File* file) { file->identifier) % 1024], file_lock_pair) != 0) { - // TODO + // TODO(logging) AqvmBaseMemory_free(file_lock_pair); return -3; } @@ -66,7 +67,7 @@ int AqvmBaseThreadingFileLock_AddFileLock(struct AqvmBaseFile_File* file) { int AqvmBaseThreadingFileLock_RemoveFileLock(struct AqvmBaseFile_File* file) { if (file == NULL || file->lock == NULL || file->lock->lock_count == 0) { - // TODO + // TODO(logging) return -1; } @@ -76,12 +77,13 @@ int AqvmBaseThreadingFileLock_RemoveFileLock(struct AqvmBaseFile_File* file) { &AqvmBaseThreadingFileLock_fileLockTable.data, AqvmBaseFileIdentifier_GetIdentifierHash(file->identifier) % 1024)); }*/ + return 0; } struct AqvmBaseFileReadWriteLock_ReadWriteLock* AqvmBaseThreadingFileLock_GetFileLock(struct AqvmBaseFile_File* file) { if (file == NULL || file->identifier == NULL) { - // TODO + // TODO(logging) return NULL; } @@ -106,4 +108,5 @@ AqvmBaseThreadingFileLock_GetFileLock(struct AqvmBaseFile_File* file) { } node = node->next; } + return lock; } \ No newline at end of file diff --git a/aqvm/base/threading/mutex/mutex.c b/aqvm/base/threading/mutex/mutex.c index fa346b5..8c91447 100644 --- a/aqvm/base/threading/mutex/mutex.c +++ b/aqvm/base/threading/mutex/mutex.c @@ -12,12 +12,12 @@ AqvmBaseThreadingMutex_Mutex* AqvmBaseThreadingMutex_CreateMutex() { #elif _WIN32 return AqvmBaseThreadingMutexWindows_CreateMutex(); #else - // TODO(Threading): When Threading is developed, rewrite that code. + // TODO(logging)(Threading): When Threading is developed, rewrite that code. AqvmBaseThreadingMutex_Mutex* mutex = (AqvmBaseThreadingMutex_Mutex*)AqvmBaseMemory_malloc( sizeof(AqvmBaseThreadingMutex_Mutex)); if (mutex == NULL) { - // TODO + // TODO(logging) return NULL; } *mutex = false; @@ -27,24 +27,24 @@ AqvmBaseThreadingMutex_Mutex* AqvmBaseThreadingMutex_CreateMutex() { int AqvmBaseThreadingMutex_DestroyMutex(AqvmBaseThreadingMutex_Mutex* mutex) { if (mutex == NULL) { - // TODO + // TODO(logging) return -1; } #ifdef __unix__ if (AqvmBaseThreadingMutexUnix_DestroyMutex(mutex) != 0) { - // TODO + // TODO(logging) return -2; } return 0; #elif _WIN32 if (AqvmBaseThreadingMutexWindows_DestroyMutex(mutex) != 0) { - // TODO + // TODO(logging) return -2; } return 0; #else - // TODO(Threading): When Threading is developed, rewrite that code. + // TODO(logging)(Threading): When Threading is developed, rewrite that code. AqvmBaseMemory_free(mutex); return 0; #endif @@ -52,24 +52,24 @@ int AqvmBaseThreadingMutex_DestroyMutex(AqvmBaseThreadingMutex_Mutex* mutex) { int AqvmBaseThreadingMutex_LockMutex(AqvmBaseThreadingMutex_Mutex* mutex) { if (mutex == NULL) { - // TODO + // TODO(logging) return -1; } #ifdef __unix__ if (AqvmBaseThreadingMutexUnix_LockMutex(mutex) != 0) { - // TODO + // TODO(logging) return -2; } return 0; #elif _WIN32 if (AqvmBaseThreadingMutexWindows_LockMutex(mutex) != 0) { - // TODO + // TODO(logging) return -2; } return 0; #else - // TODO(Threading): When Threading is developed, rewrite that code. + // TODO(logging)(Threading): When Threading is developed, rewrite that code. while (*mutex); *mutex = true; return 0; @@ -78,7 +78,7 @@ int AqvmBaseThreadingMutex_LockMutex(AqvmBaseThreadingMutex_Mutex* mutex) { int AqvmBaseThreadingMutex_TryLockMutex(AqvmBaseThreadingMutex_Mutex* mutex) { if (mutex == NULL) { - // TODO + // TODO(logging) return -1; } @@ -93,7 +93,7 @@ int AqvmBaseThreadingMutex_TryLockMutex(AqvmBaseThreadingMutex_Mutex* mutex) { } return 0; #else - // TODO(Threading): When Threading is developed, rewrite that code. + // TODO(logging)(Threading): When Threading is developed, rewrite that code. if (*mutex) { return -3; } @@ -104,24 +104,24 @@ int AqvmBaseThreadingMutex_TryLockMutex(AqvmBaseThreadingMutex_Mutex* mutex) { int AqvmBaseThreadingMutex_UnlockMutex(AqvmBaseThreadingMutex_Mutex* mutex) { if (mutex == NULL) { - // TODO + // TODO(logging) return -1; } #ifdef __unix__ if (AqvmBaseThreadingMutexUnix_UnlockMutex(mutex) != 0) { - // TODO + // TODO(logging) return -2; } return 0; #elif _WIN32 if (AqvmBaseThreadingMutexWindows_UnlockMutex(mutex) != 0) { - // TODO + // TODO(logging) return -2; } return 0; #else - // TODO(Threading): When Threading is developed, rewrite that code. + // TODO(logging)(Threading): When Threading is developed, rewrite that code. if (!*mutex) { return -3; } diff --git a/aqvm/base/threading/mutex/mutex.h b/aqvm/base/threading/mutex/mutex.h index cd40ed5..9a9efac 100644 --- a/aqvm/base/threading/mutex/mutex.h +++ b/aqvm/base/threading/mutex/mutex.h @@ -16,7 +16,7 @@ typedef AqvmBaseThreadingMutexUnix_Mutex AqvmBaseThreadingMutex_Mutex; #elif _WIN32 typedef AqvmBaseThreadingMutexWindows_Mutex AqvmBaseThreadingMutex_Mutex; #else -// TODO(Threading): When Threading is developed, rewrite that code. +// TODO(logging)(Threading): When Threading is developed, rewrite that code. typedef bool AqvmBaseThreadingMutex_Mutex; #endif diff --git a/aqvm/base/threading/mutex/unix/mutex.c b/aqvm/base/threading/mutex/unix/mutex.c index 2bfd314..a017a98 100644 --- a/aqvm/base/threading/mutex/unix/mutex.c +++ b/aqvm/base/threading/mutex/unix/mutex.c @@ -12,12 +12,12 @@ AqvmBaseThreadingMutexUnix_Mutex *AqvmBaseThreadingMutexUnix_CreateMutex() { (AqvmBaseThreadingMutexUnix_Mutex *)AqvmBaseMemory_malloc( sizeof(AqvmBaseThreadingMutexUnix_Mutex)); if (mutex == NULL) { - // TODO + // TODO(logging) return NULL; } int result = pthread_mutex_init(mutex, NULL); if (result != 0) { - // TODO + // TODO(logging) return NULL; } return mutex; @@ -26,14 +26,14 @@ AqvmBaseThreadingMutexUnix_Mutex *AqvmBaseThreadingMutexUnix_CreateMutex() { int AqvmBaseThreadingMutexUnix_DestroyMutex( AqvmBaseThreadingMutexUnix_Mutex *mutex) { if (mutex == NULL) { - // TODO + // TODO(logging) return -1; } int result = pthread_mutex_destroy(mutex); AqvmBaseMemory_free(mutex); if (result != 0) { - // TODO + // TODO(logging) return -2; } return 0; @@ -42,13 +42,13 @@ int AqvmBaseThreadingMutexUnix_DestroyMutex( int AqvmBaseThreadingMutexUnix_LockMutex( AqvmBaseThreadingMutexUnix_Mutex *mutex) { if (mutex == NULL) { - // TODO + // TODO(logging) return -1; } int result = pthread_mutex_lock(mutex); if (result != 0) { - // TODO + // TODO(logging) return -2; } return 0; @@ -57,13 +57,13 @@ int AqvmBaseThreadingMutexUnix_LockMutex( int AqvmBaseThreadingMutexUnix_TryLockMutex( AqvmBaseThreadingMutexUnix_Mutex *mutex) { if (mutex == NULL) { - // TODO + // TODO(logging) return -1; } int result = pthread_mutex_trylock(mutex); if (result != 0) { - // TODO + // TODO(logging) return -2; } return 0; @@ -72,13 +72,13 @@ int AqvmBaseThreadingMutexUnix_TryLockMutex( int AqvmBaseThreadingMutexUnix_UnlockMutex( AqvmBaseThreadingMutexUnix_Mutex *mutex) { if (mutex == NULL) { - // TODO + // TODO(logging) return -1; } int result = pthread_mutex_unlock(mutex); if (result != 0) { - // TODO + // TODO(logging) return -2; } return 0; diff --git a/aqvm/base/threading/mutex/windows/mutex.c b/aqvm/base/threading/mutex/windows/mutex.c index 230fedc..55da0c8 100644 --- a/aqvm/base/threading/mutex/windows/mutex.c +++ b/aqvm/base/threading/mutex/windows/mutex.c @@ -16,26 +16,26 @@ AqvmBaseThreadingMutexWindows_CreateMutex() { (AqvmBaseThreadingMutexWindows_Mutex*)AqvmBaseMemory_malloc( sizeof(AqvmBaseThreadingMutexWindows_Mutex)); if (mutex == NULL) { - // TODO + // TODO(logging) return NULL; } *mutex = CreateMutex(NULL, FALSE, NULL); if (*mutex == NULL) { - // TODO + // TODO(logging) return NULL; } - return 0; + return mutex; } int AqvmBaseThreadingMutexWindows_DestroyMutex( AqvmBaseThreadingMutexWindows_Mutex* mutex) { if (mutex == NULL) { - // TODO + // TODO(logging) return -1; } if (*mutex != NULL && !CloseHandle(*mutex)) { - // TODO + // TODO(logging) return -2; } AqvmBaseMemory_free(mutex); @@ -45,13 +45,13 @@ int AqvmBaseThreadingMutexWindows_DestroyMutex( int AqvmBaseThreadingMutexWindows_LockMutex( AqvmBaseThreadingMutexWindows_Mutex* mutex) { if (mutex == NULL || *mutex == NULL) { - // TODO + // TODO(logging) return -1; } DWORD result = WaitForSingleObject(*mutex, INFINITE); if (result != WAIT_OBJECT_0) { - // TODO + // TODO(logging) return -2; } return 0; @@ -60,13 +60,13 @@ int AqvmBaseThreadingMutexWindows_LockMutex( int AqvmBaseThreadingMutexWindows_TryLockMutex( AqvmBaseThreadingMutexWindows_Mutex* mutex) { if (mutex == NULL || *mutex == NULL) { - // TODO + // TODO(logging) return -1; } DWORD result = WaitForSingleObject(*mutex, 0); if (result != WAIT_OBJECT_0) { - // TODO + // TODO(logging) return -2; } return 0; @@ -75,12 +75,12 @@ int AqvmBaseThreadingMutexWindows_TryLockMutex( int AqvmBaseThreadingMutexWindows_UnlockMutex( AqvmBaseThreadingMutexWindows_Mutex* mutex) { if (mutex == NULL || *mutex == NULL) { - // TODO + // TODO(logging) return -1; } if (!ReleaseMutex(*mutex)) { - // TODO + // TODO(logging) return -2; } return 0; diff --git a/aqvm/base/time/time.c b/aqvm/base/time/time.c index c00c027..b39a7f9 100644 --- a/aqvm/base/time/time.c +++ b/aqvm/base/time/time.c @@ -18,22 +18,22 @@ int AqvmBaseTime_localtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { if (timestamp == (time_t)-1 || result == NULL) { - // TODO + // TODO(logging) return -1; } #ifdef __unix__ if (AqvmBaseTimeUnix_localtime(timestamp, result) != 0) { - // TODO + // TODO(logging) return -2; } #elif _WIN32 if (AqvmBaseTimeWindows_localtime(timestamp, result) != 0) { - // TODO + // TODO(logging) return -3; } #else - // TODO + // TODO(logging) AqvmBaseLogging_OutputLog( "WARNING", "AqvmBaseTime_localtime_ThreadUnsafeWarning", "The localtime function may cause thread unsafety.", NULL); @@ -46,7 +46,7 @@ int AqvmBaseTime_localtime(const time_t timestamp, struct AqvmBaseTime_Time utc_time; if (AqvmBaseTime_gmtime(timestamp, &utc_time) != 0) { - // TODO + // TODO(logging) return -5; } int timezone_offset = (result->hour - utc_time.hour) * 3600 + @@ -70,28 +70,28 @@ int AqvmBaseTime_localtime(const time_t timestamp, int AqvmBaseTime_gmtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { if (timestamp == (time_t)-1 || result == NULL) { - // TODO + // TODO(logging) return -1; } #ifdef __unix__ if (AqvmBaseTimeUnix_gmtime(timestamp, result) != 0) { - // TODO + // TODO(logging) return -2; } #elif _WIN32 if (AqvmBaseTimeWindows_gmtime(timestamp, result) != 0) { - // TODO + // TODO(logging) return -3; } #else - // TODO + // TODO(logging) AqvmBaseLogging_OutputLog( "WARNING", "AqvmBaseTime_gmtime_ThreadUnsafeWarning", "The gmtime function may cause thread unsafety.", NULL); struct tm* gm_time = gmtime(×tamp); if (gm_time == NULL) { - // TODO + // TODO(logging) return -4; } *result = *gm_time; @@ -102,7 +102,7 @@ int AqvmBaseTime_gmtime(const time_t timestamp, time_t AqvmBaseTime_mktime(struct AqvmBaseTime_Time* time_info) { if (!AqvmBaseTime_IsValidTime(time_info)) { - // TODO + // TODO(logging) return (time_t)-1; } @@ -114,7 +114,7 @@ time_t AqvmBaseTime_mktime(struct AqvmBaseTime_Time* time_info) { int AqvmBaseTime_ConvertTmToTime(const struct tm* time_info, struct AqvmBaseTime_Time* result) { if (time_info == NULL || result == NULL) { - // TODO + // TODO(logging) return -1; } @@ -138,7 +138,7 @@ int AqvmBaseTime_ConvertTimeToTm(const struct AqvmBaseTime_Time* time_info, struct tm* result) { if (!AqvmBaseTime_IsValidTime(time_info) || time_info->year < 1900 || result == NULL) { - // TODO + // TODO(logging) return -1; } result->tm_year = time_info->year - 1900; @@ -155,23 +155,23 @@ int AqvmBaseTime_ConvertTimeToTm(const struct AqvmBaseTime_Time* time_info, int AqvmBaseTime_GetCurrentTime(struct AqvmBaseTime_Time* result) { if (result == NULL) { - // TODO + // TODO(logging) return -1; } #ifdef __unix__ if (AqvmBaseTimeUnix_GetCurrentTime(result) != 0) { - // TODO + // TODO(logging) return -2; } #elif _WIN32 if (AqvmBaseTimeWindows_GetCurrentTime(result) != 0) { - // TODO + // TODO(logging) return -3; } #else if (AqvmBaseTime_localtime(time(NULL), result) != 0) { - // TODO + // TODO(logging) return -4; } #endif @@ -181,23 +181,23 @@ int AqvmBaseTime_GetCurrentTime(struct AqvmBaseTime_Time* result) { int AqvmBaseTime_GetCurrentTimeString(char* result) { if (result == NULL) { - // TODO + // TODO(logging) return -1; } struct AqvmBaseTime_Time current_time; if (AqvmBaseTime_GetCurrentTime(¤t_time) != 0) { - // TODO + // TODO(logging) return -2; } if (!AqvmBaseTime_IsValidTime(¤t_time)) { - // TODO + // TODO(logging) return -3; } char timezone_offset_string[7]; if (AqvmBaseTime_GetTimezoneOffsetString(¤t_time, timezone_offset_string) != 0) { - // TODO + // TODO(logging) // return -4; } if (current_time.year < 0) { @@ -206,7 +206,7 @@ int AqvmBaseTime_GetCurrentTimeString(char* result) { current_time.year, current_time.month, current_time.day, current_time.hour, current_time.minute, current_time.second, current_time.millisecond, timezone_offset_string) < 0) { - // TODO + // TODO(logging) return -5; } } else { @@ -215,7 +215,7 @@ int AqvmBaseTime_GetCurrentTimeString(char* result) { current_time.year, current_time.month, current_time.day, current_time.hour, current_time.minute, current_time.second, current_time.millisecond, timezone_offset_string) < 0) { - // TODO + // TODO(logging) return -6; } } @@ -225,24 +225,24 @@ int AqvmBaseTime_GetCurrentTimeString(char* result) { int AqvmBaseTime_GetTimezoneOffsetString( const struct AqvmBaseTime_Time* time_info, char* result) { if (!AqvmBaseTime_IsValidTime(time_info) || result == NULL) { - // TODO + // TODO(logging) return -1; } if (time_info->offset_sign == 0 && AqvmBaseIo_snprintf(result, 2, "Z") < 0) { - // TODO + // TODO(logging) return -2; } else if (time_info->offset_sign > 0 && AqvmBaseIo_snprintf(result, 7, "+%02d:%02d", time_info->offset_hour, time_info->offset_minute) < 0) { - // TODO + // TODO(logging) return -3; } else if (time_info->offset_sign < 0 && AqvmBaseIo_snprintf(result, 7, "-%02d:%02d", time_info->offset_hour, time_info->offset_minute) < 0) { - // TODO + // TODO(logging) return -4; } return 0; @@ -250,7 +250,7 @@ int AqvmBaseTime_GetTimezoneOffsetString( bool AqvmBaseTime_IsLeapYear(const struct AqvmBaseTime_Time* time_info) { if (!AqvmBaseTime_IsValidTime(time_info)) { - // TODO + // TODO(logging) return false; } @@ -260,51 +260,51 @@ bool AqvmBaseTime_IsLeapYear(const struct AqvmBaseTime_Time* time_info) { bool AqvmBaseTime_IsValidTime(const struct AqvmBaseTime_Time* time_info) { if (time_info == NULL) { - // TODO + // TODO(logging) return false; } if (time_info->year == 0) { - // TODO + // TODO(logging) return false; } if (time_info->month > 12) { - // TODO + // TODO(logging) return false; } if (time_info->day > 31) { - // TODO + // TODO(logging) return false; } if (time_info->hour > 23) { - // TODO + // TODO(logging) return false; } if (time_info->minute > 59) { - // TODO + // TODO(logging) return false; } if (time_info->second > 60) { - // TODO + // TODO(logging) return false; } if (time_info->millisecond > 999) { - // TODO + // TODO(logging) return false; } if (time_info->weekday > 6) { - // TODO + // TODO(logging) return false; } if (time_info->yearday > 366) { - // TODO + // TODO(logging) return false; } if (time_info->offset_hour > 23) { - // TODO + // TODO(logging) return false; } if (time_info->offset_minute > 59) { - // TODO + // TODO(logging) return false; } return true; @@ -312,18 +312,18 @@ bool AqvmBaseTime_IsValidTime(const struct AqvmBaseTime_Time* time_info) { int AqvmBaseTime_SetIsdst(struct AqvmBaseTime_Time* time_info) { if (!AqvmBaseTime_IsValidTime(time_info)) { - // TODO + // TODO(logging) return -1; } time_t timestamp = AqvmBaseTime_mktime(time_info); if (timestamp == (time_t)-1) { - // TODO + // TODO(logging) return -2; } struct AqvmBaseTime_Time local_time; if (AqvmBaseTime_localtime(timestamp, &local_time) != 0) { - // TODO + // TODO(logging) return -3; } time_info->isdst = local_time.isdst; @@ -332,18 +332,18 @@ int AqvmBaseTime_SetIsdst(struct AqvmBaseTime_Time* time_info) { int AqvmBaseTime_SetTimezoneOffset(struct AqvmBaseTime_Time* time_info) { if (!AqvmBaseTime_IsValidTime(time_info)) { - // TODO + // TODO(logging) return -1; } time_t timestamp = AqvmBaseTime_mktime(time_info); if (timestamp == (time_t)-1) { - // TODO + // TODO(logging) return -2; } struct AqvmBaseTime_Time local_time; if (AqvmBaseTime_localtime(timestamp, &local_time) != 0) { - // TODO + // TODO(logging) return -3; } time_info->offset_sign = local_time.offset_sign; @@ -354,7 +354,7 @@ int AqvmBaseTime_SetTimezoneOffset(struct AqvmBaseTime_Time* time_info) { int AqvmBaseTime_SetWeekday(struct AqvmBaseTime_Time* time_info) { if (!AqvmBaseTime_IsValidTime(time_info)) { - // TODO + // TODO(logging) return -1; } @@ -365,7 +365,7 @@ int AqvmBaseTime_SetWeekday(struct AqvmBaseTime_Time* time_info) { if (time_info->year == 1582 && time_info->month == 10 && time_info->day > 4 && time_info->day < 15) { - // TODO + // TODO(logging) return -2; } @@ -389,7 +389,7 @@ int AqvmBaseTime_SetWeekday(struct AqvmBaseTime_Time* time_info) { int AqvmBaseTime_SetYearday(struct AqvmBaseTime_Time* time_info) { if (!AqvmBaseTime_IsValidTime(time_info)) { - // TODO + // TODO(logging) return -1; } diff --git a/aqvm/base/time/unix/time.c b/aqvm/base/time/unix/time.c index 9bb5371..1a54a08 100644 --- a/aqvm/base/time/unix/time.c +++ b/aqvm/base/time/unix/time.c @@ -14,17 +14,17 @@ int AqvmBaseTimeUnix_localtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { if (timestamp == (time_t)-1 || result == NULL) { - // TODO + // TODO(logging) return -1; } struct tm current_time; if (localtime_r(×tamp, ¤t_time) == NULL) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseTime_ConvertTmToTime(¤t_time, result) != 0) { - // TODO + // TODO(logging) return -3; } @@ -34,17 +34,17 @@ int AqvmBaseTimeUnix_localtime(const time_t timestamp, int AqvmBaseTimeUnix_gmtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { if (timestamp == (time_t)-1 || result == NULL) { - // TODO + // TODO(logging) return -1; } struct tm current_time; if (gmtime_r(×tamp, ¤t_time) == NULL) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseTime_ConvertTmToTime(¤t_time, result) != 0) { - // TODO + // TODO(logging) return -3; } @@ -54,12 +54,12 @@ int AqvmBaseTimeUnix_gmtime(const time_t timestamp, int AqvmBaseTimeUnix_ConvertTimespecToTime(const struct timespec* time_info, struct AqvmBaseTime_Time* result) { if (result == NULL || time_info == NULL) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseTime_localtime(time_info->tv_sec, result) != 0) { - // TODO + // TODO(logging) return -2; } result->millisecond = time_info->tv_nsec / 1000000; @@ -70,12 +70,12 @@ int AqvmBaseTimeUnix_ConvertTimespecToTime(const struct timespec* time_info, int AqvmBaseTimeUnix_ConvertTimevalToTime(const struct timeval* time_info, struct AqvmBaseTime_Time* result) { if (result == NULL || time_info == NULL) { - // TODO + // TODO(logging) return -1; } if (AqvmBaseTime_localtime(time_info->tv_sec, result) != 0) { - // TODO + // TODO(logging) return -2; } result->millisecond = time_info->tv_usec / 1000; @@ -85,27 +85,27 @@ int AqvmBaseTimeUnix_ConvertTimevalToTime(const struct timeval* time_info, int AqvmBaseTimeUnix_GetCurrentTime(struct AqvmBaseTime_Time* result) { if (result == NULL) { - // TODO + // TODO(logging) return -1; } #if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 struct timespec ts; if (clock_gettime(CLOCK_REALTIME, &ts) != 0) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseTimeUnix_ConvertTimespecToTime(&ts, result) != 0) { - // TODO + // TODO(logging) return -3; } #else struct timeval tv; if (gettimeofday(&tv, NULL) != 0) { - // TODO + // TODO(logging) return -4; } if (AqvmBaseTimeUnix_ConvertTimevalToTime(&tv, result) != 0) { - // TODO + // TODO(logging) return -5; } #endif diff --git a/aqvm/base/time/windows/time.c b/aqvm/base/time/windows/time.c index 05ae191..be6cb64 100644 --- a/aqvm/base/time/windows/time.c +++ b/aqvm/base/time/windows/time.c @@ -15,17 +15,17 @@ int AqvmBaseTimeWindows_localtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { if (timestamp == (time_t)-1 || result == NULL) { - // TODO + // TODO(logging) return -1; } struct tm current_time; if (localtime_s(¤t_time, ×tamp) != 0) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseTime_ConvertTmToTime(¤t_time, result) != 0) { - // TODO + // TODO(logging) return -3; } @@ -35,17 +35,17 @@ int AqvmBaseTimeWindows_localtime(const time_t timestamp, int AqvmBaseTimeWindows_gmtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { if (timestamp == (time_t)-1 || result == NULL) { - // TODO + // TODO(logging) return -1; } struct tm current_time; if (gmtime_s(¤t_time, ×tamp) != 0) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseTime_ConvertTmToTime(¤t_time, result) != 0) { - // TODO + // TODO(logging) return -3; } @@ -55,7 +55,7 @@ int AqvmBaseTimeWindows_gmtime(const time_t timestamp, int AqvmBaseTimeWindows_ConvertSystemtimeToTime( const SYSTEMTIME* time, struct AqvmBaseTime_Time* result) { if (time == NULL || result == NULL) { - // TODO + // TODO(logging) return -1; } @@ -77,31 +77,31 @@ int AqvmBaseTimeWindows_ConvertSystemtimeToTime( int AqvmBaseTimeWindows_GetCurrentTime(struct AqvmBaseTime_Time* result) { if (result == NULL) { - // TODO + // TODO(logging) return -1; } SYSTEMTIME st; GetLocalTime(&st); if (AqvmBaseTimeWindows_ConvertSystemtimeToTime(&st, result) != 0) { - // TODO + // TODO(logging) return -2; } if (AqvmBaseTime_SetWeekday(result) != 0) { - // TODO + // TODO(logging) return -3; } if (AqvmBaseTime_SetYearday(result) != 0) { - // TODO + // TODO(logging) return -4; } if (AqvmBaseTime_SetIsdst(result) != 0) { - // TODO + // TODO(logging) return -5; } if (AqvmBaseTime_SetTimezoneOffset(result) != 0) { - // TODO + // TODO(logging) return -6; }