← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/srv/srv0start.c

  • Committer: Lee Bieber
  • Date: 2010-12-23 02:14:02 UTC
  • mfrom: (2021.1.2 build)
  • Revision ID: kalebral@gmail.com-20101223021402-o4zhdsv3x8s0q6pz
Merge Stewart - Update innobase plugin to be based on innodb 1.1.4 from MySQL 5.5.8 
Merge Marisa - fixed markup in 'administrative.rst', which was throwing an error in the build

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/srv/srv0start.c
123
123
/** Files comprising the system tablespace */
124
124
static os_file_t        files[1000];
125
125
 
126
 
/** Mutex protecting the ios count */
127
 
static mutex_t          ios_mutex;
128
 
/** Count of I/O operations in io_handler_thread() */
129
 
static ulint            ios;
130
 
 
131
126
/** io_handler_thread parameters for thread identification */
132
127
static ulint            n[SRV_MAX_N_IO_THREADS + 6];
133
128
/** io_handler_thread identifiers */
154
149
UNIV_INTERN mysql_pfs_key_t     srv_master_thread_key;
155
150
#endif /* UNIV_PFS_THREAD */
156
151
 
157
 
#ifdef UNIV_PFS_MUTEX
158
 
/* Key to register ios_mutex_key with performance schema */
159
 
UNIV_INTERN mysql_pfs_key_t     ios_mutex_key;
160
 
#endif /* UNIV_PFS_MUTEX */
161
 
 
162
152
/*********************************************************************//**
163
153
Convert a numeric string that optionally ends in G or M, to a number
164
154
containing megabytes.
493
483
 
494
484
        while (srv_shutdown_state != SRV_SHUTDOWN_EXIT_THREADS) {
495
485
                fil_aio_wait(segment);
496
 
 
497
 
                mutex_enter(&ios_mutex);
498
 
                ios++;
499
 
                mutex_exit(&ios_mutex);
500
486
        }
501
487
 
502
 
        thr_local_free(os_thread_get_curr_id());
503
 
 
504
488
        /* We count the number of threads in os_thread_exit(). A created
505
489
        thread should always use that to exit and not use return() to exit.
506
490
        The thread actually never comes here because it is exited in an
999
983
                                srv_data_file_is_raw_partition[i] != 0);
1000
984
        }
1001
985
 
1002
 
        ios = 0;
1003
 
 
1004
 
        mutex_create(ios_mutex_key, &ios_mutex, SYNC_NO_ORDER_CHECK);
1005
 
 
1006
986
        return(DB_SUCCESS);
1007
987
}
1008
988