Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d98177e4
Commit
d98177e4
authored
Jul 26, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
parents
1f0c0f36
4db445b9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
innobase/include/os0file.h
innobase/include/os0file.h
+2
-0
innobase/os/os0file.c
innobase/os/os0file.c
+14
-0
innobase/trx/trx0sys.c
innobase/trx/trx0sys.c
+2
-1
No files found.
innobase/include/os0file.h
View file @
d98177e4
...
...
@@ -17,7 +17,9 @@ Created 10/21/1995 Heikki Tuuri
#include <time.h>
#endif
#ifdef UNIV_DO_FLUSH
extern
ibool
os_do_not_call_flush_at_each_write
;
#endif
/* UNIV_DO_FLUSH */
extern
ibool
os_has_said_disk_full
;
extern
ibool
os_aio_print_debug
;
...
...
innobase/os/os0file.c
View file @
d98177e4
...
...
@@ -33,9 +33,13 @@ ulint os_innodb_umask = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
ulint
os_innodb_umask
=
0
;
#endif
#ifdef UNIV_DO_FLUSH
/* If the following is set to TRUE, we do not call os_file_flush in every
os_file_write. We can set this TRUE when the doublewrite buffer is used. */
ibool
os_do_not_call_flush_at_each_write
=
FALSE
;
#else
/* We do not call os_file_flush in every os_file_write. */
#endif
/* UNIV_DO_FLUSH */
/* We use these mutexes to protect lseek + file i/o operation, if the
OS does not provide an atomic pread or pwrite, or similar */
...
...
@@ -1974,6 +1978,7 @@ os_file_pwrite(
os_file_n_pending_pwrites
--
;
os_mutex_exit
(
os_file_count_mutex
);
# ifdef UNIV_DO_FLUSH
if
(
srv_unix_file_flush_method
!=
SRV_UNIX_LITTLESYNC
&&
srv_unix_file_flush_method
!=
SRV_UNIX_NOSYNC
&&
!
os_do_not_call_flush_at_each_write
)
{
...
...
@@ -1984,6 +1989,7 @@ os_file_pwrite(
ut_a
(
TRUE
==
os_file_flush
(
file
));
}
# endif
/* UNIV_DO_FLUSH */
return
(
ret
);
#else
...
...
@@ -2006,6 +2012,7 @@ os_file_pwrite(
ret
=
write
(
file
,
buf
,
(
ssize_t
)
n
);
# ifdef UNIV_DO_FLUSH
if
(
srv_unix_file_flush_method
!=
SRV_UNIX_LITTLESYNC
&&
srv_unix_file_flush_method
!=
SRV_UNIX_NOSYNC
&&
!
os_do_not_call_flush_at_each_write
)
{
...
...
@@ -2016,6 +2023,7 @@ os_file_pwrite(
ut_a
(
TRUE
==
os_file_flush
(
file
));
}
# endif
/* UNIV_DO_FLUSH */
os_mutex_exit
(
os_file_seek_mutexes
[
i
]);
...
...
@@ -2282,9 +2290,11 @@ os_file_write(
/* Always do fsync to reduce the probability that when the OS crashes,
a database page is only partially physically written to disk. */
# ifdef UNIV_DO_FLUSH
if
(
!
os_do_not_call_flush_at_each_write
)
{
ut_a
(
TRUE
==
os_file_flush
(
file
));
}
# endif
/* UNIV_DO_FLUSH */
os_mutex_exit
(
os_file_seek_mutexes
[
i
]);
...
...
@@ -3498,10 +3508,12 @@ os_aio_windows_handle(
if
(
ret
&&
len
==
slot
->
len
)
{
ret_val
=
TRUE
;
# ifdef UNIV_DO_FLUSH
if
(
slot
->
type
==
OS_FILE_WRITE
&&
!
os_do_not_call_flush_at_each_write
)
{
ut_a
(
TRUE
==
os_file_flush
(
slot
->
file
));
}
# endif
/* UNIV_DO_FLUSH */
}
else
{
os_file_handle_error
(
slot
->
name
,
"Windows aio"
);
...
...
@@ -3582,10 +3594,12 @@ os_aio_posix_handle(
*
message1
=
slot
->
message1
;
*
message2
=
slot
->
message2
;
# ifdef UNIV_DO_FLUSH
if
(
slot
->
type
==
OS_FILE_WRITE
&&
!
os_do_not_call_flush_at_each_write
)
{
ut_a
(
TRUE
==
os_file_flush
(
slot
->
file
));
}
# endif
/* UNIV_DO_FLUSH */
os_mutex_exit
(
array
->
mutex
);
...
...
innobase/trx/trx0sys.c
View file @
d98177e4
...
...
@@ -97,8 +97,9 @@ trx_doublewrite_init(
/* Since we now start to use the doublewrite buffer, no need to call
fsync() after every write to a data file */
#ifdef UNIV_DO_FLUSH
os_do_not_call_flush_at_each_write
=
TRUE
;
#endif
/* UNIV_DO_FLUSH */
mutex_create
(
&
(
trx_doublewrite
->
mutex
));
mutex_set_level
(
&
(
trx_doublewrite
->
mutex
),
SYNC_DOUBLEWRITE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment