diff options
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/btr/btr0cur.c | 6 | ||||
| -rw-r--r-- | innobase/configure.in | 20 | ||||
| -rw-r--r-- | innobase/include/os0thread.h | 3 | ||||
| -rw-r--r-- | innobase/os/os0file.c | 23 | ||||
| -rw-r--r-- | innobase/os/os0sync.c | 2 | ||||
| -rw-r--r-- | innobase/os/os0thread.c | 2 | ||||
| -rw-r--r-- | innobase/srv/srv0srv.c | 55 | ||||
| -rw-r--r-- | innobase/srv/srv0start.c | 22 | ||||
| -rw-r--r-- | innobase/sync/sync0sync.c | 2 |
9 files changed, 115 insertions, 20 deletions
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c index 71a224445db..e61dcf4ecee 100644 --- a/innobase/btr/btr0cur.c +++ b/innobase/btr/btr0cur.c @@ -608,7 +608,7 @@ btr_cur_open_at_index_side( if (estimate) { btr_cur_add_path_info(cursor, height, root_height); - } + } break; } @@ -622,8 +622,8 @@ btr_cur_open_at_index_side( } if (estimate) { - btr_cur_add_path_info(cursor, height, root_height); - } + btr_cur_add_path_info(cursor, height, root_height); + } height--; diff --git a/innobase/configure.in b/innobase/configure.in index 59d213fef12..29309a2c0a5 100644 --- a/innobase/configure.in +++ b/innobase/configure.in @@ -110,14 +110,14 @@ case "$target" in CFLAGS="$CFLAGS -DUNIV_INTEL_X86";; esac -AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile - buf/Makefile com/Makefile data/Makefile - dict/Makefile dyn/Makefile - eval/Makefile fil/Makefile fsp/Makefile fut/Makefile - ha/Makefile ibuf/Makefile include/Makefile - lock/Makefile log/Makefile - mach/Makefile mem/Makefile mtr/Makefile odbc/Makefile - page/Makefile pars/Makefile que/Makefile - read/Makefile rem/Makefile row/Makefile - srv/Makefile sync/Makefile thr/Makefile trx/Makefile +AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl + buf/Makefile com/Makefile data/Makefile dnl + dict/Makefile dyn/Makefile dnl + eval/Makefile fil/Makefile fsp/Makefile fut/Makefile dnl + ha/Makefile ibuf/Makefile include/Makefile dnl + lock/Makefile log/Makefile dnl + mach/Makefile mem/Makefile mtr/Makefile odbc/Makefile dnl + page/Makefile pars/Makefile que/Makefile dnl + read/Makefile rem/Makefile row/Makefile dnl + srv/Makefile sync/Makefile thr/Makefile trx/Makefile dnl usr/Makefile) diff --git a/innobase/include/os0thread.h b/innobase/include/os0thread.h index efc8651e06d..629cfef23a8 100644 --- a/innobase/include/os0thread.h +++ b/innobase/include/os0thread.h @@ -15,9 +15,10 @@ Created 9/8/1995 Heikki Tuuri /* Maximum number of threads which can be created in the program; this is also the size of the wait slot array for MySQL threads which can wait inside InnoDB */ -#ifdef __WIN__ +#if defined(__WIN__) || defined(__NETWARE__) /* Create less event semaphores because Win 98/ME had difficult creating 40000 event semaphores */ +/* TODO: these just take a lot of memory on NetWare. should netware move up? */ #define OS_THREAD_MAX_N 1000 #else #define OS_THREAD_MAX_N 10000 diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index fa5482a8cd1..293ced92c42 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -8,6 +8,7 @@ Created 10/21/1995 Heikki Tuuri #include "os0file.h" #include "os0sync.h" +#include "os0thread.h" #include "ut0mem.h" #include "srv0srv.h" #include "fil0fil.h" @@ -1093,6 +1094,7 @@ os_file_write( DWORD low; DWORD high; ulint i; + ulint n_retries = 0; ut_a((offset & 0xFFFFFFFF) == offset); @@ -1101,7 +1103,7 @@ os_file_write( ut_ad(file); ut_ad(buf); ut_ad(n > 0); - +retry: low = offset; high = offset_high; @@ -1145,6 +1147,19 @@ os_file_write( return(TRUE); } + /* If some background file system backup tool is running, then, at + least in Windows 2000, we may get here a specific error. Let us + retry the operation 100 times, with 1 second waits. */ + + if (GetLastError() == ERROR_LOCK_VIOLATION && n_retries < 100) { + + os_thread_sleep(1000000); + + n_retries++; + + goto retry; + } + if (!os_has_said_disk_full) { ut_print_timestamp(stderr); @@ -1157,7 +1172,7 @@ os_file_write( "InnoDB: what the error number means.\n" "InnoDB: Check that your OS and file system support files of this size.\n" "InnoDB: Check also that the disk is not full or a disk quota exceeded.\n", - name, offset_high, offset, n, len, + name, offset_high, offset, n, (ulint)len, (ulint)GetLastError()); os_has_said_disk_full = TRUE; @@ -1180,13 +1195,13 @@ os_file_write( fprintf(stderr, " InnoDB: Error: Write to file %s failed at offset %lu %lu.\n" -"InnoDB: %lu bytes should have been written, only %lu were written.\n" +"InnoDB: %lu bytes should have been written, only %ld were written.\n" "InnoDB: Operating system error number %lu.\n" "InnoDB: Look from section 13.2 at http://www.innodb.com/ibman.html\n" "InnoDB: what the error number means or use the perror program of MySQL.\n" "InnoDB: Check that your OS and file system support files of this size.\n" "InnoDB: Check also that the disk is not full or a disk quota exceeded.\n", - name, offset_high, offset, n, (ulint)ret, + name, offset_high, offset, n, (long int)ret, (ulint)errno); os_has_said_disk_full = TRUE; } diff --git a/innobase/os/os0sync.c b/innobase/os/os0sync.c index bac1f23a1af..a9127e6310a 100644 --- a/innobase/os/os0sync.c +++ b/innobase/os/os0sync.c @@ -495,6 +495,8 @@ os_fast_mutex_free( ut_a(fast_mutex); DeleteCriticalSection((LPCRITICAL_SECTION) fast_mutex); +#elif defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY) + pthread_mutex_destroy(fast_mutex); #else UT_NOT_USED(fast_mutex); diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c index 30404c4e66b..b0076921e43 100644 --- a/innobase/os/os0thread.c +++ b/innobase/os/os0thread.c @@ -214,6 +214,8 @@ os_thread_sleep( { #ifdef __WIN__ Sleep(tm / 1000); +#elif defined(__NETWARE__) + delay(tm / 1000); #else struct timeval t; diff --git a/innobase/srv/srv0srv.c b/innobase/srv/srv0srv.c index 61f5a847d51..c6f3bd40dfe 100644 --- a/innobase/srv/srv0srv.c +++ b/innobase/srv/srv0srv.c @@ -1700,8 +1700,63 @@ srv_general_init(void) thr_local_init(); } + +#if defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY) +/* NetWare requires some cleanup of mutexes */ + +/************************************************************************* +Deinitializes the synchronization primitives, memory system, and the thread +local storage. */ + +void +srv_general_free(void) +/*==================*/ +{ + sync_close(); +} +#endif /* __NETWARE__ */ + + /*======================= InnoDB Server FIFO queue =======================*/ +#if defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY) +/* NetWare requires some cleanup of mutexes */ + +/************************************************************************* +Deinitializes the server. */ + +void +srv_free(void) +/*==========*/ +{ + srv_conc_slot_t* conc_slot; + srv_slot_t* slot; + ulint i; + + for (i = 0; i < OS_THREAD_MAX_N; i++) + { + slot = srv_table_get_nth_slot(i); + os_event_free(slot->event); + } + + /* TODO: free(srv_sys->threads); */ + + for (i = 0; i < OS_THREAD_MAX_N; i++) + { + slot = srv_mysql_table + i; + os_event_free(slot->event); + } + + /* TODO: free(srv_mysql_table); */ + + for (i = 0; i < OS_THREAD_MAX_N; i++) + { + conc_slot = srv_conc_slots + i; + os_event_free(conc_slot->event); + } +} +#endif /* __NETWARE__ */ + /************************************************************************* Puts an OS thread to wait if there are too many concurrent threads (>= srv_thread_concurrency) inside InnoDB. The threads wait in a FIFO queue. */ diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index ec674b69256..65284d51b04 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -1415,6 +1415,10 @@ innobase_start_or_create_for_mysql(void) os_fast_mutex_unlock(&srv_os_test_mutex); +#if defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY) + os_fast_mutex_free(&srv_os_test_mutex); /* all platforms? */ +#endif /* __NETWARE__ */ + if (srv_print_verbose_log) { ut_print_timestamp(stderr); fprintf(stderr, " InnoDB: Started\n"); @@ -1461,12 +1465,28 @@ innobase_shutdown_for_mysql(void) srv_conc_n_threads); } +#if defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY) + /* + TODO: Fix this temporary solution + We are having a race condition occure with io_handler_thread threads. + When they yield in os_aio_simulated_handle during shutdown, this + thread was able to free the memory early. + */ + os_thread_yield(); + + /* TODO: Where should this be called? */ + srv_free(); + + /* TODO: Where should this be called? */ + srv_general_free(); +#endif /* TODO: We should exit the i/o-handler and other utility threads before freeing all memory. Now this can potentially cause a seg fault! */ -#ifdef NOT_WORKING_YET +#if defined(NOT_WORKING_YET) || defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY) + /* NetWare requires this free */ ut_free_all_mem(); #endif diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c index 376be2e723a..20d68ba5a9f 100644 --- a/innobase/sync/sync0sync.c +++ b/innobase/sync/sync0sync.c @@ -220,7 +220,7 @@ mutex_create_func( char* cfile_name, /* in: file name where created */ ulint cline) /* in: file line where created */ { -#if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) +#if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) && !defined(__NETWARE) mutex_reset_lock_word(mutex); #else os_fast_mutex_init(&(mutex->os_fast_mutex)); |