diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-04-01 09:18:32 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-04-01 09:18:32 +0300 |
| commit | a9fb96b2cb1ecce7ba433659eacbec6bc974a0af (patch) | |
| tree | 62e7e37e8481e3be563cd52348a9f2fe4e7d5d1c /innobase/fil | |
| parent | f4b6dab211a1bac4d636aed32de40022ababcd06 (diff) | |
| download | mariadb-git-a9fb96b2cb1ecce7ba433659eacbec6bc974a0af.tar.gz | |
fil0fil.c, os0file.c, srv0srv.h, srv0srv.c:
Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char*
innobase/srv/srv0srv.c:
Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char*
innobase/include/srv0srv.h:
Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char*
innobase/os/os0file.c:
Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char*
innobase/fil/fil0fil.c:
Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char*
Diffstat (limited to 'innobase/fil')
| -rw-r--r-- | innobase/fil/fil0fil.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c index 35a028822c0..a363b3c462a 100644 --- a/innobase/fil/fil0fil.c +++ b/innobase/fil/fil0fil.c @@ -1331,8 +1331,7 @@ fil_aio_wait( ut_ad(fil_validate()); if (os_aio_use_native_aio) { - ut_a(segment < SRV_MAX_N_IO_THREADS); - srv_io_thread_op_info[segment] = (char *) "native aio handle"; + srv_set_io_thread_op_info(segment, "native aio handle"); #ifdef WIN_ASYNC_IO ret = os_aio_windows_handle(segment, 0, &fil_node, &message, &type); @@ -1343,8 +1342,7 @@ fil_aio_wait( ut_error; #endif } else { - ut_a(segment < SRV_MAX_N_IO_THREADS); - srv_io_thread_op_info[segment] =(char *)"simulated aio handle"; + srv_set_io_thread_op_info(segment, "simulated aio handle"); ret = os_aio_simulated_handle(segment, (void**) &fil_node, &message, &type); @@ -1352,8 +1350,7 @@ fil_aio_wait( ut_a(ret); - ut_a(segment < SRV_MAX_N_IO_THREADS); - srv_io_thread_op_info[segment] = (char *) "complete io for fil node"; + srv_set_io_thread_op_info(segment, "complete io for fil node"); mutex_enter(&(system->mutex)); @@ -1366,13 +1363,10 @@ fil_aio_wait( /* Do the i/o handling */ if (buf_pool_is_block(message)) { - ut_a(segment < SRV_MAX_N_IO_THREADS); - srv_io_thread_op_info[segment] = - (char *) "complete io for buf page"; + srv_set_io_thread_op_info(segment, "complete io for buf page"); buf_page_io_complete(message); } else { - ut_a(segment < SRV_MAX_N_IO_THREADS); - srv_io_thread_op_info[segment] =(char *) "complete io for log"; + srv_set_io_thread_op_info(segment, "complete io for log"); log_io_complete(message); } } |