From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:54134 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725788AbeLYAxL (ORCPT ); Mon, 24 Dec 2018 19:53:11 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id wBP0mW19128975 for ; Mon, 24 Dec 2018 19:53:10 -0500 Received: from e12.ny.us.ibm.com (e12.ny.us.ibm.com [129.33.205.202]) by mx0b-001b2d01.pphosted.com with ESMTP id 2pk34k3935-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 24 Dec 2018 19:53:10 -0500 Received: from localhost by e12.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 25 Dec 2018 00:53:09 -0000 Date: Mon, 24 Dec 2018 16:53:15 -0800 From: "Paul E. McKenney" Subject: Re: [PATCH 00/11] datastruct: Employ new scheme for code snippet Reply-To: paulmck@linux.ibm.com References: <0f522d14-373b-fdee-6779-eeaa04ee5fa4@gmail.com> <20181224235832.GW4170@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181224235832.GW4170@linux.ibm.com> Message-Id: <20181225005315.GA20719@linux.ibm.com> Sender: perfbook-owner@vger.kernel.org List-ID: To: Akira Yokosawa Cc: perfbook@vger.kernel.org On Mon, Dec 24, 2018 at 03:58:32PM -0800, Paul E. McKenney wrote: > On Mon, Dec 24, 2018 at 11:46:23PM +0900, Akira Yokosawa wrote: > > Hi Paul, > > > > This patch set consists of enhancement of fcvextract.pl, > > update of snippets in datastruct, and some minor tweaks. > > > > fcvextract.pl now suppresses comment blocks in C source and > > supports alternative code for snippets in #ifndef blocks, > > which won't be affected by the suppression of comment blocks. > > > > Also, labeling of the form /* \lnlbl{label} */ is now supported > > in C snippets. > > > > Patch #1 adds comment block handling to fcvextract.pl, without > > changing the default behavior. > > > > Patch #2 adds a couple of explicit options to snippets which > > have comments to be displayed. It also converts alternative > > code fragments using "#ifndef FCV_EXCLUDE" so that they survive > > comment block suppression. > > > > Patch #3 changes the default to "keepcomment=no". > > This removes a couple of comments in Listings 4.8 and 9.5. > > > > Patch #4 removes now redundant "\fcvexclude" around comment > > blocks. It also uses "#ifndef FCV_SNIPPET" to reduce \fcvexclude > > uses. > > > > Patch #5 adds support of "/* \lnlbl{label} */" labeling. > > > > Patch #6 updates snippets of hash_bkt.c. "struct hashtab" > > now has the "ht_cmp" field and I updated the text to mention > > it. You might want to do some rewording. > > Looks good to me as is. > > > Patch #7 adds the "ht_cmp" field in the hashdiagram figure > > (still in .fig). > > > > Patch #8 updates the rest of snippets in datastruct. It also > > fixes typo in cross references of Listing 10.13. > > By this change, an smp_mb() appears in ht_get_bucket() > > (Listing 10.10). > > > > My guess is that the counterpart barrier is the first > > synchronize_rcu() in hashtab_resize(). It might deserve some > > explanation or a Quick Quiz. Also, Answer to Quick Quiz 10.13 > > might need some expansion, since it looks as though hash_reorder.c > > used something more than the pure RCU protection. But I might be > > completely misreading here... > > I think I have a bug... > > So am I smarter now than when I wrote that code, or vice versa? ;-) I believe that I am smarter now, or maybe just more deluded. Anyway, when I changed the code, I go this from the top-level Makefile: $ make sh ./utilities/gen_snippet_d.sh sh utilities/autodate.sh >autodate.tex CodeSamples/datastruct/hash/hash_resize.c --> CodeSamples/datastruct/hash/hash_resize@data.fcv utilities/fcvextract.pl CodeSamples/datastruct/hash/hash_resize.c hash_resize:data > CodeSamples/datastruct/hash/hash_resize@data.fcv CodeSamples/datastruct/hash/hash_resize.c --> CodeSamples/datastruct/hash/hash_resize@get_bucket.fcv utilities/fcvextract.pl CodeSamples/datastruct/hash/hash_resize.c hash_resize:get_bucket > CodeSamples/datastruct/hash/hash_resize@get_bucket.fcv CodeSamples/datastruct/hash/hash_resize.c --> CodeSamples/datastruct/hash/hash_resize@lock_unlock_mod.fcv utilities/fcvextract.pl CodeSamples/datastruct/hash/hash_resize.c hash_resize:lock_unlock_mod > CodeSamples/datastruct/hash/hash_resize@lock_unlock_mod.fcv CodeSamples/datastruct/hash/hash_resize.c --> CodeSamples/datastruct/hash/hash_resize@access.fcv utilities/fcvextract.pl CodeSamples/datastruct/hash/hash_resize.c hash_resize:access > CodeSamples/datastruct/hash/hash_resize@access.fcv CodeSamples/datastruct/hash/hash_resize.c --> CodeSamples/datastruct/hash/hash_resize@resize.fcv utilities/fcvextract.pl CodeSamples/datastruct/hash/hash_resize.c hash_resize:resize > CodeSamples/datastruct/hash/hash_resize@resize.fcv CodeSamples/datastruct/hash/.hash_resize.c.swp --> CodeSamples/datastruct/hash/CodeSamples/datastruct/hash.fcv utilities/fcvextract.pl CodeSamples/datastruct/hash/.hash_resize.c.swp hash > CodeSamples/datastruct/hash/CodeSamples/datastruct/hash.fcv /bin/bash: CodeSamples/datastruct/hash/CodeSamples/datastruct/hash.fcv: No such file or directory make: *** [CodeSamples/datastruct/hash/CodeSamples/datastruct/hash.fcv] Error 1 Using "make clean" didn't fix it. Neither did reverting my change to CodeSamples/datastruct/hash/hash_resize.c, which is shown below. Ah, I get it now. I had CodeSamples/datastruct/hash/hash_resize.c open in vim, and the scripting attempted to process the resulting .hash_resize.c.swp file from vim. Things started working again after I exited from vim. Thanx, Paul ------------------------------------------------------------------------ diff --git a/CodeSamples/datastruct/hash/hash_resize.c b/CodeSamples/datastruct/hash/hash_resize.c index 662bb90bff14..ccb523bb6c05 100644 --- a/CodeSamples/datastruct/hash/hash_resize.c +++ b/CodeSamples/datastruct/hash/hash_resize.c @@ -298,13 +298,14 @@ int hashtab_resize(struct hashtab *htp_master, for (i = 0; i < htp->ht_nbuckets; i++) { //\lnlbl{loop:b} htbp = &htp->ht_bkt[i]; //\lnlbl{get_oldcur} spin_lock(&htbp->htb_lock); //\lnlbl{acq_oldcur} - htp->ht_resize_cur = i; //\lnlbl{update_resize} cds_list_for_each_entry(htep, &htbp->htb_head, hte_next[idx]) { //\lnlbl{loop_list:b} htbp_new = ht_get_bucket_single(htp_new, htp_new->ht_getkey(htep), &b); spin_lock(&htbp_new->htb_lock); cds_list_add_rcu(&htep->hte_next[!idx], &htbp_new->htb_head); spin_unlock(&htbp_new->htb_lock); } //\lnlbl{loop_list:e} + smp_mb(); /* Fill new buckets before claiming them. */ + htp->ht_resize_cur = i; //\lnlbl{update_resize} spin_unlock(&htbp->htb_lock); //\lnlbl{rel_oldcur} } //\lnlbl{loop:e} rcu_assign_pointer(htp_master->ht_cur, htp_new); //\lnlbl{rcu_assign}