Date: Tue, 12 Jun 2018 12:44:33 +0000 (UTC) From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472242 - in head/devel/qt5-core: . files Message-ID: <201806121244.w5CCiXru075178@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arrowd Date: Tue Jun 12 12:44:33 2018 New Revision: 472242 URL: https://svnweb.freebsd.org/changeset/ports/472242 Log: devel/qt5-core: Add a patch that fixes QLockFilePrivate::processNameByPid() function to return non-truncated name. Reviewed by: rakuco, tcberner Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D15673 Added: head/devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp (contents, props changed) Modified: head/devel/qt5-core/Makefile Modified: head/devel/qt5-core/Makefile ============================================================================== --- head/devel/qt5-core/Makefile Tue Jun 12 11:28:42 2018 (r472241) +++ head/devel/qt5-core/Makefile Tue Jun 12 12:44:33 2018 (r472242) @@ -2,6 +2,7 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Added: head/devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp Tue Jun 12 12:44:33 2018 (r472242) @@ -0,0 +1,148 @@ +--- src/corelib/io/io.pri.orig 2018-02-08 18:24:48 UTC ++++ src/corelib/io/io.pri +@@ -178,6 +178,9 @@ win32 { + SOURCES += \ + io/qstandardpaths_unix.cpp \ + io/qstorageinfo_unix.cpp ++ freebsd { ++ LIBS += -lkvm -lprocstat ++ } + } + + linux|if(qnx:qtConfig(inotify)) { +--- src/corelib/io/qlockfile_unix.cpp.orig 2018-02-08 18:24:48 UTC ++++ src/corelib/io/qlockfile_unix.cpp +@@ -75,6 +75,8 @@ + # include <sys/sysctl.h> + # if !defined(Q_OS_NETBSD) + # include <sys/user.h> ++# include <kvm.h> ++# include <libprocstat.h> + # endif + #endif + +@@ -246,23 +248,44 @@ QString QLockFilePrivate::processNameByPid(qint64 pid) + struct kinfo_proc kp; + int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc), 1 }; + # else ++ QString nameFromProcstat; ++ kvm_t *kvm = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, ""); ++ if (kvm) { ++ int cnt; ++ struct kinfo_proc *kp = kvm_getprocs(kvm, KERN_PROC_PID, getpid(), &cnt); ++ if (kp) { ++ struct procstat *ps = procstat_open_sysctl(); ++ char **argv = procstat_getargv(ps, kp, 0); ++ if (argv != nullptr && argv[0] != nullptr) ++ nameFromProcstat = QString::fromLocal8Bit(argv[0]); ++ procstat_close(ps); ++ } ++ kvm_close(kvm); ++ } + struct kinfo_proc kp; + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid }; + # endif +- size_t len = sizeof(kp); +- u_int mib_len = sizeof(mib)/sizeof(u_int); ++ if (nameFromProcstat.isEmpty()) { ++ size_t len = sizeof(kp); ++ u_int mib_len = sizeof(mib)/sizeof(u_int); + +- if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) +- return QString(); +- ++ if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) ++ return QString(); ++ } + # if defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) + if (kp.p_pid != pid) + return QString(); + QString name = QFile::decodeName(kp.p_comm); + # else +- if (kp.ki_pid != pid) ++ QString name; ++ if (!nameFromProcstat.isEmpty()) { ++ QFileInfo fi(nameFromProcstat); ++ name = fi.fileName(); ++ } ++ else if (kp.ki_pid != pid) + return QString(); +- QString name = QFile::decodeName(kp.ki_comm); ++ else ++ name = QFile::decodeName(kp.ki_comm); + # endif + return name; +--- src/corelib/io/io.pri.orig 2018-02-08 18:24:48 UTC ++++ src/corelib/io/io.pri +@@ -178,6 +178,9 @@ win32 { + SOURCES += \ + io/qstandardpaths_unix.cpp \ + io/qstorageinfo_unix.cpp ++ freebsd { ++ LIBS += -lkvm -lprocstat ++ } + } + + linux|if(qnx:qtConfig(inotify)) { +--- src/corelib/io/qlockfile_unix.cpp.orig 2018-02-08 18:24:48 UTC ++++ src/corelib/io/qlockfile_unix.cpp +@@ -75,6 +75,8 @@ + # include <sys/sysctl.h> + # if !defined(Q_OS_NETBSD) + # include <sys/user.h> ++# include <kvm.h> ++# include <libprocstat.h> + # endif + #endif + +@@ -246,23 +248,44 @@ QString QLockFilePrivate::processNameByPid(qint64 pid) + struct kinfo_proc kp; + int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc), 1 }; + # else ++ QString nameFromProcstat; ++ kvm_t *kvm = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, ""); ++ if (kvm) { ++ int cnt; ++ struct kinfo_proc *kp = kvm_getprocs(kvm, KERN_PROC_PID, getpid(), &cnt); ++ if (kp) { ++ struct procstat *ps = procstat_open_sysctl(); ++ char **argv = procstat_getargv(ps, kp, 0); ++ if (argv != nullptr && argv[0] != nullptr) ++ nameFromProcstat = QString::fromLocal8Bit(argv[0]); ++ procstat_close(ps); ++ } ++ kvm_close(kvm); ++ } + struct kinfo_proc kp; + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, (int)pid }; + # endif +- size_t len = sizeof(kp); +- u_int mib_len = sizeof(mib)/sizeof(u_int); ++ if (nameFromProcstat.isEmpty()) { ++ size_t len = sizeof(kp); ++ u_int mib_len = sizeof(mib)/sizeof(u_int); + +- if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) +- return QString(); +- ++ if (sysctl(mib, mib_len, &kp, &len, NULL, 0) < 0) ++ return QString(); ++ } + # if defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD) + if (kp.p_pid != pid) + return QString(); + QString name = QFile::decodeName(kp.p_comm); + # else +- if (kp.ki_pid != pid) ++ QString name; ++ if (!nameFromProcstat.isEmpty()) { ++ QFileInfo fi(nameFromProcstat); ++ name = fi.fileName(); ++ } ++ else if (kp.ki_pid != pid) + return QString(); +- QString name = QFile::decodeName(kp.ki_comm); ++ else ++ name = QFile::decodeName(kp.ki_comm); + # endif + return name;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806121244.w5CCiXru075178>