RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

import mars-46.tgz

This commit is contained in:
Thomas Schoebel-Theuer 2010-10-22 13:00:08 +01:00
parent fa9c315e3f
commit b3c030befb
3 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mars_device_sio.c
View File

@ -244,6 +244,22 @@ static void device_sio_ref_io(struct device_sio_output *output, struct mars_ref_
int test; int test;
if (unlikely(!output->filp)) { if (unlikely(!output->filp)) {
cb->cb_error = -EINVAL;
goto done;
}
/* Shortcut when possible
*/
if (S_ISBLK(output->filp->f_mapping->host->i_mode) && output->allow_bio) {
struct block_device *bdev = output->filp->f_mapping->host->i_bdev;
#if 0
static int count = 10;
if (count-- > 0)
MARS_INF("AHA: %p\n", bdev);
#endif
bio->bi_bdev = bdev;
submit_bio(bio->bi_rw, bio);
return;
} }
if (barrier) { if (barrier) {
@ -251,11 +267,6 @@ static void device_sio_ref_io(struct device_sio_output *output, struct mars_ref_
sync_file(output); sync_file(output);
} }
if (unlikely(!output->filp)) {
cb->cb_error = -EINVAL;
goto done;
}
if (rw == READ) { if (rw == READ) {
read_aops(output, mref); read_aops(output, mref);
} else { } else {
@ -423,6 +434,10 @@ static int device_sio_switch(struct device_sio_brick *brick, bool state)
int prot = 0600; int prot = 0600;
mm_segment_t oldfs; mm_segment_t oldfs;
if (output->o_direct) {
flags |= O_DIRECT;
MARS_INF("using O_DIRECT on %s\n", path);
}
if (state) { if (state) {
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(get_ds());

4
mars_device_sio.h
View File

@ -28,6 +28,10 @@ struct sio_threadinfo {
struct device_sio_output { struct device_sio_output {
MARS_OUTPUT(device_sio); MARS_OUTPUT(device_sio);
// parameters
bool o_direct;
bool allow_bio;
// private
struct file *filp; struct file *filp;
struct sio_threadinfo tinfo[WITH_THREAD+1]; struct sio_threadinfo tinfo[WITH_THREAD+1];
spinlock_t g_lock; spinlock_t g_lock;

27
mars_test.c
View File

@ -11,11 +11,12 @@
#define TRANS_BUFFERS (32) #define TRANS_BUFFERS (32)
#define TRANS_MEM (1024 / 4) #define TRANS_MEM (1024 / 4)
//#define CONF_TEST //#define CONF_TEST // use intermediate mars_check bricks
#define CONF_BUF //#define CONF_BUF
#define CONF_USEBUF //#define CONF_USEBUF
#define CONF_TRANS //#define CONF_TRANS
#define CONF_DIRECT // use O_DIRECT
//#define CONF_BIO // submit bios directly to device when possible
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
@ -46,10 +47,12 @@ static struct trans_logger_brick *_trans_brick = NULL;
static struct generic_brick *tbuf_brick = NULL; static struct generic_brick *tbuf_brick = NULL;
static struct buf_brick *_tbuf_brick = NULL; static struct buf_brick *_tbuf_brick = NULL;
static struct generic_brick *tdevice_brick = NULL; static struct generic_brick *tdevice_brick = NULL;
static struct device_sio_brick *_tdevice_brick = NULL;
static struct generic_brick *buf_brick = NULL; static struct generic_brick *buf_brick = NULL;
static struct buf_brick *_buf_brick = NULL; static struct buf_brick *_buf_brick = NULL;
static struct generic_brick *device_brick = NULL; static struct generic_brick *device_brick = NULL;
static struct device_sio_brick *_device_brick = NULL;
static void test_endio(struct generic_callback *cb) static void test_endio(struct generic_callback *cb)
{ {
@ -124,7 +127,14 @@ void make_test_instance(void)
MARS_DBG("starting....\n"); MARS_DBG("starting....\n");
device_brick = brick(&device_sio_brick_type); device_brick = brick(&device_sio_brick_type);
_device_brick = (void*)device_brick;
device_brick->outputs[0]->output_name = "/tmp/testfile.img"; device_brick->outputs[0]->output_name = "/tmp/testfile.img";
#ifdef CONF_DIRECT
_device_brick->outputs[0]->o_direct = true;
#endif
#ifdef CONF_BIO
_device_brick->outputs[0]->allow_bio = true;
#endif
device_brick->ops->brick_switch(device_brick, true); device_brick->ops->brick_switch(device_brick, true);
if_brick = brick(&if_device_brick_type); if_brick = brick(&if_device_brick_type);
@ -158,7 +168,14 @@ void make_test_instance(void)
#ifdef CONF_TRANS // trans_logger plus Infrastruktur zwischenschalten #ifdef CONF_TRANS // trans_logger plus Infrastruktur zwischenschalten
tdevice_brick = brick(&device_sio_brick_type); tdevice_brick = brick(&device_sio_brick_type);
_tdevice_brick = (void*)tdevice_brick;
tdevice_brick->outputs[0]->output_name = "/tmp/testfile.log"; tdevice_brick->outputs[0]->output_name = "/tmp/testfile.log";
#ifdef CONF_DIRECT
_tdevice_brick->outputs[0]->o_direct = true;
#endif
#ifdef CONF_BIO
_tdevice_brick->outputs[0]->allow_bio = true;
#endif
tdevice_brick->ops->brick_switch(tdevice_brick, true); tdevice_brick->ops->brick_switch(tdevice_brick, true);
tbuf_brick = brick(&buf_brick_type); tbuf_brick = brick(&buf_brick_type);