Add debugging prints, WIP log timestamp

Author: DenverM80

src/ds3_connection.c

@@ -28,6 +28,7 @@ ds3_connection_pool* ds3_connection_pool_init(void) {
 }
 
 ds3_connection_pool* ds3_connection_pool_init_with_size(uint16_t pool_size) {
+    printf("ds3_connection_pool_init_with_size(%u)\n", pool_size);
     ds3_connection_pool* pool = g_new0(ds3_connection_pool, 1);
     pool->connections = g_new0(ds3_connection*, pool_size);
     pool->num_connections = pool_size;
@@ -38,6 +39,7 @@ ds3_connection_pool* ds3_connection_pool_init_with_size(uint16_t pool_size) {
 }
 
 void ds3_connection_pool_clear(ds3_connection_pool* pool, ds3_bool already_locked) {
+    printf("ds3_connection_pool_clear(%s)\n", (already_locked ? "locked" : "not locked"));
     int index;
 
     if (pool == NULL) {
@@ -61,14 +63,17 @@ void ds3_connection_pool_clear(ds3_connection_pool* pool, ds3_bool already_locke
 }
 
 static int _pool_inc(int index, uint16_t num_connections) {
+    printf("_pool_inc(%d, %u) :[%d]\n", index, num_connections, (index+1) % num_connections);
     return (index+1) % num_connections;
 }
 
 static int _pool_full(ds3_connection_pool* pool) {
+    printf("_pool_full(): head[%d] tail[%d] : [%d]\n", pool->head, pool->tail, (_pool_inc(pool->head, pool->num_connections) == pool->tail) );
     return (_pool_inc(pool->head, pool->num_connections) == pool->tail);
 }
 
 ds3_connection* ds3_connection_acquire(ds3_connection_pool* pool) {
+    printf("ds3_connection_acquire() BEGIN: head[%d] tail[%d]\n", pool->head, pool->tail);
     ds3_connection* connection = NULL;
 
     g_mutex_lock(&pool->mutex);
@@ -87,17 +92,20 @@ ds3_connection* ds3_connection_acquire(ds3_connection_pool* pool) {
 
     g_mutex_unlock(&pool->mutex);
 
+    printf("ds3_connection_acquire() END: head[%d] tail[%d]\n", pool->head, pool->tail);
     return connection;
 }
 
 void ds3_connection_release(ds3_connection_pool* pool, ds3_connection* connection) {
+    printf("ds3_connection_release() BEGIN: head[%d] tail[%d]\n", pool->head, pool->tail);
     g_mutex_lock(&pool->mutex);
 
     curl_easy_reset(connection);
     pool->tail = _pool_inc(pool->tail, pool->num_connections);
 
     g_mutex_unlock(&pool->mutex);
     g_cond_signal(&pool->available_connections);
+    printf("ds3_connection_release() END: head[%d] tail[%d]\n", pool->head, pool->tail);
 }
 
 void ds3_connection_pool_inc_ref(ds3_connection_pool* pool) {

test/put_directory.cpp

@@ -103,7 +103,7 @@ BOOST_AUTO_TEST_CASE( put_directory_4_threads) {
     const char* bucket_name = "test_bulk_put_directory";
     printf("  Putting all files in [%s] to bucket [%s]\n", dir_path, bucket_name);
 
-    ds3_client* client = get_client();
+    ds3_client* client = get_client_at_loglvl(DS3_DEBUG);
     int client_thread=1;
     ds3_client_register_logging(client, DS3_DEBUG, test_log, (void*)&client_thread); // Use DEBUG level logging
 
@@ -139,10 +139,10 @@ BOOST_AUTO_TEST_CASE( put_directory_4_threads) {
     double elapsed_t;
     clock_gettime(CLOCK_MONOTONIC, &start_time_t);
 
-    GThread* put_dir_xfer_thread_0 = g_thread_new("put_dir_xfer_thread_1", (GThreadFunc)put_chunks_from_file, g_ptr_array_index(put_dir_args, 0));
-    GThread* put_dir_xfer_thread_1 = g_thread_new("put_dir_xfer_thread_2", (GThreadFunc)put_chunks_from_file, g_ptr_array_index(put_dir_args, 1));
-    GThread* put_dir_xfer_thread_2 = g_thread_new("put_dir_xfer_thread_3", (GThreadFunc)put_chunks_from_file, g_ptr_array_index(put_dir_args, 2));
-    GThread* put_dir_xfer_thread_3 = g_thread_new("put_dir_xfer_thread_4", (GThreadFunc)put_chunks_from_file, g_ptr_array_index(put_dir_args, 3));
+    GThread* put_dir_xfer_thread_0 = g_thread_new("put_dir_xfer_thread_0", (GThreadFunc)put_chunks_from_file, g_ptr_array_index(put_dir_args, 0));
+    GThread* put_dir_xfer_thread_1 = g_thread_new("put_dir_xfer_thread_1", (GThreadFunc)put_chunks_from_file, g_ptr_array_index(put_dir_args, 1));
+    GThread* put_dir_xfer_thread_2 = g_thread_new("put_dir_xfer_thread_2", (GThreadFunc)put_chunks_from_file, g_ptr_array_index(put_dir_args, 2));
+    GThread* put_dir_xfer_thread_3 = g_thread_new("put_dir_xfer_thread_3", (GThreadFunc)put_chunks_from_file, g_ptr_array_index(put_dir_args, 3));
 
     // Block and cleanup GThread(s)
     g_thread_join(put_dir_xfer_thread_0);

test/test.cpp

@@ -45,12 +45,20 @@ struct BoostTestFixture {
 
 BOOST_GLOBAL_FIXTURE( BoostTestFixture );
 
+void log_timestamp(char* string_buff, long buff_size)
+{
+    
+    g_snprintf(string_buff, buff_size, "%s", );
+}
+
 void test_log(const char* message, void* user_data) {
+    char timebuffer[32];
+    log_timestamp(timebuffer, 32);
     if (user_data) {
         int client_num = *((int*)user_data);
-        fprintf(stderr, "ClientNum[%d], Log Message: %s\n", client_num, message);
+        fprintf(stderr, "%s Client[%d] %s\n", client_num, message);
     } else {
-        fprintf(stderr, "Log Message: %s\n", message);
+        fprintf(stderr, "%s %s\n", message);
     }
 }
 
@@ -541,6 +549,9 @@ void put_chunks_from_file(void* args) {
                     char* file_with_path = g_strconcat(_args->src_dir, object->name->value, (char*)NULL);
                     printf("  opening file[%s]\n", file_with_path);
                     file = fopen(file_with_path, "r");
+                    if (file == NULL) {
+                        printf("  ***Unable to open file[%s]!!!\n", file_with_path);
+                    }
                     g_free(file_with_path);
                 }
                 if (object->offset != 0) {