head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.72 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.70 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.68 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.66 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.64 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.62 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.60 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.58 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.56 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.54 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.52 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.50 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.48 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.46 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.44 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.42 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.40 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.38 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.36 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.34 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.32 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.30 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.28 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.24 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.4 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.26 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.22 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.20 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.18 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.16 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.14 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.12 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.10 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.8 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.6 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.2 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.2.0.72 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.70 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.68 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.66 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.64 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.62 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.60 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.58 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.56 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.54 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.52 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.50 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.48 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.46 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.44 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.42 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.40 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.38 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.36 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.34 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.32 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.30 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.28 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.26 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.24 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.22 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.20 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.18 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.16 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.14 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.12 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.10 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.8 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.6 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.4 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.2 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.1.0.12 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.10 pkgsrc-2008Q1:1.1.0.8 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.6 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.4 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.2 pkgsrc-2007Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2017.06.23.19.16.58; author kamil; state Exp; branches; next 1.2; commitid D2NHKhcJJSFU1xWz; 1.2 date 2008.07.21.02.55.34; author dholland; state Exp; branches; next 1.1; 1.1 date 2007.06.30.19.18.47; author joerg; state Exp; branches; next ; desc @@ 1.3 log @Correct lavaps build failure on NetBSD 8.99.1 Address removal fallout. @ text @$NetBSD: patch-af,v 1.2 2008/07/21 02:55:34 dholland Exp $ --- src/process_scan_bsd.cc.orig 2003-12-01 01:04:48.000000000 +0000 +++ src/process_scan_bsd.cc @@@@ -56,7 +56,15 @@@@ extern "C" { #include #include // KERN_PROC_ALL #include +#ifdef __DragonFly__ +#define template +#endif +#if defined(__FreeBSD__) || defined(__DragonFly__) #include +#endif +#ifdef __DragonFly__ +#undef template +#endif #include #include #include @@@@ -226,6 +234,13 @@@@ int process_scan_bsd::extract_uid() { re int process_scan_bsd::extract_nice() { return int(cur_kp_->kp_proc.p_nice); } int process_scan_bsd::extract_utime_msec() { return time_value_t_to_msec(kur_kp_->times.user_time) + time_value_t_to_msec(cur_kp_->tasks_info.user_time); } int process_scan_bsd::extract_stime_msec() { return time_value_t_to_msec(kur_kp_->times.system _time) + time_value_t_to_msec(cur_kp_->tasks_info.system_time); } +#elif defined(__DragonFly__) +char *process_scan_bsd::extract_cmd() { return cur_kp_->kp_proc.p_comm; } +int process_scan_bsd::extract_pid() { return int(cur_kp_->kp_proc.p_pid); } +int process_scan_bsd::extract_uid() { return int(cur_kp_->kp_eproc.e_pcred.cr_ruid); } +int process_scan_bsd::extract_nice() { return int(cur_kp_->kp_proc.p_nice); } +int process_scan_bsd::extract_utime_msec() { return ticks_to_msec(cur_kp_->kp_eproc.e_uticks); } +int process_scan_bsd::extract_stime_msec() { return ticks_to_msec(cur_kp_->kp_eproc.e_sticks); } #else #error unknown bsd variant #endif @ 1.2 log @Update lavaps to 2.7. Note: there's an alternate Gnome user interface now; it would be nice to be able to use it via PKG_OPTIONS, but I haven't done this yet. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.1 2007/06/30 19:18:47 joerg Exp $ d3 3 a5 3 --- src/process_scan_bsd.cc~ 2003-11-30 20:04:48.000000000 -0500 +++ src/process_scan_bsd.cc 2008-07-20 21:50:04.000000000 -0400 @@@@ -56,7 +56,13 @@@@ extern "C" { d12 1 d14 1 d21 1 a21 1 @@@@ -226,6 +232,13 @@@@ int process_scan_bsd::extract_uid() { re @ 1.1 log @DragonFly support and fix detection of modular Xorg. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- process_scan_bsd.cc.orig 2007-06-30 18:48:04.000000000 +0000 +++ process_scan_bsd.cc @@@@ -42,7 +42,13 @@@@ extern "C" { d19 14 a32 38 @@@@ -78,7 +84,11 @@@@ public: virtual void life(process_model *pm); virtual int cur_pid() { return int(cur_kp_->kp_proc.p_pid); } +#ifdef __DragonFly__ + virtual int cur_uid() { return int(cur_kp_->kp_eproc.e_ucred.cr_ruid); } +#else virtual int cur_uid() { return int(cur_kp_->kp_eproc.e_pcred.p_ruid); } +#endif }; @@@@ -256,7 +266,11 @@@@ process_scan_bsd::birth() { process_model *pm = new process_model(int(cur_kp_->kp_proc.p_pid)); // fill in init-time only bits: +#ifdef __DragonFly__ + pm->set_uid(int(cur_kp_->kp_eproc.e_ucred.cr_ruid)); +#else pm->set_uid(int(cur_kp_->kp_eproc.e_pcred.p_ruid)); +#endif pm->set_nice(cur_kp_->kp_proc.p_nice); pm->set_start_time(0); // xxx: not in bsd? life(pm); @@@@ -267,8 +281,13 @@@@ void process_scan_bsd::life(process_model *pm) { // OS-specific bits: +#ifdef __DragonFly__ + pm->set_utime(ticks_to_msec(cur_kp_->kp_eproc.e_uticks)); + pm->set_stime(ticks_to_msec(cur_kp_->kp_eproc.e_sticks)); +#else pm->set_utime(ticks_to_msec(cur_kp_->kp_proc.p_uticks)); pm->set_stime(ticks_to_msec(cur_kp_->kp_proc.p_sticks)); +#endif // xxx: skip p_iticks int size, resident; @