# HG changeset patch
# User Masataka Kohagura <kohagura@cr.ie.u-ryukyu.ac.jp>
# Date 1405441700 -32400
# Node ID 8130b38b53914dd68c9f52598e93f46477281786
# Parent  6849865f96eb18e930b01e16ce37aba9365b2b16# Parent  630eef931336b02cb15ba37511bdc68a171dfda9
merge

diff -r 6849865f96eb -r 8130b38b5391 example/word_count/Func.h
--- a/example/word_count/Func.h	Tue Jul 15 17:23:40 2014 +0900
+++ b/example/word_count/Func.h	Wed Jul 16 01:28:20 2014 +0900
@@ -13,6 +13,7 @@
     MY_MMAP,
     MY_READ,
     BLOCKED_READ,
+    BLOCKED_MMAP,
 };
 
 #define DATA_NUM 16
diff -r 6849865f96eb -r 8130b38b5391 example/word_count/main.cc
--- a/example/word_count/main.cc	Tue Jul 15 17:23:40 2014 +0900
+++ b/example/word_count/main.cc	Wed Jul 16 01:28:20 2014 +0900
@@ -325,6 +325,9 @@
     }else if(read_type == MY_MMAP) {
         printf("[mmap mode]\n");
         my_mmap(filename, w);
+    }else if(read_type == BLOCKED_MMAP) {
+        printf("[blocked mmap mode]\n");
+        my_mmap(filename, w);
     }
 
     HTaskPtr t_print;