summaryrefslogtreecommitdiff
path: root/lib/os_mon
Commit message (Collapse)AuthorAgeFilesLines
* Add test suites performing app and appup file checksTobias Schlager2014-02-241-3/+6
| | | | | Add the mentioned test suites for *all* library and touched non-library applications.
* Fix non-library appup files according to issue #240Tobias Schlager2014-02-181-23/+4
| | | | | | Fix the appup files of runtime_tools and os_mon with wildcard version regexps. inets, odbc and ssh regexps have been corrected to match as originally intended.
* Merge tag 'OTP_R16B03'Magnus Lidén2013-12-102-1/+17
|\ | | | | | | | | | | | | The R16B03 release Conflicts: lib/sasl/vsn.mk
| * Prepare releaseOTP_R16B03Erlang/OTP2013-12-092-1/+17
| |
* | Merge branch 'maint'Fredrik Gustafsson2013-11-041-10/+9
|\ \ | |/
| * Fix incorrect reporting of memory on OS X via memsup.Christopher Meiklejohn2013-10-311-10/+9
| | | | | | | | | | | | | | | | Application memsup should be calculating free memory using the speculative pages, in the same manner that the Activity Monitor and top programs on OS X do. In addition, correct page size to 4096, based on verification of available memory between top, vm_stat and Activity Monitor.
* | Merge tag 'OTP_R16B02'Magnus Lidén2013-09-172-1/+38
|\ \ | |/ | | | | | | | | | | The R16B02 release Conflicts: lib/sasl/vsn.mk
| * Prepare releaseOTP_R16B02Erlang/OTP2013-09-162-1/+38
| |
* | Merge branch 'maint'Fredrik Gustafsson2013-09-063-2/+9
|\ \ | |/
| * Fix broken cpu_sup:nprocs and others on Solaris 64-bitSimon Cornish2013-09-022-2/+3
| | | | | | | | | | | | | | | | | | The correct kstat datatype for nproc & avenrun_* is ui32, not ulong. Under 64-bit OTP builds garbage was returned because the wrong datatype was used. This patch correcs the datatype. It also adds an additional check in the test case for a slightly less insane return value.
| * Fix some compiler warningsSimon Cornish2013-09-021-0/+5
| |
| * Remove object files when cleaningSimon Cornish2013-09-021-0/+1
| | | | | | | | | | | | | | Otherwise something like this will fail: ./otp_build setup --enable-m32-build make clean ./otp_build setup --enable-m64-build
* | Merge branch 'maint'Lukas Larsson2013-08-082-1/+5
|\ \ | |/ | | | | | | * maint: Add smoke tests
| * Merge branch 'lukas/smoketests/OTP-11221' into maintLukas Larsson2013-08-082-1/+5
| |\ | | | | | | | | | | | | * lukas/smoketests/OTP-11221: Add smoke tests
| | * Add smoke testsLukas Larsson2013-08-052-1/+5
| | | | | | | | | | | | Smoke tests are meant to verify that a build of erlang has been successfull.
* | | Merge branch 'maint'Fredrik Gustafsson2013-08-012-2/+3
|\ \ \ | |/ /
| * | Fix compilation on SolarisMaciej Małecki2013-07-262-2/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to compile R16B01 on SmartOS resulted in following errors: gcc -c -o ../priv/obj/i386-pc-solaris2.11/ferrule.o -Werror=return-type -g -O2 -I/root/otp_src_R16B01/erts/i386-pc-solaris2.11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-tree-copyrename -DHAVE_CONFIG_H ferrule.c ferrule.c:53:1: error: return type defaults to 'int' [-Werror=return-type] ... gcc -c -o ../priv/obj/i386-pc-solaris2.11/mod_syslog.o -Werror=return-type -g -O2 -I/root/otp_src_R16B01/erts/i386-pc-solaris2.11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-tree-copyrename -DHAVE_CONFIG_H mod_syslog.c mod_syslog.c:50:1: error: return type defaults to 'int' [-Werror=return-type] mod_syslog.c: In function 'make_exit': mod_syslog.c:136:5: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default] mod_syslog.c: In function 'main': mod_syslog.c:131:1: error: control reaches end of non-void function [-Werror=return-type] Adding return values and types to `main` functions in `mod_syslog.c` and `ferrule.c` fixed the build.
* | Merge branch 'maint'Björn-Egil Dahlberg2013-07-221-2/+2
|\ \ | |/
| * Merge branch 'egil/os_mon/fix-bsd-disksup/OTP-11207' into maintBjörn-Egil Dahlberg2013-07-221-2/+2
| |\ | | | | | | | | | | | | | | | * egil/os_mon/fix-bsd-disksup/OTP-11207: os_mon: Fix openbsd diskspace queries os_mon: Fix freebsd diskspace queries
| | * os_mon: Fix openbsd diskspace queriesBjörn-Egil Dahlberg2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | Use 'df -k -l' to query OpenBSD about diskspace on local disks. Same reasoning as for FreeBSD - additional filesystems without listing them all.
| | * os_mon: Fix freebsd diskspace queriesBjörn-Egil Dahlberg2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | Use 'df -k -l' to query FreeBSD about diskspace on local disks. Previously 'df' -k -t ufs' was used but this will not handle zfs disks. Just use '-l' instead of listing potential filesystems.
* | | Merge branch 'maint'Björn-Egil Dahlberg2013-07-221-157/+138
|\ \ \ | |/ /
| * | os_mon: Relax disksup_SUITE test even moreBjörn-Egil Dahlberg2013-07-191-21/+21
| | | | | | | | | | | | | | | | | | Capacity can be zero on certain filesystems. Remove reported mountpoints with zero capacity during tests since these reports false positives.
| * | os_mon: Refactor disksup_SUITEBjörn-Egil Dahlberg2013-07-181-145/+117
| | | | | | | | | | | | Notably, remove ?line macro.
| * | os_mon: Relax disksup_SUITE api testBjörn-Egil Dahlberg2013-07-181-10/+19
| |/
* | Merge tag 'OTP_R16B01'Björn-Egil Dahlberg2013-06-181-0/+28
|\ \ | |/ | | | | | | | | | | The R16B01 release Conflicts: lib/sasl/vsn.mk
| * Prepare releaseOTP_R16B01Erlang/OTP2013-06-171-0/+28
| |
* | Merge branch 'maint'Björn-Egil Dahlberg2013-06-122-2/+2
|\ \ | |/
| * Update copyright yearsBjörn-Egil Dahlberg2013-06-122-2/+2
| |
* | Merge branch 'maint'Fredrik Gustafsson2013-06-101-1/+1
|\ \ | |/
| * versions updates for erl_interface, et and os_monFredrik Gustafsson2013-06-071-1/+1
| |
* | Merge branch 'siri/spawn-and-space'Siri Hansen2013-06-052-5/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * siri/spawn-and-space: [sasl] In test, quote erlsrv executable in call to open_port/2 [test_server] Quote path to erl executable when starting slave nodes Quote path to erl executable in slave to allow space in path [sasl] Quote path to program run with open_port({spawn,... [os_mon] Quote path to programs run with open_port({spawn,... Conflicts: lib/os_mon/src/nteventlog.erl
| * | [os_mon] Quote path to programs run with open_port({spawn,...Siri Hansen2013-03-192-6/+6
| |/ | | | | | | This is to allow space in the path.
* | Quote windows paths with spacesDan Gudmundsson2013-05-201-3/+2
| |
* | Convert XML files to UTF-8Hans Bolinder2013-04-1912-22/+22
|/
* Merge branch 'yt/netbsd/OTP-10941' into maintFredrik Gustafsson2013-03-151-1/+1
|\ | | | | | | | | | | | | | | * yt/netbsd/OTP-10941: Moved ifdef NetBSD to proper place reduce bashism compilation fix for NetBSD compilation fix for NetBSD
| * Moved ifdef NetBSD to proper placeFredrik Gustafsson2013-03-151-4/+1
| |
| * compilation fix for NetBSDYAMAMOTO Takashi2013-03-081-0/+3
| | | | | | | | taken from a pkgsrc patch: patch-lib_os__mon_c__src_memsup.c
* | Merge branch 'sm/fix-disksup-susv3/OTP-10945' into maintFredrik Gustafsson2013-03-151-2/+22
|\ \ | |/ |/| | | | | * sm/fix-disksup-susv3/OTP-10945: This patch fixes disksup:get_disk_data for SUSv3, specifically OS X ML
| * This patch fixes disksup:get_disk_data for SUSv3, specifically OS X MLSriram Melkote2013-01-311-2/+22
| | | | | | | | | | | | | | | | | | | | On OS X Mountain Lion, the default output of df command includes iNode used and iNodes free, which apparent what SUSv3 specifies. This breaks the current parse logic and reports incorrect results. This patch adds support for the new format and ensures older versions of OS X produce this format by adding the -i switch (which is now the default). Adding support for this new format rather than changing df output as we'll presumably see this on other platforms eventually.
* | Update copyright yearsBjörn-Egil Dahlberg2013-02-221-1/+1
| |
* | Prepare releaseOTP_R16A_RELEASE_CANDIDATEErlang/OTP2013-01-292-1/+16
| |
* | Update copyright yearsBjörn-Egil Dahlberg2013-01-252-2/+2
| |
* | Turn warnings to errors on selected applicationsBjörn Gustavsson2013-01-231-1/+1
| |
* | Merge branch 'nox/enable-silent-rules/OTP-10726'Björn-Egil Dahlberg2013-01-183-14/+14
|\ \ | | | | | | | | | | | | * nox/enable-silent-rules/OTP-10726: Implement ./otp_build configure --enable-silent-rules
| * | Implement ./otp_build configure --enable-silent-rulesAnthony Ramine2013-01-153-14/+14
| | | | | | | | | | | | | | | | | | With silent rules, the output of make is less verbose and compilation warnings are easier to spot. Silent rules are disabled by default and can be disabled or enabled at will by make V=0 and make V=1.
* | | os_mon: Remove superfluous match clauseBjörn-Egil Dahlberg2013-01-081-3/+1
|/ /
* | [os_mon] Remove call to deprecated/undefined functions in snmpSiri Hansen2012-09-264-108/+49
| | | | | | | | | | Also, rewrite test suite (os_mon_mib_SUITE) to use ct_snmp intead of using snmp application directly.
* | Merge tag 'OTP_R15B02'Björn-Egil Dahlberg2012-09-042-1/+22
|\ \ | |/ | | | | The R15B02 release
| * Prepare releaseOTP_R15B02Erlang/OTP2012-09-032-1/+22
| |