srv0start.c Eliminate wrong type calls of os_thread_create (181a9ac9) · Commits · Software / OSDI20 Artifacts / mariadb

innobase/srv/srv0srv.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -900,7 +900,7 @@ srv_create_utility_threads(void)
		/============================/
		{
		os_thread_t thread;
		os_thread_id_t thr_id;
		/* os_thread_id_t thr_id; */
		ulint i;

		mutex_enter(&kernel_mutex);
		@@ -911,7 +911,7 @@ srv_create_utility_threads(void)
		mutex_exit(&kernel_mutex);

		for (i = 0; i < 1; i++) {
		thread = os_thread_create(srv_recovery_thread, NULL, &thr_id);
		/* thread = os_thread_create(srv_recovery_thread, NULL, &thr_id); */

		ut_a(thread);
		}
		@@ -979,13 +979,13 @@ srv_create_com_threads(void)
		/========================/
		{
		os_thread_t thread;
		os_thread_id_t thr_id;
		/* os_thread_id_t thr_id; */
		ulint i;

		srv_n_threads[SRV_COM] = srv_n_com_threads;

		for (i = 0; i < srv_n_com_threads; i++) {
		thread = os_thread_create(srv_com_thread, NULL, &thr_id);
		/* thread = os_thread_create(srv_com_thread, NULL, &thr_id); */
		ut_a(thread);
		}
		}
		@@ -1043,14 +1043,14 @@ srv_create_worker_threads(void)
		/===========================/
		{
		os_thread_t thread;
		os_thread_id_t thr_id;
		/* os_thread_id_t thr_id; */
		ulint i;

		srv_n_threads[SRV_WORKER] = srv_n_worker_threads;
		srv_n_threads_active[SRV_WORKER] = srv_n_worker_threads;

		for (i = 0; i < srv_n_worker_threads; i++) {
		thread = os_thread_create(srv_worker_thread, NULL, &thr_id);
		/* thread = os_thread_create(srv_worker_thread, NULL, &thr_id); */
		ut_a(thread);
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -683,8 +683,8 @@ innobase_start_or_create_for_mysql(void)
		}

		if (srv_measure_contention) {
		os_thread_create(&test_measure_cont, NULL, thread_ids +
		SRV_MAX_N_IO_THREADS);
		/* os_thread_create(&test_measure_cont, NULL, thread_ids +
		SRV_MAX_N_IO_THREADS); */
		}

		/* Create the master thread which monitors the database