 @@ -1,27 +1,27 @@
-$NetBSD: distinfo,v 1.18 2017/05/29 14:44:46 ryoon Exp $
+$NetBSD: distinfo,v 1.19 2017/06/24 04:24:56 kamil Exp $
 SHA1 (mongodb-src-r3.4.4.tar.gz) = 6f9f2d8a3c1c2f4089fd03f8be0b86ff0431d955
 RMD160 (mongodb-src-r3.4.4.tar.gz) = 2a65f380204a92762ceea2be35dbe2c671e106f6
 SHA512 (mongodb-src-r3.4.4.tar.gz) = dbae89b49c363e7258021cd31385e4449bfdfdfd5adfcb1683e4431372731e58ec33bf8f7576d2d52659a52461bd6a32fbc67d5c6e36d52184ec1aabb345d940
 Size (mongodb-src-r3.4.4.tar.gz) = 39867133 bytes
 SHA1 (patch-SConstruct) = 5e920c85dd27f1dd761fe7083074fed0eb1edeae
 SHA1 (patch-debian_mongod.conf) = e5074b5f7ad50560b99d652feab58da764ba542c
 SHA1 (patch-src_mongo_base_initializer.h) = add32c5940c922a98122d0e6883eb3ad52dc25c5
 SHA1 (patch-src_mongo_db_fts_unicode_string.cpp) = 98c5b1b39c07190f08ec9f22ec3002b0a803f72f
 SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
 SHA1 (patch-src_mongo_platform_random.cpp) = 59c31e55fc2dc5a2b82b8f16dacf8736d8354cdb
 SHA1 (patch-src_mongo_platform_stack__locator__dragonfly.cpp) = fb885c491e4de1cfbc2875620d854af726e5b45f
 SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 3b09e86b2401555b6ab4c31d14c0693d766119c2
 SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = f975925f56125d48b5124894fa1adf1382a634d2
 SHA1 (patch-src_mongo_util_intrusive__counter.h) = 9f1af59e1bc86e33bf183a6dda1737007afc7a18
 SHA1 (patch-src_mongo_util_processinfo__dragonfly.cpp) = 62c236ce820dfe81f45625b15e022cca0f2c10ee
-SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 4c746c4c3a79df849994c00a4639662d8a2c799d
+SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 6eabe5ffec4168bb9ba8a58b7d742772d38b4714
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_dpml__exception.c) = ef3b260e8a49227cbbabf427500b7c70bce15083
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h) = 39f6fba82e2870ee4a5d99785033621225a72a16
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h) = d3a85d3a3b33691466c65cdf51c56f221429aea9
 SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_build_js-confdefs.h) = c2ad1041b5c1ff9fac9085d2a8963781f51873a8
 SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_include_js-config.h) = 7ddbb4e3bf4126a1be2195acc82ff859e8130a01
 SHA1 (patch-src_third__party_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94
 SHA1 (patch-src_third__party_wiredtiger_SConscript) = 9b11a7703f4db845fb38ba996238fe1ca7f24767
 SHA1 (patch-src_third__party_wiredtiger_build__dragonfly_wiredtiger__config.h) = 0b00da401f832d985107dfa5dcc6447db4beec6d
 SHA1 (patch-src_third__party_wiredtiger_build__netbsd_wiredtiger__config.h) = edd3c4e5784e52ad0078bcb7ef1e0902bc354285

 @@ -1,218 +1,217 @@
-$NetBSD: patch-src_mongo_util_processinfo__netbsd.cpp,v 1.1 2016/02/12 03:37:24 ryoon Exp $
+$NetBSD: patch-src_mongo_util_processinfo__netbsd.cpp,v 1.2 2017/06/24 04:24:56 kamil Exp $
---- src/mongo/util/processinfo_netbsd.cpp.orig	2016-02-11 22:14:23.486964953 +0000
+--- src/mongo/util/processinfo_netbsd.cpp.orig	2017-06-24 01:47:17.271883765 +0000
 +++ src/mongo/util/processinfo_netbsd.cpp
-@@ -0,0 +1,213 @@
+@@ -0,0 +1,212 @@
 +/*    Copyright 2012 10gen Inc.
 + *
 + *    This program is free software: you can redistribute it and/or  modify
 + *    it under the terms of the GNU Affero General Public License, version 3,
 + *    as published by the Free Software Foundation.
 + *
 + *    This program is distributed in the hope that it will be useful,
 + *    but WITHOUT ANY WARRANTY; without even the implied warranty of
 + *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + *    GNU Affero General Public License for more details.
 + *
 + *    You should have received a copy of the GNU Affero General Public License
 + *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 + *
 + *    As a special exception, the copyright holders give permission to link the
 + *    code of portions of this program with the OpenSSL library under certain
 + *    conditions as described in each individual source file and distribute
 + *    linked combinations including the program with the OpenSSL library. You
 + *    must comply with the GNU Affero General Public License in all respects
 + *    for all of the code used other than as permitted herein. If you modify
 + *    file(s) with this exception, you may extend this exception to your
 + *    version of the file(s), but you are not obligated to do so. If you do not
 + *    wish to do so, delete this exception statement from your version. If you
 + *    delete this exception statement from all source files in the program,
 + *    then also delete it in the license file.
 + */
++
 +#if defined(__NetBSD__)
 +#define _KMEMUSER
 +#endif
++
 +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kControl
++
 +#include <cstdlib>
 +#include <string>
++
 +#include <kvm.h>
 +#include <sys/file.h>
 +#include <sys/mman.h>
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
 +#include <sys/types.h>
 +#include <sys/user.h>
 +#include <sys/vmmeter.h>
 +#include <unistd.h>
++
 +#include "mongo/util/scopeguard.h"
 +#include "mongo/util/log.h"
 +#include "processinfo.h"
++
 +using namespace std;
++
 +namespace mongo {
++
 +ProcessInfo::ProcessInfo(ProcessId pid) : _pid(pid) {}
++
 +ProcessInfo::~ProcessInfo() {}
++
 +/**
 + * Get a sysctl string value by name.  Use string specialization by default.
 + */
 +template <typename T>
 +int getSysctlByIDWithDefault(const int* sysctlID,
 +                             const int idLen,
 +                             const T& defaultValue,
 +                             T* result);
++
 +template <>
 +int getSysctlByIDWithDefault<uintptr_t>(const int* sysctlID,
 +                                        const int idLen,
 +                                        const uintptr_t& defaultValue,
 +                                        uintptr_t* result) {
 +    uintptr_t value = 0;
 +    size_t len = sizeof(value);
 +    if (sysctl(sysctlID, idLen, &value, &len, NULL, 0) == -1) {
 +        *result = defaultValue;
 +        return errno;
 +    }
 +    if (len > sizeof(value)) {
 +        *result = defaultValue;
 +        return EINVAL;
 +    }
++
 +    *result = value;
 +    return 0;
 +}
++
 +template <>
 +int getSysctlByIDWithDefault<string>(const int* sysctlID,
 +                                     const int idLen,
 +                                     const string& defaultValue,
 +                                     string* result) {
 +    char value[256] = {0};
 +    size_t len = sizeof(value);
 +    if (sysctl(sysctlID, idLen, &value, &len, NULL, 0) == -1) {
 +        *result = defaultValue;
 +        return errno;
 +    }
 +    *result = value;
 +    return 0;
 +}
++
 +bool ProcessInfo::checkNumaEnabled() {
 +    return false;
 +}
++
 +int ProcessInfo::getVirtualMemorySize() {
 +    kvm_t* kd = NULL;
 +    int cnt = 0;
 +    char err[_POSIX2_LINE_MAX] = {0};
 +    if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, err)) == NULL) {
 +        log() << "Unable to get virt mem size: " << err << endl;
 +        return -1;
 +    }
++
 +    kinfo_proc2* task = kvm_getproc2(kd, KERN_PROC_PID, _pid.toNative(), sizeof(kinfo_proc2), &cnt);
 +    kvm_close(kd);
 +    return ((task->p_vm_dsize + task->p_vm_ssize + task->p_vm_tsize) * sysconf(_SC_PAGESIZE)) /
 +        1048576;
 +}
++
 +int ProcessInfo::getResidentSize() {
 +    kvm_t* kd = NULL;
 +    int cnt = 0;
 +    char err[_POSIX2_LINE_MAX] = {0};
 +    if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, err)) == NULL) {
 +        log() << "Unable to get res mem size: " << err << endl;
 +        return -1;
 +    }
 +    kinfo_proc2* task = kvm_getproc2(kd, KERN_PROC_PID, _pid.toNative(), sizeof(kinfo_proc2), &cnt);
 +    kvm_close(kd);
 +    return (task->p_vm_rssize * sysconf(_SC_PAGESIZE)) / 1048576;  // convert from pages to MB
 +}
++
 +double ProcessInfo::getSystemMemoryPressurePercentage() {
 +    return 0.0;
 +}
++
 +void ProcessInfo::SystemInfo::collectSystemInfo() {
 +    osType = "BSD";
 +    osName = "NetBSD";
 +    int mib[2];
++
 +    mib[0] = CTL_KERN;
 +    mib[1] = KERN_VERSION;
 +    int status = getSysctlByIDWithDefault(mib, 2, string("unknown"), &osVersion);
 +    if (status != 0)
 +        log() << "Unable to collect OS Version. (errno: " << status << " msg: " << strerror(status)
 +              << ")" << endl;
++
 +    mib[0] = CTL_HW;
 +    mib[1] = HW_MACHINE;
 +    status = getSysctlByIDWithDefault(mib, 2, string("unknown"), &cpuArch);
 +    if (status != 0)
 +        log() << "Unable to collect Machine Architecture. (errno: " << status
 +              << " msg: " << strerror(status) << ")" << endl;
 +    addrSize = cpuArch.find("64") != std::string::npos ? 64 : 32;
++
 +    uintptr_t numBuffer;
 +    uintptr_t defaultNum = 1;
 +    mib[0] = CTL_HW;
 +    mib[1] = HW_PHYSMEM;
 +    status = getSysctlByIDWithDefault(mib, 2, defaultNum, &numBuffer);
 +    memSize = numBuffer;
 +    if (status != 0)
 +        log() << "Unable to collect Physical Memory. (errno: " << status
 +              << " msg: " << strerror(status) << ")" << endl;
++
 +    mib[0] = CTL_HW;
 +    mib[1] = HW_NCPU;
 +    status = getSysctlByIDWithDefault(mib, 2, defaultNum, &numBuffer);
 +    numCores = numBuffer;
 +    if (status != 0)
 +        log() << "Unable to collect Number of CPUs. (errno: " << status
 +              << " msg: " << strerror(status) << ")" << endl;
++
 +    pageSize = static_cast<unsigned long long>(sysconf(_SC_PAGESIZE));
++
 +    hasNuma = checkNumaEnabled();
 +}
++
 +void ProcessInfo::getExtraInfo(BSONObjBuilder& info) {}
++
 +bool ProcessInfo::supported() {
 +    return true;
 +}
++
 +bool ProcessInfo::blockCheckSupported() {
 +    return true;
 +}
++
 +bool ProcessInfo::blockInMemory(const void* start) {
 +    char x = 0;
 +    if (mincore((void*)alignToStartOfPage(start), getPageSize(), &x)) {
 +        log() << "mincore failed: " << errnoWithDescription() << endl;
 +        return 1;
 +    }
 +    return x & 0x1;
 +}
++
 +bool ProcessInfo::pagesInMemory(const void* start, size_t numPages, vector<char>* out) {
 +    out->resize(numPages);
 +    // int mincore(const void *addr, size_t len, char *vec);
 +    if (mincore((void*)alignToStartOfPage(start), numPages * getPageSize(), &(out->front()))) {
 +        log() << "mincore failed: " << errnoWithDescription() << endl;
 +        return false;
 +    }
 +    for (size_t i = 0; i < numPages; ++i) {
 +        (*out)[i] = 0x1;
 +    }
 +    return true;
 +}
 +}