split platform.h to umemory.h and uthread.h

chamdoo · chamdoo · commit cd2a7670400d · 2016-01-12T18:25:15.000-05:00
diff --git a/common/bdbm_main.c b/common/bdbm_main.c
@@ -35,7 +35,7 @@ THE SOFTWARE.
 #endif
 
 #include "bdbm_drv.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "debug.h"
 
diff --git a/common/utils/ufile.c b/common/utils/ufile.c
@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include <linux/syscalls.h>
 
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "ufile.h"
 
 #elif defined(USER_MODE)
diff --git a/common/utils/uthread.c b/common/utils/uthread.c
@@ -23,7 +23,8 @@ THE SOFTWARE.
 */
 
 #include "debug.h"
-#include "platform.h"
+#include "usync.h"
+#include "umemory.h"
 #include "uthread.h"
 
 #if defined(KERNEL_MODE)
diff --git a/common/utils/uthread.h b/common/utils/uthread.h
@@ -34,7 +34,11 @@ THE SOFTWARE.
 #include <linux/kthread.h>
 #include <linux/sched.h>
 
-#include "platform.h"
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,5,0)
+#define bdbm_daemonize(a) daemonize(a)
+#else
+#define bdbm_daemonize(a)
+#endif
 
 typedef struct {
 	/* thread management */
@@ -52,7 +56,6 @@ typedef struct {
 
 #include <stdint.h>
 #include <pthread.h>
-
 #include "uatomic64.h"
 
 #define SIGKILL	0xCCCC
@@ -63,7 +66,6 @@ typedef struct {
 	bdbm_mutex_t thread_sleep;
 	pthread_cond_t thread_con;
 	pthread_t thread;
-	/*atomic64_t is_sleep;*/
 
 	/* user management */
 	void* user_data;
@@ -79,11 +81,9 @@ void bdbm_thread_wakeup (bdbm_thread_t* k);
 void bdbm_thread_stop (bdbm_thread_t* k);
 void bdbm_thread_msleep (uint32_t ms);
 void bdbm_thread_yield (void);
-
 void bdbm_thread_schedule_setup (bdbm_thread_t* k);
 void bdbm_thread_schedule_cancel (bdbm_thread_t* k);
 int bdbm_thread_schedule_sleep (bdbm_thread_t* k);
 
-
 #endif /* _BLUEDBM_THREAD_H */
 
diff --git a/common/utils/utime.c b/common/utils/utime.c
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include <linux/slab.h>
 
 #include "bdbm_drv.h"
-#include "platform.h"
+#include "umemory.h"
 #include "debug.h"
 #include "utime.h"
 
diff --git a/devices/bluedbm/dm_bluedbm.c b/devices/bluedbm/dm_bluedbm.c
@@ -41,7 +41,8 @@ THE SOFTWARE.
 #include "dev_params.h"
 #include "debug.h"
 #include "dm_bluedbm.h"
-#include "platform.h"
+#include "umemory.h"
+#include "uthread.h"
 #include "dev_params.h"
 
 //#define USE_TIMER
diff --git a/devices/common/dev_main.c b/devices/common/dev_main.c
@@ -24,6 +24,7 @@ THE SOFTWARE.
 
 #if defined (KERNEL_MODE)
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include "dev_stub.h"
 
 #elif defined (USER_MODE)
diff --git a/devices/common/dev_params.c b/devices/common/dev_params.c
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "params.h"
-#include "platform.h"
+#include "umemory.h"
 #include "debug.h"
 
 //#define SZ_PAGE	32
diff --git a/devices/common/dev_stub.c b/devices/common/dev_stub.c
@@ -42,7 +42,7 @@ THE SOFTWARE.
 
 #include "dev_params.h"
 #include "dev_stub.h"
-#include "platform.h"
+#include "umemory.h"
 
 
 /* exported by the device implementation module */
diff --git a/devices/dragonfire/dm_df.c b/devices/dragonfire/dm_df.c
@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "utime.h"
 
diff --git a/devices/libdummy/dm_dummy.c b/devices/libdummy/dm_dummy.c
@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "utime.h"
 
diff --git a/devices/ramdrive/dev_ramssd.c b/devices/ramdrive/dev_ramssd.c
@@ -37,7 +37,7 @@ THE SOFTWARE.
 #endif
 
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "bdbm_drv.h"
 #include "ufile.h"
 #include "dev_ramssd.h"
@@ -61,6 +61,7 @@ static void __display_hex_values (uint8_t* host, uint8_t* back)
 		host[0], host[1], host[2], host[3], host[4], 
 		back[0], back[1], back[2], back[3], back[4]);
 }
+#if 0
 static void __display_hex_values_all (uint8_t* host, uint8_t* back)
 {
 	int i = 0;
@@ -71,6 +72,7 @@ static void __display_hex_values_all (uint8_t* host, uint8_t* back)
 	}
 }
 #endif
+#endif
 
 /* Functions for Managing DRAM SSD */
 static uint8_t* __ramssd_page_addr (
@@ -241,7 +243,7 @@ static uint8_t __ramssd_read_page (
 			if (partial == 1 && kp_stt[loop] == KP_STT_DATA)	continue;
 			ptr_data_org = (uint8_t*)__get_ramssd_data_addr (ri, lpa);
 			if (memcmp (kp_ptr[loop], ptr_data_org+(loop*KPAGE_SIZE), KPAGE_SIZE) != 0) {
-				bdbm_msg ("[DATA CORRUPTION] lpa=%llu offset=%llu", lpa, loop);
+				bdbm_msg ("[DATA CORRUPTION] lpa=%llu offset=%u", lpa, loop);
 				__display_hex_values (kp_ptr[loop], ptr_data_org+(loop*KPAGE_SIZE));
 			}
 		}
@@ -254,7 +256,7 @@ static uint8_t __ramssd_read_page (
 			if (partial == 0 && kp_stt[loop] != KP_STT_DATA) continue;
 			ptr_data_org = (uint8_t*)__get_ramssd_data_addr (ri, lpa);
 			if (memcmp (kp_ptr[loop], ptr_data_org, KPAGE_SIZE) != 0) {
-				bdbm_msg ("[DATA CORRUPTION] lpa=%llu offset=%llu pos=%d", lpa, loop);
+				bdbm_msg ("[DATA CORRUPTION] lpa=%llu offset=%u", lpa, loop);
 				__display_hex_values (kp_ptr[loop], ptr_data_org);
 			}
 		}
diff --git a/devices/ramdrive/dm_ramdrive.c b/devices/ramdrive/dm_ramdrive.c
@@ -39,6 +39,7 @@ THE SOFTWARE.
 #include "dev_ramssd.h"
 
 #include "utime.h"
+#include "umemory.h"
 
 
 /* interface for dm */
@@ -149,7 +150,7 @@ uint32_t dm_ramdrive_make_reqs (bdbm_drv_info_t* bdi, bdbm_hlm_req_t* hr)
 {
 #include "../../ftl/hlm_reqs_pool.h"
 
-	uint32_t i, ret;
+	uint32_t i, ret = 1;
 	bdbm_llm_req_t* lr = NULL;
 	dm_ramssd_private_t* p = BDBM_DM_PRIV (bdi);
 
diff --git a/examples/raw-flash/raw-flash.c b/examples/raw-flash/raw-flash.c
@@ -26,7 +26,7 @@ THE SOFTWARE.
 
 #include "params.h"
 #include "raw-flash.h"
-#include "platform.h"
+#include "umemory.h"
 #include "debug.h"
 #include "devices.h"
 
diff --git a/frontend/hybrid/blkio_proxy.c b/frontend/hybrid/blkio_proxy.c
@@ -36,7 +36,7 @@ THE SOFTWARE.
 #include <linux/jiffies.h> /* jiffies */
 
 #include "bdbm_drv.h"
-#include "platform.h"
+#include "umemory.h"
 #include "debug.h"
 
 #include "blkio_proxy.h"
diff --git a/frontend/hybrid/blkio_proxy_reqs_pool.c b/frontend/hybrid/blkio_proxy_reqs_pool.c
@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include <linux/module.h>
 
 #include "bdbm_drv.h"
-#include "platform.h"
+#include "umemory.h"
 #include "debug.h"
 
 #include "blkio_proxy.h"
diff --git a/frontend/hybrid/blkio_stub.c b/frontend/hybrid/blkio_stub.c
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "utime.h"
 #include "uthread.h"
diff --git a/frontend/kernel/blkdev.c b/frontend/kernel/blkdev.c
@@ -32,6 +32,7 @@ THE SOFTWARE.
 #include "debug.h"
 #include "blkdev.h"
 #include "blkdev_ioctl.h"
+#include "umemory.h"
 
 
 int bdbm_blk_ioctl (struct block_device *bdev, fmode_t mode, unsigned cmd, unsigned long arg);
diff --git a/frontend/kernel/blkio.c b/frontend/kernel/blkio.c
@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "utime.h"
 #include "uthread.h"
diff --git a/frontend/nvme/dev_proxy.c b/frontend/nvme/dev_proxy.c
@@ -32,7 +32,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "userio.h"
 #include "params.h"
 
diff --git a/frontend/nvme/main.c b/frontend/nvme/main.c
@@ -37,7 +37,7 @@ THE SOFTWARE.
 #endif
 
 #include "bdbm_drv.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "ftl_params.h"
 #include "debug.h"
diff --git a/frontend/nvme/userio.c b/frontend/nvme/userio.c
@@ -28,7 +28,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "userio.h"
 #include "params.h"
 
diff --git a/frontend/user/dev_proxy.c b/frontend/user/dev_proxy.c
@@ -32,7 +32,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "userio.h"
 #include "params.h"
 
diff --git a/frontend/user/main.c b/frontend/user/main.c
@@ -37,7 +37,7 @@ THE SOFTWARE.
 #endif
 
 #include "bdbm_drv.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "ftl_params.h"
 #include "debug.h"
@@ -67,7 +67,6 @@ bdbm_drv_info_t* _bdi = NULL;
 /*#define NUM_THREADS	1*/
 
 #include "bdbm_drv.h"
-#include "platform.h"
 #include "uatomic64.h"
 
 void host_thread_fn_write (void *data) 
diff --git a/frontend/user/userio.c b/frontend/user/userio.c
@@ -28,7 +28,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "userio.h"
 #include "params.h"
 
diff --git a/ftl/algo/abm.c b/ftl/algo/abm.c
@@ -36,7 +36,7 @@ THE SOFTWARE.
 
 #include "bdbm_drv.h"
 #include "params.h"
-#include "platform.h"
+#include "umemory.h"
 #include "debug.h"
 #include "abm.h"
 #include "ufile.h"
diff --git a/ftl/algo/block_ftl.c b/ftl/algo/block_ftl.c
@@ -40,6 +40,7 @@ THE SOFTWARE.
 #include "params.h"
 #include "debug.h"
 #include "abm.h"
+#include "umemory.h"
 #include "block_ftl.h"
 
 #define DBG_ALLOW_INPLACE_UPDATE
diff --git a/ftl/algo/page_ftl.c b/ftl/algo/page_ftl.c
@@ -42,6 +42,7 @@ THE SOFTWARE.
 #include "debug.h"
 #include "utime.h"
 #include "ufile.h"
+#include "umemory.h"
 #include "hlm_reqs_pool.h"
 
 #include "algo/abm.h"
diff --git a/ftl/ftl_params.c b/ftl/ftl_params.c
@@ -37,7 +37,7 @@ THE SOFTWARE.
 #endif
 
 #include "params.h"
-#include "platform.h"
+#include "umemory.h"
 #include "debug.h"
 #include "bdbm_drv.h"
 
diff --git a/ftl/hlm_nobuf.c b/ftl/hlm_nobuf.c
@@ -40,6 +40,7 @@ THE SOFTWARE.
 #include "hlm_nobuf.h"
 #include "hlm_reqs_pool.h"
 #include "utime.h"
+#include "umemory.h"
 
 #include "algo/no_ftl.h"
 #include "algo/block_ftl.h"
diff --git a/ftl/hlm_reqs_pool.c b/ftl/hlm_reqs_pool.c
@@ -38,6 +38,7 @@ THE SOFTWARE.
 #include "params.h"
 #include "bdbm_drv.h"
 #include "hlm_reqs_pool.h"
+#include "umemory.h"
 
 
 #define DEFAULT_POOL_SIZE		128
diff --git a/ftl/llm_mq.c b/ftl/llm_mq.c
@@ -35,7 +35,7 @@ THE SOFTWARE.
 #endif
 
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "bdbm_drv.h"
 #include "uthread.h"
diff --git a/ftl/llm_noq.c b/ftl/llm_noq.c
@@ -35,7 +35,7 @@ THE SOFTWARE.
 #endif
 
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "bdbm_drv.h"
 #include "llm_noq.h"
diff --git a/ftl/llm_noq_lock.c b/ftl/llm_noq_lock.c
@@ -35,7 +35,7 @@ THE SOFTWARE.
 #endif
 
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "bdbm_drv.h"
 #include "llm_noq_lock.h"
diff --git a/ftl/llm_rmq.c b/ftl/llm_rmq.c
@@ -35,7 +35,7 @@ THE SOFTWARE.
 #endif
 
 #include "debug.h"
-#include "platform.h"
+#include "umemory.h"
 #include "params.h"
 #include "bdbm_drv.h"
 #include "uthread.h"
diff --git a/ftl/pmu.c b/ftl/pmu.c
diff --git a/ftl/pmu.h b/ftl/pmu.h
diff --git a/ftl/queue/prior_queue.c b/ftl/queue/prior_queue.c
diff --git a/ftl/queue/queue.c b/ftl/queue/queue.c
diff --git a/ftl/queue/rd_prior_queue.c b/ftl/queue/rd_prior_queue.c
diff --git a/include/bdbm_drv.h b/include/bdbm_drv.h
diff --git a/include/debug.h b/include/debug.h
diff --git a/include/platform.h b/include/platform.h
