From 011d4e6ff76c76fa7c49540282dee0bafef54fac Mon Sep 17 00:00:00 2001 From: Michael Scherle Date: Fri, 2 Nov 2018 05:13:09 -0700 Subject: cleaned up code and added improvements - cleaned up code - using fixed size type variables in file - using types.h fixup macros - replaced write/read with pwrite/pread (except for 2 occurrences) - added create fuse callback--- src/fuse/cowMerger/src/Cow_Merger.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/fuse/cowMerger/src/Cow_Merger.c') diff --git a/src/fuse/cowMerger/src/Cow_Merger.c b/src/fuse/cowMerger/src/Cow_Merger.c index b73cadc..f7d35aa 100644 --- a/src/fuse/cowMerger/src/Cow_Merger.c +++ b/src/fuse/cowMerger/src/Cow_Merger.c @@ -1,16 +1,20 @@ #include #include #include "merger.h" -int main(int argc, char *argv[]) { +#include +int main(int argc, char *argv[]) { if(argc != 3){ printf("Error, Check your Command Line Arguments.\nExample: ./Cow_Merger \n"); return EXIT_SUCCESS; } - char *imageFilePath = argv[1]; char *cowFilePath = argv[2]; - + clock_t t; + t = clock(); merger(imageFilePath, cowFilePath); + t = clock() - t; + double time_taken = ((double)t)/CLOCKS_PER_SEC; // in seconds + printf("merger took %f seconds to execute \n", time_taken); return EXIT_SUCCESS; } -- cgit v1.2.3-55-g7522