fix all the current memory leaks

Author: Damien Churchill

blksync.c

@@ -52,6 +52,7 @@ int main(int argc, char **argv) {
     pthread_t *workers;
     pthread_attr_t pthread_custom_attr;
     params *p;
+    Action action;
     Chunk chunk;
     mqd_t r_queue, w_queue;
     struct mq_attr qattrs;
@@ -105,11 +106,15 @@ int main(int argc, char **argv) {
 
     // Initialize the variables
     buffer = (unsigned char *)malloc(chunk_size);
+    assert(buffer != NULL);
 
     // Initialize the threads
     workers = (pthread_t *)malloc(NUM_THREADS * sizeof(workers));
+    assert(workers != NULL);
+
     pthread_attr_init(&pthread_custom_attr);
     p = (params *)malloc(sizeof(params) * NUM_THREADS);
+    assert(p != NULL);
 
     for (i = 0; i < NUM_THREADS; i++) {
         p[i].id = i;
@@ -139,27 +144,38 @@ int main(int argc, char **argv) {
 
         // Now we have a chunk in our buffer, stick it on the queue
         chunk = bs_new_chunk(chunk_count, buffer, hash, chunk_size, hash_length);
+        action = bs_new_action(HASH_CHUNK, chunk);
         printf("sender chunk-%d: %p\n", chunk_count, chunk);
-        if (mq_send(r_queue, (char *)bs_new_action(HASH_CHUNK, chunk), MSG_SIZE, 5) == -1)
+        if (mq_send(r_queue, (char *)action, MSG_SIZE, 5) == -1)
             perror("Unable to send to read queue");
 
+        free(action);
+
         chunk_count++;
 
-        if (chunk_count >= 4)
+        if (chunk_count >= 1)
             break;
     }
 
     // End the threads
     for (i = 0; i < NUM_THREADS; i++) {
-        if (mq_send(r_queue, (char *)bs_new_action(END_THREAD, hash), MSG_SIZE, 5) == -1)
+        action = bs_new_action(END_THREAD, hash);
+        if (mq_send(r_queue, (char *)action, MSG_SIZE, 5) == -1)
             perror("Unable to send to read queue");
+        free(action);
     }
 
     // Wait for the threads to exit
     for (i = 0; i < NUM_THREADS; i++) {
         pthread_join(workers[i], NULL);
     }
 
+    // Tidy up after ourselves
+    free(p);
+    free(buffer);
+    free(workers);
+
+    // Close the queues
     if (mq_close(r_queue) == -1)
         perror("Cannot close read-queue");
 
@@ -172,5 +188,10 @@ int main(int argc, char **argv) {
     if (mq_unlink("/bsync-wqueue") == -1)
         perror("Cannot unlink write-queue");
 
+    // Close the files
+    fclose(bd_fp);
+    fclose(bf_fp);
+    fclose(h_fp);
+
     return 0;
 };

chunk.c

@@ -54,5 +54,7 @@ void bs_destroy_chunk(Chunk chunk) {
     memset(chunk->data, 0, chunk->chunk_size);
     memset(chunk->hash, 0, chunk->hash_length);
     chunk->number = -1;
+    free(chunk->data);
+    free(chunk->hash);
     free(chunk);
 }

testAction.c

@@ -29,22 +29,24 @@ void test_action_simple(void) {
     assert(action->type == HASH_CHUNK);
 
     free(buffer);
+    free(action);
 }
 
 void test_action_loop(void) {
     int i;
-    char *buffer;
+    char *buffer, *format = "thisisrandomteststringnumber%04d";
     Action action;
 
     buffer = malloc(32);
 
     for (i = 0; i < 10000; i++) {
-        snprintf(buffer, 32, "thisisrandomteststringnumber%04d", i);
+        snprintf(buffer, 32, format, i);
 
         action = bs_new_action(HASH_CHUNK, buffer);
 
         assert(memcmp(action->data, buffer, 32) == 0);
         assert(action->type == HASH_CHUNK);
+        free(action);
     }
 
     free(buffer);

testChunk.c

@@ -36,4 +36,6 @@ void test_chunk(void) {
 
     assert(memcmp(chunk->data, "test", 4) == 0);
     assert(memcmp(chunk->hash, "thistesthashforatest", 20) == 0);
+
+    bs_destroy_chunk(chunk);
 }

worker.c

@@ -68,6 +68,8 @@ void *bs_hash_chunk(void *arg) {
 
         bs_print_hash((unsigned char *)hash, p->hash_length);
         printf("\n");
+
+        bs_destroy_chunk(chunk);
         //printf("new_hash: %s\n", chunk->hash);
 
         //if (memcmp(chunk->hash, new_hash, SHA1_LENGTH) != 0) {