Page MenuHomeFreeBSD
Differential D15673

devel/qt5-core: Add a patch that fixes QLockFilePrivate::processNameByPid() function to return non-truncated name.
ClosedPublic
Actions

Authored by arrowd on Jun 6 2018, 10:02 AM.
Tags
None
Referenced Files
F81662833: D15673.diff
Fri, Apr 19, 3:33 PM
Unknown Object (File)
Thu, Mar 28, 4:08 PM
Unknown Object (File)
Thu, Mar 28, 9:54 AM
Unknown Object (File)
Mar 10 2024, 5:26 AM
Unknown Object (File)
Feb 20 2024, 6:16 AM
Unknown Object (File)
Feb 15 2024, 10:46 AM
Unknown Object (File)
Feb 12 2024, 9:18 PM
Unknown Object (File)
Jan 18 2024, 1:42 PM
View All 52 Files
Subscribers
cmt
rakuco
tcberner

Details

Reviewers
tcberner
Group Reviewers
kde
Commits
rP472242: devel/qt5-core: Add a patch that fixes QLockFilePrivate::processNameByPid()…
Summary

String returned from sysctl() can't be longer than COMMLEN (19) symbols, so it returns bogus data for processes with long file name.
Use kvm and procstat librarires to obtain correct name and only use sysctl as a fallback.

Test Plan

make check for qlockfile passes.

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 17031
Build 16898: arc lint + arc unit

Event Timeline

arrowd created this revision.Jun 6 2018, 10:02 AM
Harbormaster completed remote builds in B17031: Diff 43354.Jun 6 2018, 10:02 AM
arrowd updated this revision to Diff 43356.Jun 6 2018, 11:00 AM

Add missing patch.

Harbormaster completed remote builds in B17032: Diff 43356.Jun 6 2018, 11:00 AM
tcberner added a subscriber: tcberner.Jun 6 2018, 5:40 PM

You need to bump the PORTTREVISION too.

tcberner added inline comments.Jun 6 2018, 7:29 PM
devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp
17

^ shouldn't there be some chekc on the return value of kvm_open?

60

^ name is already defined on line 49.

arrowd updated this revision to Diff 43419.Jun 7 2018, 3:28 PM
  • Error handling
  • Bump PORTREVISION
Harbormaster completed remote builds in B17074: Diff 43419.Jun 7 2018, 3:28 PM
arrowd marked an inline comment as done.Jun 7 2018, 3:29 PM
arrowd marked an inline comment as done.Jun 7 2018, 3:50 PM
arrowd updated this revision to Diff 43420.Jun 7 2018, 3:51 PM
  • Fix redifinition.
Harbormaster completed remote builds in B17075: Diff 43420.Jun 7 2018, 3:51 PM
rakuco added a subscriber: rakuco.Jun 7 2018, 10:01 PM
rakuco added inline comments.
devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp
12

Isn't it easier to just add a freebsd condition in the else block below?

} else {
  SOURCES += ...
  freebsd {
    LIBS += lkvm -lprocstat
  }
}
35

Style: the * needs to be next to kp (this applies to the other pointer declarations below too).

51

Style: this should've been part of the previous line.

69

Same here.

arrowd updated this revision to Diff 43451.Jun 8 2018, 12:18 PM
arrowd marked 4 inline comments as done.
  • Address rakuco's comments.
Harbormaster completed remote builds in B17095: Diff 43451.Jun 8 2018, 12:18 PM
tcberner added a comment.Jun 10 2018, 5:32 PM

If @rakuco has nothing more to add, it looks fine to me.

rakuco added a comment.Jun 11 2018, 8:40 PM

Looks OK to me. It'd be good to clean this up and submit the patch upstream later.

tcberner accepted this revision.Jun 12 2018, 5:43 AM
This revision is now accepted and ready to land.Jun 12 2018, 5:43 AM
Closed by commit rP472242: devel/qt5-core: Add a patch that fixes QLockFilePrivate::processNameByPid()… (authored by arrowd). · Explain WhyJun 12 2018, 12:44 PM
This revision was automatically updated to reflect the committed changes.
cmt added a subscriber: cmt.Jun 12 2018, 1:18 PM

The patch file (148 lines) contains the same 74 line patch twice, thus the build doesn't even start because of "patch failed".

Revision Contents
Changeset List

PathSize
devel/
qt5-core/
files/
62 lines

Diff 43354

View Options

devel/qt5-core/files/patch-src_corelib_io_qlockfile__unix.cpp

Loading...