From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29660 invoked by alias); 10 Jan 2017 16:11:46 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 29651 invoked by uid 89); 10 Jan 2017 16:11:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-5.1 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=H*M:208, H*MI:208, waiters, states X-HELO: mx1.redhat.com Message-ID: <1484064691.5606.208.camel@redhat.com> Subject: [PATCH] Fix mutex pretty printer test and pretty printer output. From: Torvald Riegel To: GLIBC Devel Cc: Martin Galvan Date: Tue, 10 Jan 2017 16:11:00 -0000 Content-Type: multipart/mixed; boundary="=-CNtQxeHK8IzjUo/lc8ra" Mime-Version: 1.0 X-SW-Source: 2017-01/txt/msg00169.txt.bz2 --=-CNtQxeHK8IzjUo/lc8ra Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Content-length: 363 This fixes the test for the mutex pretty printers in that it does not assume that the owner field is set even though the mutex is acquired; this is not guaranteed under the current lock elision implementation. Also, it improves the wording of some of the pretty printer output (eg, changing 'Locked' to 'Acquired'). Tested on x86_64 with --enable-lock-elision. --=-CNtQxeHK8IzjUo/lc8ra Content-Disposition: attachment; filename="mutex-pp-fix.patch" Content-Type: text/x-patch; name="mutex-pp-fix.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 Content-length: 8406 Y29tbWl0IDY2MWE4YThkNzY2NzQ3MzY3MzE0Zjg0ODczMzgwNGYyMmNlZjgy NWUKQXV0aG9yOiBUb3J2YWxkIFJpZWdlbCA8dHJpZWdlbEByZWRoYXQuY29t PgpEYXRlOiAgIE1vbiBKYW4gOSAyMDo0MDo1NyAyMDE3ICswMTAwCgogICAg Rml4IG11dGV4IHByZXR0eSBwcmludGVyIHRlc3QgYW5kIHByZXR0eSBwcmlu dGVyIG91dHB1dC4KICAgIAogICAgVGhpcyBmaXhlcyB0aGUgdGVzdCBmb3Ig dGhlIG11dGV4IHByZXR0eSBwcmludGVycyBpbiB0aGF0IGl0IGRvZXMgbm90 CiAgICBhc3N1bWUgdGhhdCB0aGUgb3duZXIgZmllbGQgaXMgc2V0IGV2ZW4g dGhvdWdoIHRoZSBtdXRleCBpcyBhY3F1aXJlZDsKICAgIHRoaXMgaXMgbm90 IGd1YXJhbnRlZWQgdW5kZXIgdGhlIGN1cnJlbnQgbG9jayBlbGlzaW9uIGlt cGxlbWVudGF0aW9uLgogICAgQWxzbywgaXQgaW1wcm92ZXMgdGhlIHdvcmRp bmcgb2Ygc29tZSBvZiB0aGUgcHJldHR5IHByaW50ZXIgb3V0cHV0IChlZywK ICAgIGNoYW5naW5nICdMb2NrZWQnIHRvICdBY3F1aXJlZCcpLgogICAgCiAg ICAJKiBucHRsL25wdGwtcHJpbnRlcnMucHkgKE11dGV4UHJpbnRlcik6IENo YW5nZSBvdXRwdXQuCiAgICAJKiBucHRsL3Rlc3QtbXV0ZXgtcHJpbnRlcnMu cHk6IEZpeCB0ZXN0IGFuZCBhZGFwdCB0byBjaGFuZ2VkIG91dHB1dC4KCmRp ZmYgLS1naXQgYS9ucHRsL25wdGwtcHJpbnRlcnMucHkgYi9ucHRsL25wdGwt cHJpbnRlcnMucHkKaW5kZXggOWQ2Nzg2NS4uNTRkNGM4NCAxMDA2NDQKLS0t IGEvbnB0bC9ucHRsLXByaW50ZXJzLnB5CisrKyBiL25wdGwvbnB0bC1wcmlu dGVycy5weQpAQCAtMTI0LDE4ICsxMjQsMjEgQEAgY2xhc3MgTXV0ZXhQcmlu dGVyKG9iamVjdCk6CiAgICAgICAgICIiIgogCiAgICAgICAgIGlmIHNlbGYu bG9jayA9PSBQVEhSRUFEX01VVEVYX1VOTE9DS0VEOgotICAgICAgICAgICAg c2VsZi52YWx1ZXMuYXBwZW5kKCgnU3RhdHVzJywgJ1VubG9ja2VkJykpCisg ICAgICAgICAgICBzZWxmLnZhbHVlcy5hcHBlbmQoKCdTdGF0dXMnLCAnTm90 IGFjcXVpcmVkJykpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBpZiBz ZWxmLmxvY2sgJiBGVVRFWF9XQUlURVJTOgotICAgICAgICAgICAgICAgIHNl bGYudmFsdWVzLmFwcGVuZCgoJ1N0YXR1cycsICdMb2NrZWQsIHBvc3NpYmx5 IHdpdGggd2FpdGVycycpKQorICAgICAgICAgICAgICAgIHNlbGYudmFsdWVz LmFwcGVuZCgoJ1N0YXR1cycsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnQWNxdWlyZWQsIHBvc3NpYmx5IHdpdGggd2FpdGVycycp KQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBzZWxmLnZh bHVlcy5hcHBlbmQoKCdTdGF0dXMnLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ0xvY2tlZCwgcG9zc2libHkgd2l0aCBubyB3YWl0 ZXJzJykpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn QWNxdWlyZWQsIHBvc3NpYmx5IHdpdGggbm8gd2FpdGVycycpKQogCiAgICAg ICAgICAgICBpZiBzZWxmLmxvY2sgJiBGVVRFWF9PV05FUl9ESUVEOgotICAg ICAgICAgICAgICAgIHNlbGYudmFsdWVzLmFwcGVuZCgoJ093bmVyIElEJywg JyVkIChkZWFkKScgJSBzZWxmLm93bmVyKSkKKyAgICAgICAgICAgICAgICBz ZWxmLnZhbHVlcy5hcHBlbmQoKCdPd25lciBJRCAoaWYga25vd24pJywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICclZCAoZGVhZCkn ICUgc2VsZi5vd25lcikpCiAgICAgICAgICAgICBlbHNlOgotICAgICAgICAg ICAgICAgIHNlbGYudmFsdWVzLmFwcGVuZCgoJ093bmVyIElEJywgc2VsZi5s b2NrICYgRlVURVhfVElEX01BU0spKQorICAgICAgICAgICAgICAgIHNlbGYu dmFsdWVzLmFwcGVuZCgoJ093bmVyIElEIChpZiBrbm93biknLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5sb2NrICYgRlVU RVhfVElEX01BU0spKQogCiAgICAgICAgIGlmIHNlbGYub3duZXIgPT0gUFRI UkVBRF9NVVRFWF9JTkNPTlNJU1RFTlQ6CiAgICAgICAgICAgICBzZWxmLnZh bHVlcy5hcHBlbmQoKCdTdGF0ZSBwcm90ZWN0ZWQgYnkgdGhpcyBtdXRleCcs CkBAIC0xNTcsNyArMTYwLDcgQEAgY2xhc3MgTXV0ZXhQcmludGVyKG9iamVj dCk6CiAgICAgICAgICAgICBsb2NrX3ZhbHVlICY9IH4oUFRIUkVBRF9NVVRF WF9QUklPX0NFSUxJTkdfTUFTSykKIAogICAgICAgICBpZiBsb2NrX3ZhbHVl ID09IFBUSFJFQURfTVVURVhfVU5MT0NLRUQ6Ci0gICAgICAgICAgICBzZWxm LnZhbHVlcy5hcHBlbmQoKCdTdGF0dXMnLCAnVW5sb2NrZWQnKSkKKyAgICAg ICAgICAgIHNlbGYudmFsdWVzLmFwcGVuZCgoJ1N0YXR1cycsICdOb3QgYWNx dWlyZWQnKSkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGlmIHNlbGYu a2luZCAmIFBUSFJFQURfTVVURVhfUFJJT19JTkhFUklUX05QOgogICAgICAg ICAgICAgICAgIHdhaXRlcnMgPSBzZWxmLmxvY2sgJiBGVVRFWF9XQUlURVJT CkBAIC0xNjgsMTIgKzE3MSwxMyBAQCBjbGFzcyBNdXRleFByaW50ZXIob2Jq ZWN0KToKICAgICAgICAgICAgICAgICBvd25lciA9IHNlbGYub3duZXIKIAog ICAgICAgICAgICAgaWYgd2FpdGVyczoKLSAgICAgICAgICAgICAgICBzZWxm LnZhbHVlcy5hcHBlbmQoKCdTdGF0dXMnLCAnTG9ja2VkLCBwb3NzaWJseSB3 aXRoIHdhaXRlcnMnKSkKKyAgICAgICAgICAgICAgICBzZWxmLnZhbHVlcy5h cHBlbmQoKCdTdGF0dXMnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ0FjcXVpcmVkLCBwb3NzaWJseSB3aXRoIHdhaXRlcnMnKSkK ICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgc2VsZi52YWx1 ZXMuYXBwZW5kKCgnU3RhdHVzJywKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICdMb2NrZWQsIHBvc3NpYmx5IHdpdGggbm8gd2FpdGVy cycpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ0Fj cXVpcmVkLCBwb3NzaWJseSB3aXRoIG5vIHdhaXRlcnMnKSkKIAotICAgICAg ICAgICAgc2VsZi52YWx1ZXMuYXBwZW5kKCgnT3duZXIgSUQnLCBvd25lcikp CisgICAgICAgICAgICBzZWxmLnZhbHVlcy5hcHBlbmQoKCdPd25lciBJRCAo aWYga25vd24pJywgb3duZXIpKQogCiAgICAgZGVmIHJlYWRfYXR0cmlidXRl cyhzZWxmKToKICAgICAgICAgIiIiUmVhZCB0aGUgbXV0ZXgncyBhdHRyaWJ1 dGVzLiIiIgpAQCAtMjE1LDcgKzIxOSw3IEBAIGNsYXNzIE11dGV4UHJpbnRl cihvYmplY3QpOgogICAgICAgICBtdXRleF90eXBlID0gc2VsZi5raW5kICYg UFRIUkVBRF9NVVRFWF9LSU5EX01BU0sKIAogICAgICAgICBpZiBtdXRleF90 eXBlID09IFBUSFJFQURfTVVURVhfUkVDVVJTSVZFIGFuZCBzZWxmLmNvdW50 ID4gMToKLSAgICAgICAgICAgIHNlbGYudmFsdWVzLmFwcGVuZCgoJ1RpbWVz IGxvY2tlZCByZWN1cnNpdmVseScsIHNlbGYuY291bnQpKQorICAgICAgICAg ICAgc2VsZi52YWx1ZXMuYXBwZW5kKCgnVGltZXMgYWNxdWlyZWQgYnkgdGhl IG93bmVyJywgc2VsZi5jb3VudCkpCiAKIGNsYXNzIE11dGV4QXR0cmlidXRl c1ByaW50ZXIob2JqZWN0KToKICAgICAiIiJQcmV0dHkgcHJpbnRlciBmb3Ig cHRocmVhZF9tdXRleGF0dHJfdC4KZGlmZiAtLWdpdCBhL25wdGwvdGVzdC1t dXRleC1wcmludGVycy5weSBiL25wdGwvdGVzdC1tdXRleC1wcmludGVycy5w eQppbmRleCAyM2YxNmIwLi5kMDYwMGI3IDEwMDY0NAotLS0gYS9ucHRsL3Rl c3QtbXV0ZXgtcHJpbnRlcnMucHkKKysrIGIvbnB0bC90ZXN0LW11dGV4LXBy aW50ZXJzLnB5CkBAIC0zOSwxNSArMzksMTcgQEAgdHJ5OgogCiAgICAgYnJl YWtfYXQodGVzdF9zb3VyY2UsICdUZXN0IHN0YXR1cyAobm9uLXJvYnVzdCkn KQogICAgIGNvbnRpbnVlX2NtZCgpICMgR28gdG8gdGVzdF9zdGF0dXNfbm9f cm9idXN0Ci0gICAgdGVzdF9wcmludGVyKHZhciwgdG9fc3RyaW5nLCB7J1N0 YXR1cyc6ICdVbmxvY2tlZCd9KQorICAgIHRlc3RfcHJpbnRlcih2YXIsIHRv X3N0cmluZywgeydTdGF0dXMnOiAnTm90IGFjcXVpcmVkJ30pCiAgICAgbmV4 dF9jbWQoKQogICAgIHRocmVhZF9pZCA9IGdldF9jdXJyZW50X3RocmVhZF9s d3BpZCgpCi0gICAgdGVzdF9wcmludGVyKHZhciwgdG9fc3RyaW5nLCB7J1N0 YXR1cyc6ICdMb2NrZWQsIHBvc3NpYmx5IHdpdGggbm8gd2FpdGVycycsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ093bmVyIElEJzog dGhyZWFkX2lkfSkKKyAgICAjIERvbid0IGNoZWNrIE93bmVyIElEIGhlcmUg YmVjYXVzZSB0aGUgb3duZXIgbWF5IG5vdCBhbHdheXMgYmUgc2V0CisgICAg IyAoZS5nLiwgaWYgdXNpbmcgbG9jayBlbGlzaW9uKS4KKyAgICB0ZXN0X3By aW50ZXIodmFyLCB0b19zdHJpbmcsCisgICAgICAgICAgICAgICAgIHsnU3Rh dHVzJzogJ0FjcXVpcmVkLCBwb3NzaWJseSB3aXRoIG5vIHdhaXRlcnMnfSkK IAogICAgIGJyZWFrX2F0KHRlc3Rfc291cmNlLCAnVGVzdCBzdGF0dXMgKHJv YnVzdCknKQogICAgIGNvbnRpbnVlX2NtZCgpICMgR28gdG8gdGVzdF9zdGF0 dXNfcm9idXN0Ci0gICAgdGVzdF9wcmludGVyKHZhciwgdG9fc3RyaW5nLCB7 J1N0YXR1cyc6ICdVbmxvY2tlZCd9KQorICAgIHRlc3RfcHJpbnRlcih2YXIs IHRvX3N0cmluZywgeydTdGF0dXMnOiAnTm90IGFjcXVpcmVkJ30pCiAKICAg ICAjIFdlJ2xsIG5vdyB0ZXN0IHRoZSByb2J1c3QgbXV0ZXggbG9ja2luZyBz dGF0ZXMuICBXZSdsbCBjcmVhdGUgYSBuZXcKICAgICAjIHRocmVhZCB0aGF0 IHdpbGwgbG9jayBhIHJvYnVzdCBtdXRleCBhbmQgZXhpdCB3aXRob3V0IHVu bG9ja2luZyBpdC4KQEAgLTY5LDIxICs3MSwyMiBAQCB0cnk6CiAgICAgIyBU aGUgbmV3IHRocmVhZCBzaG91bGQgYmUgZGVhZCBieSBub3cuCiAgICAgYnJl YWtfYXQodGVzdF9zb3VyY2UsICdUZXN0IGxvY2tpbmcgKHJvYnVzdCknKQog ICAgIGNvbnRpbnVlX2NtZCgpCi0gICAgdGVzdF9wcmludGVyKHZhciwgdG9f c3RyaW5nLCB7J093bmVyIElEJzogcid7MH0gXChkZWFkXCknLmZvcm1hdChj aGlsZF9pZCl9KQorICAgIHRlc3RfcHJpbnRlcih2YXIsIHRvX3N0cmluZywK KyAgICAgICAgICAgICAgICAgeydPd25lciBJRCBcKGlmIGtub3duXCknOiBy J3swfSBcKGRlYWRcKScuZm9ybWF0KGNoaWxkX2lkKX0pCiAgICAgIyBUcnkg dG8gbG9jayBhbmQgdW5sb2NrIHRoZSBtdXRleC4KICAgICBuZXh0X2NtZCgp Ci0gICAgdGVzdF9wcmludGVyKHZhciwgdG9fc3RyaW5nLCB7J093bmVyIElE JzogdGhyZWFkX2lkLAorICAgIHRlc3RfcHJpbnRlcih2YXIsIHRvX3N0cmlu ZywgeydPd25lciBJRCBcKGlmIGtub3duXCknOiB0aHJlYWRfaWQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnU3RhdGUgcHJvdGVjdGVkIGJ5IHRo aXMgbXV0ZXgnOiAnSW5jb25zaXN0ZW50J30pCiAgICAgbmV4dF9jbWQoKQot ICAgIHRlc3RfcHJpbnRlcih2YXIsIHRvX3N0cmluZywgeydTdGF0dXMnOiAn VW5sb2NrZWQnLAorICAgIHRlc3RfcHJpbnRlcih2YXIsIHRvX3N0cmluZywg eydTdGF0dXMnOiAnTm90IGFjcXVpcmVkJywKICAgICAgICAgICAgICAgICAg ICAgICAgICdTdGF0ZSBwcm90ZWN0ZWQgYnkgdGhpcyBtdXRleCc6ICdOb3Qg cmVjb3ZlcmFibGUnfSkKICAgICBzZXRfc2NoZWR1bGVyX2xvY2tpbmcoRmFs c2UpCiAKICAgICBicmVha19hdCh0ZXN0X3NvdXJjZSwgJ1Rlc3QgcmVjdXJz aXZlIGxvY2tzJykKICAgICBjb250aW51ZV9jbWQoKSAjIEdvIHRvIHRlc3Rf cmVjdXJzaXZlX2xvY2tzCi0gICAgdGVzdF9wcmludGVyKHZhciwgdG9fc3Ry aW5nLCB7J1RpbWVzIGxvY2tlZCByZWN1cnNpdmVseSc6ICcyJ30pCisgICAg dGVzdF9wcmludGVyKHZhciwgdG9fc3RyaW5nLCB7J1RpbWVzIGFjcXVpcmVk IGJ5IHRoZSBvd25lcic6ICcyJ30pCiAgICAgbmV4dF9jbWQoKQotICAgIHRl c3RfcHJpbnRlcih2YXIsIHRvX3N0cmluZywgeydUaW1lcyBsb2NrZWQgcmVj dXJzaXZlbHknOiAnMyd9KQorICAgIHRlc3RfcHJpbnRlcih2YXIsIHRvX3N0 cmluZywgeydUaW1lcyBhY3F1aXJlZCBieSB0aGUgb3duZXInOiAnMyd9KQog ICAgIGNvbnRpbnVlX2NtZCgpICMgRXhpdAogCiBleGNlcHQgKE5vTGluZUVy cm9yLCBwZXhwZWN0LlRJTUVPVVQpIGFzIGV4Y2VwdGlvbjoK --=-CNtQxeHK8IzjUo/lc8ra--