On 2019/01/03 16:52:38 -0800, Paul E. McKenney wrote:
> On Fri, Jan 04, 2019 at 08:35:07AM +0900, Akira Yokosawa wrote:
>> On 2019/01/03 09:21:45 -0800, Paul E. McKenney wrote:
>>> On Fri, Jan 04, 2019 at 12:57:06AM +0900, Akira Yokosawa wrote:
>>>> >From ae50debbf06ad674e4941b55764b02c776484509 Mon Sep 17 00:00:00 2001
>>>> From: Akira Yokosawa <akiyks@xxxxxxxxx>
>>>> Date: Fri, 4 Jan 2019 00:19:26 +0900
>>>> Subject: [PATCH] datastruct/hash: Tweak appearance of updated code in snippet
>>>>
>>>> Now that "[" and "]" are used within the code, "commandchars" should
>>>> avoid them.
>>>>
>>>> Also wrap a line which has become too wide for the 2c layout.
>>>>
>>>> Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx>
>>>
>>> Ah, the lsp[2] was a temporary state. I forgot to do a final "git push"
>>> yesterday, apologies!
>>>
>>>> ---
>>>> Hi Paul,
>>>>
>>>> I'm in the middle of reading the updated code.
>>>>
>>>> I'm sure you are working on the update of Section 10.4.2.
>>>> Because of the code change, there are quite a few broken refs
>>>> and duplicated labels at the moment.
>>>
>>> Yes, it is a bit of a mess at this point. I figured that if I was
>>> going to have to modify the text and labels, I might as well do the
>>> extra work to make the API a little less obnoxious. My first attempt to
>>> move hash_resize.c's hashtab_add() in this direction broke very badly,
>>> so it is back to the drawing board.
>>>
>>> I am thinking in terms of having a single struct ht_lock_state that
>>> contains an array or two as one part of making the API less obnoxious,
>>> which should help avoid the brokenness.
>>>
>>>> This commit just takes care of the vanishing "[" and "]" in
>>>> Listing 10.11.
>>>
>>> I am hoping that we can retain "[" and "]" -- it is normally not such
>>> a good idea to have arrays in parameter lists.
>>>
>>> Or do we need this commit anyway just due to array references within
>>> the code snippet?
>>
>> Yes, we do.
>>
>>> If the latter, I will hand-apply the patch.
>>
>> Please do so.
>
> Like this? One reason that the patch didn't apply was that I had
> already split the offending line.
>
> Thanx, Paul
>
> ------------------------------------------------------------------------
>
> commit d138666652d064f1ac891af7770dd220d51caa86
> Author: Akira Yokosawa <akiyks@xxxxxxxxx>
> Date: Thu Jan 3 16:50:25 2019 -0800
>
> datastruct/hash: Tweak appearance of updated code in snippet
>
> Now that "[" and "]" are used within the code, "commandchars" should
> avoid them.
>
> Also wrap a line which has become too wide for the 2c layout.
This sentence can be omitted in the commit log.
The diff itself looks good to me.
Thanks, Akira
>
> Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx>
> Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxx>
>
> diff --git a/CodeSamples/datastruct/hash/hash_resize.c b/CodeSamples/datastruct/hash/hash_resize.c
> index 90ca6e57a21c..d042b2048083 100644
> --- a/CodeSamples/datastruct/hash/hash_resize.c
> +++ b/CodeSamples/datastruct/hash/hash_resize.c
> @@ -159,7 +159,7 @@ static void hashtab_unlock_lookup(struct hashtab *htp_master, void *key)
> rcu_read_unlock();
> }
>
> -//\begin{snippet}[labelbase=ln:datastruct:hash_resize:lock_unlock_mod,commandchars=\\\[\]]
> +//\begin{snippet}[labelbase=ln:datastruct:hash_resize:lock_unlock_mod,commandchars=\\\@\$]
> /* Update-side lock/unlock functions. */
> static void //\lnlbl{lock:b}
> resize_lock_mod(struct hashtab *htp_master, void *key,
>
