Cleanup: Remove os0proc.*

MariaDB · Sep 3, 2020 · 938db04 · 938db04
1 parent 48ab5a4
commit 938db04
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 107 deletions.
diff --git a/extra/mariabackup/write_filt.cc b/extra/mariabackup/write_filt.cc
@@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 #include "write_filt.h"
 #include "fil_cur.h"
 #include "xtrabackup.h"
-#include <os0proc.h>
 
 /************************************************************************
 Write-through page write filter. */

diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
@@ -190,7 +190,6 @@ SET(INNOBASE_SOURCES
 	include/os0event.h
 	include/os0file.h
 	include/os0file.ic
-	include/os0proc.h
 	include/os0thread.h
 	include/page0cur.h
 	include/page0cur.ic
@@ -296,7 +295,6 @@ SET(INNOBASE_SOURCES
 	mem/mem0mem.cc
 	mtr/mtr0mtr.cc
 	os/os0file.cc
-	os/os0proc.cc
 	os/os0event.cc
 	os/os0thread.cc
 	page/page0cur.cc

diff --git a/storage/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
@@ -40,7 +40,6 @@ Created 11/5/1995 Heikki Tuuri
 #include "ut0byte.h"
 #include "page0types.h"
 #include "ut0rbt.h"
-#include "os0proc.h"
 #include "log0log.h"
 #include "srv0srv.h"
 #include <ostream>

diff --git a/storage/innobase/include/os0proc.h b/storage/innobase/include/os0proc.h
diff --git a/storage/innobase/include/ut0new.h b/storage/innobase/include/ut0new.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, 2019, MariaDB Corporation.
+Copyright (c) 2017, 2020, MariaDB Corporation.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -137,14 +137,17 @@ with (), thus:
 #include "mysql/psi/psi_memory.h" /* PSI_memory_key, PSI_memory_info */
 
 #include "os0thread.h" /* os_thread_sleep() */
-#include "os0proc.h" /* os_total_large_mem_allocated */
 #include "ut0ut.h" /* ut_strcmp_functor, ut_basename_noext() */
 
 #define	OUT_OF_MEMORY_MSG \
 	"Check if you should increase the swap file or ulimits of your" \
 	" operating system. Note that on most 32-bit computers the process" \
 	" memory space is limited to 2 GB or 4 GB."
 
+/** The total amount of memory currently allocated from the operating
+system with allocate_large() */
+extern Atomic_counter<ulint> os_total_large_mem_allocated;
+
 /** Maximum number of retries to allocate memory. */
 extern const size_t	alloc_max_retries;
 

diff --git a/storage/innobase/os/os0proc.cc b/storage/innobase/os/os0proc.cc
diff --git a/storage/innobase/pars/lexyy.cc b/storage/innobase/pars/lexyy.cc
@@ -816,7 +816,6 @@ Created 12/14/1997 Heikki Tuuri
 #include "pars0grm.h"
 #include "pars0sym.h"
 #include "mem0mem.h"
-#include "os0proc.h"
 
 #define malloc(A)	ut_malloc_nokey(A)
 #define free(A)		ut_free(A)

diff --git a/storage/innobase/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l
@@ -58,7 +58,6 @@ Created 12/14/1997 Heikki Tuuri
 #include "pars0grm.h"
 #include "pars0sym.h"
 #include "mem0mem.h"
-#include "os0proc.h"
 
 #define malloc(A)	ut_malloc_nokey(A)
 #define free(A)		ut_free(A)

diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
@@ -55,7 +55,6 @@ Created 10/8/1995 Heikki Tuuri
 #include "lock0lock.h"
 #include "log0recv.h"
 #include "mem0mem.h"
-#include "os0proc.h"
 #include "pars0pars.h"
 #include "que0que.h"
 #include "row0mysql.h"

diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
@@ -76,7 +76,6 @@ Created 2/16/1996 Heikki Tuuri
 #include "btr0defragment.h"
 #include "mysql/service_wsrep.h" /* wsrep_recovery */
 #include "trx0rseg.h"
-#include "os0proc.h"
 #include "buf0flu.h"
 #include "buf0rea.h"
 #include "dict0boot.h"
@@ -1241,7 +1240,8 @@ dberr_t srv_start(bool create_new_db)
 			sprintf(srv_monitor_file_name,
 				"%s/innodb_status." ULINTPF,
 				fil_path_to_mysql_datadir,
-				os_proc_get_number());
+				static_cast<ulint>
+				(IF_WIN(GetCurrentProcessId(), getpid())));
 
 			srv_monitor_file = my_fopen(srv_monitor_file_name,
 						    O_RDWR|O_TRUNC|O_CREAT,

diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
@@ -35,7 +35,6 @@ Created 3/26/1996 Heikki Tuuri
 #include "btr0sea.h"
 #include "lock0lock.h"
 #include "log0log.h"
-#include "os0proc.h"
 #include "que0que.h"
 #include "srv0mon.h"
 #include "srv0srv.h"

diff --git a/storage/innobase/ut/ut0new.cc b/storage/innobase/ut/ut0new.cc
@@ -26,6 +26,10 @@ Created May 26, 2014 Vasil Dimov
 
 #include "univ.i"
 #include <algorithm>
+/** The total amount of memory currently allocated from the operating
+system with allocate_large(). */
+Atomic_counter<ulint> os_total_large_mem_allocated;
+
 /** Maximum number of retries to allocate memory. */
 const size_t	alloc_max_retries = 60;