1 files changed, 10 insertions, 7 deletions

diff --git a/bin/rwrnlp.c b/bin/rwrnlp.c
index 07e3899..a73e2ad 100644
--- a/bin/rwrnlp.c
+++ b/bin/rwrnlp.c
@@ -146,7 +146,7 @@ struct thread_context* parse_csv(const char *file, int *num_tasks)
         } else {
             ctx[cur_task].type = write_req;
         }
-                if (1 != fscanf(fstream, "%ld",&ctx[cur_task].resources)){
+                if (1 != fscanf(fstream, "%lu",&ctx[cur_task].resources)){
                         fprintf(stderr, "invalid resource mask near line %d\n", cur_task);
                         exit(EXIT_FAILURE);
                 }
@@ -286,32 +286,35 @@ static int loop_for(double exec_time, double emergency_exit)
 static int job(struct thread_context *ctx, double program_end)
 {
     double ncs_length;
-    double cs_length;
+    long lock_overhead, unlock_overhead;
         if (wctime() > program_end){
         printf("Terminating...\n");
                 return 0;
     }
         else {
         ncs_length = (ctx->cost-ctx->cs_length)/2*S_PER_MS;
-        cs_length = ctx->cs_length * S_PER_MS;
                 loop_for(ncs_length, program_end + 1);
 
         if(ctx->type == read_req){
             //printf("%d:%d read locking...\n", __sync_fetch_and_add(&events,1), gettid());
-            rwrnlp_read_lock(&rw_lock, ctx->resources, ctx->processor);
+            lock_overhead = rwrnlp_read_lock(&rw_lock, ctx->resources, ctx->processor);
             //printf("%d:%d read CS...\n", __sync_fetch_and_add(&events, 1), gettid());
             loop_for(ctx->cs_length*S_PER_MS, program_end + 1);
             //printf("%d:%d read unlocking...\n", __sync_fetch_and_add(&events,1), gettid());
-            rwrnlp_read_unlock(&rw_lock, ctx->processor);
+            unlock_overhead = rwrnlp_read_unlock(&rw_lock, ctx->processor);
             //printf("%d:%d ncs...\n", __sync_fetch_and_add(&events,1), gettid());
+            printf("read lock overhead: %ld\n", lock_overhead);
+            printf("read unlock overhead: %ld\n", unlock_overhead);
         }else{
             //printf("%d:%d write locking %lu\n", __sync_fetch_and_add(&events,1), gettid(), ctx->resources);
-            rwrnlp_write_lock(&rw_lock, ctx->resources, ctx->processor);
+            lock_overhead = rwrnlp_write_lock(&rw_lock, ctx->resources, ctx->processor);
             //printf("%d:%d write CS...\n", __sync_fetch_and_add(&events,1), gettid());
             loop_for(ctx->cs_length*S_PER_MS, program_end + 1);
             //printf("%d:%d write unlocking...\n", __sync_fetch_and_add(&events,1), gettid());
-            rwrnlp_write_unlock(&rw_lock, ctx->processor);
+            unlock_overhead = rwrnlp_write_unlock(&rw_lock, ctx->processor);
             //printf("%d:%d ncs...\n", __sync_fetch_and_add(&events,1), gettid());
+            printf("write lock overhead: %ld\n", lock_overhead);
+            printf("write unlock overhead: %ld\n", unlock_overhead);
         }