hcq/sysbench
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automerge.

Browse Source
This commit is contained in:
Alexey Kopytov
2010-11-09 20:00:02 +03:00
parent bf3e2c8c0b 63f538eb35
commit 2052190874
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sysbench/tests/fileio/sb_fileio.c
View File

@ -151,7 +151,6 @@ static long long position; /* current position in file */
static unsigned int current_file; /* current file */
static unsigned int fsynced_file; /* file number to be fsynced (periodic) */
static unsigned int fsynced_file2; /* fsyncing in the end */
static pthread_mutex_t fsync_mutex; /* used to sync access to counters */
static int is_dirty; /* any writes after last fsync series ? */
static int read_ops;
@ -353,8 +352,6 @@ int file_prepare(void)
return 1;
#endif
pthread_mutex_init(&fsync_mutex, NULL);
return 0;
}
@ -383,8 +380,6 @@ int file_done(void)
if (buffer != NULL)
sb_free_memaligned(buffer);
pthread_mutex_destroy(&fsync_mutex);
return 0;
}
@ -410,6 +405,7 @@ sb_request_t file_get_seq_request(void)
sb_file_request_t *file_req = &sb_req.u.file_request;
sb_req.type = SB_REQ_TYPE_FILE;
SB_THREAD_MUTEX_LOCK();
/* assume function is called with correct mode always */
if (test_mode == MODE_WRITE || test_mode == MODE_REWRITE)
@ -433,7 +429,6 @@ sb_request_t file_get_seq_request(void)
}
/* Advance pointers, if we're not in the fsync phase */
pthread_mutex_lock(&fsync_mutex);
if(current_file != num_files)
position += file_req->size;
/* scroll to the next file if not already out of bound */
@ -442,14 +437,13 @@ sb_request_t file_get_seq_request(void)
current_file++;
position=0;
pthread_mutex_unlock(&fsync_mutex);
if (sb_globals.validate)
{
check_seq_req(&prev_req, file_req);
prev_req = *file_req;
}
SB_THREAD_MUTEX_UNLOCK();
return sb_req; /* This request is valid even for last file */
}
@ -469,7 +463,7 @@ sb_request_t file_get_seq_request(void)
else
sb_req.type = SB_REQ_TYPE_NULL;
}
pthread_mutex_unlock(&fsync_mutex);
SB_THREAD_MUTEX_UNLOCK();
if (sb_globals.validate)
{
@ -494,6 +488,7 @@ sb_request_t file_get_rnd_request(void)
int mode = test_mode;
sb_req.type = SB_REQ_TYPE_FILE;
SB_THREAD_MUTEX_LOCK();
/*
Convert mode for combined tests. Locking to get consistent values
@ -501,12 +496,10 @@ sb_request_t file_get_rnd_request(void)
*/
if (test_mode==MODE_RND_RW)
{
SB_THREAD_MUTEX_LOCK();
if ((double)(real_read_ops + 1) / (real_write_ops + 1) < file_rw_ratio)
mode=MODE_RND_READ;
else
mode=MODE_RND_WRITE;
SB_THREAD_MUTEX_UNLOCK();
}
/* fsync all files (if requested by user) as soon as we are done */
@ -516,7 +509,6 @@ sb_request_t file_get_rnd_request(void)
(real_mode == MODE_RND_WRITE || real_mode == MODE_RND_RW ||
real_mode == MODE_MIXED))
{
pthread_mutex_lock(&fsync_mutex);
if(fsynced_file2 < num_files)
{
file_req->file_id = fsynced_file2;
@ -524,14 +516,14 @@ sb_request_t file_get_rnd_request(void)
file_req->pos = 0;
file_req->size = 0;
fsynced_file2++;
pthread_mutex_unlock(&fsync_mutex);
SB_THREAD_MUTEX_UNLOCK();
return sb_req;
}
pthread_mutex_unlock(&fsync_mutex);
}
sb_req.type = SB_REQ_TYPE_NULL;
SB_THREAD_MUTEX_UNLOCK();
return sb_req;
}
@ -554,6 +546,7 @@ sb_request_t file_get_rnd_request(void)
is_dirty = 0;
}
SB_THREAD_MUTEX_UNLOCK();
return sb_req;
}
}
@ -574,6 +567,7 @@ sb_request_t file_get_rnd_request(void)
if (file_req->operation == FILE_OP_TYPE_WRITE)
is_dirty = 1;
SB_THREAD_MUTEX_UNLOCK();
return sb_req;
}