Changeset: 0cf7726a951e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0cf7726a951e
Removed Files:
monetdb5/modules/kernel/counters.c
monetdb5/modules/kernel/counters.h
monetdb5/modules/kernel/counters.mal
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/Tests/exports.stable.out
configure.ag
debian/rules
monetdb5/modules/kernel/Makefile.ag
Branch: default
Log Message:
removed outdated hardware performance / events counter module / interface
While in general fine, this code uses old, possibly outdated libraries and
interfaces
to provide access to the CPU hardware performance / events counters.
Given that, and since the code has not been used / tested for a long time,
we no remove it completely.
It remains in the attic / histrory for reference in case it should be
revived / reincarnated (and modernized!) in the future.
diffs (truncated from 3653 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -906,7 +906,6 @@ developer, but if you do want to test, t
--with-ant=no \
--with-bz2=yes \
--with-geos=%{?with_geos:yes}%{!?with_geos:no} \
- --with-hwcounters=no \
--with-java=no \
--with-mseed=no \
--with-perl=yes \
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -579,12 +579,6 @@
}
"Entry"
{
- "MsmKey" = "8:_9988D2AABE4741B3A4EB33E65973CBC9"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_9B75C6DF698C491D822B9EF6B70708BD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2904,26 +2898,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9988D2AABE4741B3A4EB33E65973CBC9"
- {
- "SourcePath" = "8:lib\\monetdb5\\counters.mal"
- "TargetName" = "8:counters.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9B75C6DF698C491D822B9EF6B70708BD"
{
"SourcePath" = "8:lib\\monetdb5\\sysmon.mal"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -579,12 +579,6 @@
}
"Entry"
{
- "MsmKey" = "8:_9988D2AABE4741B3A4EB33E65973CBC9"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_9B75C6DF698C491D822B9EF6B70708BD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2904,26 +2898,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9988D2AABE4741B3A4EB33E65973CBC9"
- {
- "SourcePath" = "8:lib\\monetdb5\\counters.mal"
- "TargetName" = "8:counters.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9B75C6DF698C491D822B9EF6B70708BD"
{
"SourcePath" = "8:lib\\monetdb5\\sysmon.mal"
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1250,16 +1250,6 @@ str CMDvarSIGN(Client cntxt, MalBlkPtr m
str CMDvarSUB(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDvarSUBsignal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDvarXOR(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CNTRScounter2bat(bat *kid, bat *vid, const int *idx);
-str CNTRScounter2str(str *ret, int *idx);
-str CNTRSeventName(str *ret, int *nr);
-str CNTRSeventNumber(int *ret, str *nme);
-str CNTRSinit(void *ret);
-str CNTRSnativeEvents(bat *ret);
-str CNTRSreset(int *ret, int *idx, int *ev1, int *ev2);
-str CNTRSstart(int *ret, int *ev1, int *ev2);
-str CNTRSstop(void *ret, int *idx);
-str CNTRSunifiedEvents(bat *ret);
str CURLdeleteRequest(str *retval, str *url);
str CURLgetRequest(str *retval, str *url);
str CURLpostRequest(str *retval, str *url);
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2983,109 +2983,6 @@ if test $mn_cv_have__sys_siglist = yes;
AC_DEFINE(HAVE__SYS_SIGLIST, 1, [Define if you have _sys_siglist])
fi
-dnl checks for system services
-dnl hwcounters
-org_have_hwcounters=auto
-have_hwcounters=$org_have_hwcounters
-HWCOUNTERS_LIBS=""
-HWCOUNTERS_INCS=""
-AC_ARG_WITH(hwcounters,
- AS_HELP_STRING([--with-hwcounters=DIR],
- [hwcounters library is installed in DIR]),
- have_hwcounters="$withval")
-case "$have_hwcounters" in
-yes|no|auto)
- ;;
-*)
- HWCOUNTERS_LIBS="-L$withval/lib"
- HWCOUNTERS_INCS="-I$withval/include"
- ;;
-esac
-if test "x$have_hwcounters" != xno; then
- case "$host_os-$host" in
- linux*-i?86*) HWCOUNTERS_INCS="$HWCOUNTERS_INCS -I/usr/src/linux-`uname
-r | sed 's|smp$||'`/include"
- esac
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $HWCOUNTERS_INCS"
- save_LIBS="$LIBS"
- LIBS="$LIBS $HWCOUNTERS_LIBS"
- have_hwcounters=no
- why_have_hwcounters="(no supported harwdware counters interface found)"
- case "$host_os-$host" in
- linux*-i?86*|linux*-x86_64*)
- AC_CHECK_HEADERS( libperfctr.h ,
- AC_CHECK_LIB( perfctr, vperfctr_open ,
- [ HWCOUNTERS_LIBS="$HWCOUNTERS_LIBS -lperfctr"
- AC_DEFINE(HAVE_LIBPERFCTR, 1, [Define if you have the
perfctr library])
- have_hwcounters=yes
- ]
- )
- )
- if test "x$have_hwcounters" != xyes; then
- AC_CHECK_HEADERS( libpperf.h,
- AC_CHECK_LIB( pperf, start_counters,
- [ HWCOUNTERS_LIBS="$HWCOUNTERS_LIBS -lpperf"
- AC_DEFINE(HAVE_LIBPPERF, 1, [Define if
you have the pperf library])
- have_hwcounters=yes
- ]
- )
- )
- fi
- ;;
- linux*-ia64*)
- AC_CHECK_HEADERS( perfmon/pfmlib.h ,
- AC_CHECK_LIB( pfm, pfm_initialize ,
- [ HWCOUNTERS_LIBS="$HWCOUNTERS_LIBS -lpfm"
- AC_DEFINE(HAVE_LIBPFM, 1, [Define if you have the pfm
library])
- have_hwcounters=yes
- ]
- )
- )
- ;;
- solaris*)
- AC_CHECK_HEADERS( libcpc.h ,
- AC_CHECK_TYPE( cpc_event_t,
- AC_CHECK_LIB( cpc, cpc_access ,
- [ HWCOUNTERS_LIBS="$HWCOUNTERS_LIBS -lcpc"
- AC_DEFINE(HAVE_LIBCPC, 1, [Define if you have the cpc
library])
- have_hwcounters=yes
- ]
- )
- , , [#include <libcpc.h>]
- )
- )
- if test "x$have_hwcounters" != xyes; then
- AC_CHECK_HEADERS( perfmon.h ,
- AC_CHECK_LIB( perfmon, clr_pic ,
- [ HWCOUNTERS_LIBS="$HWCOUNTERS_LIBS -lperfmon"
- AC_DEFINE(HAVE_LIBPERFMON, 1, [Define if you
have the perfmon library])
- have_hwcounters=yes
- ]
- )
- )
- fi
- ;;
- irix*)
- AC_CHECK_LIB( perfex, start_counters ,
- [ HWCOUNTERS_LIBS="$HWCOUNTERS_LIBS -lperfex"
- have_hwcounters=yes
- ]
- )
- ;;
- esac
- LIBS="$save_LIBS"
- CPPFLAGS="$save_CPPFLAGS"
-
- if test "x$have_hwcounters" != xyes; then
- HWCOUNTERS_LIBS=""
- HWCOUNTERS_INCS=""
- else
- CFLAGS="$CFLAGS -DHWCOUNTERS -DHW_`uname -s` -DHW_`uname -m`"
- fi
-fi
-AC_SUBST(HWCOUNTERS_LIBS)
-AC_SUBST(HWCOUNTERS_INCS)
-
dnl check dependencies (might need more than just SQL)
if test x"$enable_sql" = xyes && test x"$enable_monetdb5" = x"no" ; then
AC_MSG_ERROR([MonetDB/SQL requires MonetDB5${disable_monetdb5:+
$disable_monetdb5}.])
@@ -3492,7 +3389,6 @@ for comp in \
'curl ' \
'getaddrinfo ' \
'gsl ' \
- 'hwcounters ' \
'java ' \
'java_control ' \
'java_jdbc ' \
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,6 @@ override_dh_auto_configure:
--with-ant=no \
--with-bz2=yes \
--with-geos=yes \
- --with-hwcounters=no \
--with-java=no \
--with-mseed=no \
--with-perl=yes \
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -19,8 +19,7 @@ INCLUDES = ../../mal \
../atoms \
../../../common/options \
../../../common/stream \
- ../../../gdk \
- $(HWCOUNTERS_INCS)
+ ../../../gdk
MTSAFE
@@ -34,7 +33,6 @@ lib_kernel = {
batcolor.c batcolor.h \
batmmath.c batmmath.h \
batstr.c \
- counters.c counters.h \
group.c group.h \
logger.c \
microbenchmark.c microbenchmark.h \
@@ -49,7 +47,7 @@ headers_mal = {
mmath.mal alarm.mal batstr.mal \
batcolor.mal batmmath.mal \
group.mal aggr.mal \
- counters.mal logger.mal microbenchmark.mal
+ logger.mal microbenchmark.mal
}
headers_hge = {
@@ -59,6 +57,6 @@ headers_hge = {
SOURCES = 00_aggr_hge.mal
}
-EXTRA_DIST = alarm.mal counters.mal logger.mal microbenchmark.mal aggr.mal
00_aggr_hge.mal group.mal algebra.mal
+EXTRA_DIST = alarm.mal logger.mal microbenchmark.mal aggr.mal 00_aggr_hge.mal
group.mal algebra.mal
EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/modules/kernel/counters.c
b/monetdb5/modules/kernel/counters.c
deleted file mode 100644
--- a/monetdb5/modules/kernel/counters.c
+++ /dev/null
@@ -1,3255 +0,0 @@
-/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
