svn commit: r296146 - stable/9/sys/dev/filemon

[Bryan Drewery]

On 2/28/16 4:37 AM, Slawa Olhovchenkov wrote:
> On Sun, Feb 28, 2016 at 12:20:09PM +0000, Brooks Davis wrote:
> 
>> On Sun, Feb 28, 2016 at 01:27:28PM +0300, Slawa Olhovchenkov wrote:
>>> On Sat, Feb 27, 2016 at 08:57:34PM +0000, Bryan Drewery wrote:
>>>
>>>> Author: bdrewery
>>>> Date: Sat Feb 27 20:57:34 2016
>>>> New Revision: 296146
>>>> URL: https://svnweb.freebsd.org/changeset/base/296146
>>>>
>>>> Log:
>>>>   MFC r242088:
>>>>   
>>>>     Desupport pre-FreeBSD 7.1.
>>>>
>>>> Modified:
>>>>   stable/9/sys/dev/filemon/filemon.c
>>>> Directory Properties:
>>>>   stable/9/sys/   (props changed)
>>>>   stable/9/sys/dev/   (props changed)
>>>> -#if __FreeBSD_version < 701000
>>>
>>> Not specialy to this commit, just for information: what purpose to
>>> have in src tree, already divided to branches, pieces of code under
>>> #if?
>>>
>>> Of couse, question not about external maintained code.
>>
>> Filemon started as externally maintained code and initially it was
>> a bit ambiguous which direction changes would flow.
> 
> I.e. historical behaviour.
> 
>> Sometimes it's also useful to allow code in HEAD to just work when
>> copied to stable so people can see if their problem is fixed without
>> having to merge too much.
> 
> Please, check me: in mostly cases this is equivalent of MFC in one
> commit (and have same complexity as MFC) but w/o actualy MFC.

Yes. For example, in the MFC of some filemon changes to stable/10 and
stable/9 I had to make this change directly in the MFC that I was not
expecting and did not get audited well in SVN:

> diff --git a/sys/dev/filemon/filemon_wrapper.c b/sys/dev/filemon/filemon_wrapper.c
> index a20ece5..d08aa6f 100644
> --- a/sys/dev/filemon/filemon_wrapper.c
> +++ b/sys/dev/filemon/filemon_wrapper.c
> @@ -424,7 +424,7 @@ filemon_event_process_exit(void *arg __unused, struct proc *p)
> 
>         if ((filemon = filemon_pid_check(p)) != NULL) {
>                 len = snprintf(filemon->msgbufr, sizeof(filemon->msgbufr),
> -                   "X %d %d %d\n", p->p_pid, p->p_xexit, p->p_xsig);
> +                   "X %d %d\n", p->p_pid, W_EXITCODE(p->p_xstat, 0));
> 
>                 filemon_output(filemon, filemon->msgbufr, len);

It is possible to add both versions in head such that the MFC is safe
and easy, but it pollutes head and I think it generally should not be done.


> 
>> In general though, we should remove code like
>> this in things maintained entirely in tree.
> 
> Thanks!
> 


-- 
Regards,
Bryan Drewery