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.
Thanks, Akira
>
>> Fixing labels is left for your update.
>
> Will do, and yes, they are a bit of a mess just now. ;-)
>
> Thanx, Paul
>
>> Thanks, Akira
>> --
>> CodeSamples/datastruct/hash/hash_resize.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/CodeSamples/datastruct/hash/hash_resize.c b/CodeSamples/datastruct/hash/hash_resize.c
>> index bb0a6f4..7392455 100644
>> --- a/CodeSamples/datastruct/hash/hash_resize.c
>> +++ b/CodeSamples/datastruct/hash/hash_resize.c
>> @@ -154,10 +154,11 @@ 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, struct ht_bucket *ls[2])
>> +resize_lock_mod(struct hashtab *htp_master, void *key,
>> + struct ht_bucket *ls[2])
>> {
>> long b;
>> struct ht *htp;
>> --
>> 2.7.4
>>
>>
>
