Changeset: 96113c8d5df7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/96113c8d5df7 Removed Files: monetdb5/modules/kernel/status.c Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test monetdb5/modules/kernel/CMakeLists.txt Branch: default Log Message:
Remove MAL status module. It was unused and not referenced anywhere. diffs (truncated from 859 to 300 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -49548,71 +49548,6 @@ revoke_roles pattern sqlcatalog.revoke_roles(X_0:str, X_1:str, X_2:int, X_3:int):void SQLrevoke_roles; Catalog operation revoke_roles -status -batStatistics -command status.batStatistics() (X_0:bat[:str], X_1:bat[:str]) -SYSgdkEnv; -Show distribution of bats by kind -status -cpuStatistics -command status.cpuStatistics() (X_0:bat[:str], X_1:bat[:lng]) -SYScpuStatistics; -Global cpu usage information -status -getThreads -command status.getThreads() (X_0:bat[:int], X_1:bat[:str]) -SYSgdkThread; -Produce overview of active threads -status -ioStatistics -command status.ioStatistics() (X_0:bat[:str], X_1:bat[:lng]) -SYSioStatistics; -Global IO activity information -status -memStatistics -command status.memStatistics() (X_0:bat[:str], X_1:bat[:lng]) -SYSmemStatistics; -Global memory usage information -status -memUsage -command status.memUsage(X_0:lng) (X_1:bat[:str], X_2:bat[:lng]) -SYSmem_usage; -Get a split-up of how much memory blocks are in use -status -mem_cursize -command status.mem_cursize():lng -SYSgetmem_cursize; -The amount of physical swapspace in KB that is currently in use -status -mem_maxsize -command status.mem_maxsize():lng -SYSgetmem_maxsize; -The maximum usable amount of physical swapspace in KB (target only) -status -mem_maxsize -command status.mem_maxsize(X_0:lng):void -SYSsetmem_maxsize; -Set the maximum usable amount of physical swapspace in KB -status -vmStatistics -command status.vmStatistics(X_0:lng) (X_1:bat[:str], X_2:bat[:lng]) -SYSvm_usage; -Get a split-up of how much virtual memory blocks are in use -status -vm_cursize -command status.vm_cursize():lng -SYSgetvm_cursize; -The amount of logical VM space in KB that is currently in use -status -vm_maxsize -command status.vm_maxsize():lng -SYSgetvm_maxsize; -The maximum usable amount of logical VM space in KB (target only) -status -vm_maxsize -command status.vm_maxsize(X_0:lng):void -SYSsetvm_maxsize; -Set the maximum usable amount of physical swapspace in KB str ascii command str.ascii(X_0:str):int diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -37868,71 +37868,6 @@ revoke_roles pattern sqlcatalog.revoke_roles(X_0:str, X_1:str, X_2:int, X_3:int):void SQLrevoke_roles; Catalog operation revoke_roles -status -batStatistics -command status.batStatistics() (X_0:bat[:str], X_1:bat[:str]) -SYSgdkEnv; -Show distribution of bats by kind -status -cpuStatistics -command status.cpuStatistics() (X_0:bat[:str], X_1:bat[:lng]) -SYScpuStatistics; -Global cpu usage information -status -getThreads -command status.getThreads() (X_0:bat[:int], X_1:bat[:str]) -SYSgdkThread; -Produce overview of active threads -status -ioStatistics -command status.ioStatistics() (X_0:bat[:str], X_1:bat[:lng]) -SYSioStatistics; -Global IO activity information -status -memStatistics -command status.memStatistics() (X_0:bat[:str], X_1:bat[:lng]) -SYSmemStatistics; -Global memory usage information -status -memUsage -command status.memUsage(X_0:lng) (X_1:bat[:str], X_2:bat[:lng]) -SYSmem_usage; -Get a split-up of how much memory blocks are in use -status -mem_cursize -command status.mem_cursize():lng -SYSgetmem_cursize; -The amount of physical swapspace in KB that is currently in use -status -mem_maxsize -command status.mem_maxsize():lng -SYSgetmem_maxsize; -The maximum usable amount of physical swapspace in KB (target only) -status -mem_maxsize -command status.mem_maxsize(X_0:lng):void -SYSsetmem_maxsize; -Set the maximum usable amount of physical swapspace in KB -status -vmStatistics -command status.vmStatistics(X_0:lng) (X_1:bat[:str], X_2:bat[:lng]) -SYSvm_usage; -Get a split-up of how much virtual memory blocks are in use -status -vm_cursize -command status.vm_cursize():lng -SYSgetvm_cursize; -The amount of logical VM space in KB that is currently in use -status -vm_maxsize -command status.vm_maxsize():lng -SYSgetvm_maxsize; -The maximum usable amount of logical VM space in KB (target only) -status -vm_maxsize -command status.vm_maxsize(X_0:lng):void -SYSsetvm_maxsize; -Set the maximum usable amount of physical swapspace in KB str ascii command str.ascii(X_0:str):int diff --git a/monetdb5/modules/kernel/CMakeLists.txt b/monetdb5/modules/kernel/CMakeLists.txt --- a/monetdb5/modules/kernel/CMakeLists.txt +++ b/monetdb5/modules/kernel/CMakeLists.txt @@ -15,7 +15,6 @@ target_sources(kernel mmath.c mmath_private.h bat5.c algebra.c algebra.h - status.c group.c group.h aggr.c batmmath.c diff --git a/monetdb5/modules/kernel/status.c b/monetdb5/modules/kernel/status.c deleted file mode 100644 --- a/monetdb5/modules/kernel/status.c +++ /dev/null @@ -1,693 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V. - */ - -/* - * author M.L. Kersten, P. Boncz, N.Nes - * System state information - * This document introduces a series of bats and operations that provide access - * to information stored within the Monet Version 5 internal data structures. - * In all cases, pseudo BAT operation returns a transient BAT that - * should be garbage collected after being used. - * - * The main performance drain would be to use a pseudo BAT directly to - * successively access it components. This can be avoided by first assigning - * the pseudo BAT to a variable. - */ - -#include "monetdb_config.h" -#include "gdk.h" -#include <time.h> -#include "mal_exception.h" -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#ifdef HAVE_SYS_TIMES_H -# include <sys/times.h> -#endif - -#ifdef HAVE_SYS_RESOURCE_H -# include <sys/resource.h> -#endif - -static inline int -pseudo(bat *ret, bat *ret2, BAT *bn, BAT *b) { - *ret = bn->batCacheid; - BBPkeepref(bn); - *ret2 = b->batCacheid; - BBPkeepref(b); - return 0; -} - -static str -SYSgetmem_cursize(lng *num) -{ - *num = GDKmem_cursize(); - return MAL_SUCCEED; -} - -static str -SYSgetmem_maxsize(lng *num) -{ - *num = GDK_mem_maxsize; - return MAL_SUCCEED; -} - -static str -SYSsetmem_maxsize(void *ret, const lng *num) -{ - size_t sze = 0; - (void) ret; - if (*num < 0) - throw(ILLARG, "status.mem_maxsize", "new size must not be < 0"); -#if SIZEOF_SIZE_T == SIZEOF_INT - { - lng size_t_max = 2 * (lng)INT_MAX; - if (*num > size_t_max) - throw(ILLARG, "status.mem_maxsize", "new size must not be > " LLFMT, size_t_max); - } -#endif - GDK_mem_maxsize = sze; - return MAL_SUCCEED; -} - -static str -SYSgetvm_cursize(lng *num) -{ - *num = GDKvm_cursize(); - return MAL_SUCCEED; -} - -static str -SYSgetvm_maxsize(lng *num) -{ - *num = GDK_vm_maxsize; - return MAL_SUCCEED; -} - -static str -SYSsetvm_maxsize(void *ret, const lng *num) -{ - (void) ret; - GDK_vm_maxsize = (size_t) *num; - return MAL_SUCCEED; -} - -/* - * Performance - * To obtain a good impression of the Monet performance we need timing information. - * The most detailed information is best obtained with the system profiler. - * - * However, the direct approach is to enable the user to read the timers maintained - * internally. This is done with the CPU, IO, MEMORY, and BBP command which - * displays the elapsed time in seconds, user- and system-cpu time in milliseconds - * since its last invocation and the amount of space in use. The process - * identifier is used to differentiate among the possible processes. - * - * Note that in multi threaded mode the routine prints the elapsed - * time since the beginning of each process. - */ -#ifdef HAVE_TIMES -static time_t clk = 0; -static struct tms state; -#endif - -static str -SYScpuStatistics(bat *ret, bat *ret2) -{ - lng i; - BAT *b, *bn; -#ifdef HAVE_TIMES - struct tms newst; -# ifndef HZ - static int HZ = 0; - - if (HZ == 0) { -# if defined(HAVE_SYSCONF) && defined(_SC_CLK_TCK) - HZ = sysconf(_SC_CLK_TCK); -# else - HZ = CLK_TCK; _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
