Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C66F89D7D for ; Mon, 30 Sep 2019 21:05:27 +0000 (UTC) From: "Robert M. Fosha" Date: Mon, 30 Sep 2019 13:58:50 -0700 Message-Id: <20190930205850.8279-1-robert.m.fosha@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] tools/intel_guc_logger: Update to use new relay mechanism List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Matthew Brost List-ID: VXBkYXRlIHRoZSBHdUMgbG9nZ2VyIHRvb2wgdG8gdXNlIG5ldyBHdUMgcmVsYXkgbG9nZ2luZyBt ZWNoYW5pc20gYW5kCmNvcnJlY3QgbG9nZ2luZyB2ZXJib3NpdHkgbGV2ZWxzLiBWZXJib3NpdHkg bGV2ZWwgaXMgd3JpdHRlbiBhbmQgc3RvcmVkCmluIGk5MTVfZ3VjX2xvZ19sZXZlbCBmaWxlIGlu c3RlYWQgb2YgdGhlIEd1QyBsb2dnaW5nIGNvbnRyb2wgZmlsZS4KT3BlbmluZyB0aGUgY29udHJv bCBmaWxlIGNyZWF0ZXMgdGhlIHJlbGF5IGxvZyBmaWxlLiBXcml0aW5nIGEgJzEnIHRvIHRoZQpj b250cm9sIGZpbGUgc3RhcnRzIGxvZ2dpbmcsIGFuZCB3cml0aW5nIGEgJzAnIHRvIHRoZSBjb250 cm9sIGZpbGUgZmx1c2hlcwp0aGUgbG9nLgoKQ2M6IE1hdHRoZXcgQnJvc3QgPG1hdHRoZXcuYnJv c3RAaW50ZWwuY29tPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xv c3B1cmlvQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogUm9iZXJ0IE0uIEZvc2hhIDxyb2JlcnQu bS5mb3NoYUBpbnRlbC5jb20+Ci0tLQogdG9vbHMvaW50ZWxfZ3VjX2xvZ2dlci5jIHwgNzYgKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ1 IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2ludGVs X2d1Y19sb2dnZXIuYyBiL3Rvb2xzL2ludGVsX2d1Y19sb2dnZXIuYwppbmRleCA1ZjFkZThkYi4u Yzc0ODI0YWUgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2ludGVsX2d1Y19sb2dnZXIuYworKysgYi90b29s cy9pbnRlbF9ndWNfbG9nZ2VyLmMKQEAgLTU2LDUzICs1Niw2MSBAQAogICovCiAjZGVmaW5lIE5V TV9TVUJCVUZTIDEwMAogCi0jZGVmaW5lIFJFTEFZX0ZJTEVfTkFNRSAgImd1Y19sb2ciCisjZGVm aW5lIFJFTEFZX0ZJTEVfTkFNRSAgImd1Y19sb2cwIgogI2RlZmluZSBERUZBVUxUX09VVFBVVF9G SUxFX05BTUUgICJndWNfbG9nX2R1bXAuZGF0IgotI2RlZmluZSBDT05UUk9MX0ZJTEVfTkFNRSAi aTkxNV9ndWNfbG9nX2NvbnRyb2wiCisjZGVmaW5lIExPR19MRVZFTF9GSUxFX05BTUUgImk5MTVf Z3VjX2xvZ19sZXZlbCIKKyNkZWZpbmUgQ09OVFJPTF9GSUxFX05BTUUgImk5MTVfZ3VjX2xvZ19y ZWxheSIKIAogY2hhciAqcmVhZF9idWZmZXI7CiBjaGFyICpvdXRfZmlsZW5hbWU7CiBpbnQgcG9s bF90aW1lb3V0ID0gMjsgLyogYnkgZGVmYXVsdCAybXMgdGltZW91dCAqLwogcHRocmVhZF9tdXRl eF90IG11dGV4OwogcHRocmVhZF90IGZsdXNoX3RocmVhZDsKLWludCB2ZXJib3NpdHlfbGV2ZWwg PSAzOyAvKiBieSBkZWZhdWx0IGNhcHR1cmUgbG9ncyBhdCBtYXggdmVyYm9zaXR5ICovCitpbnQg dmVyYm9zaXR5X2xldmVsID0gNTsgLyogYnkgZGVmYXVsdCBjYXB0dXJlIGxvZ3MgYXQgbWF4IHZl cmJvc2l0eSAqLwogdWludDMyX3QgcHJvZHVjZWQsIGNvbnN1bWVkOwogdWludDY0X3QgdG90YWxf Ynl0ZXNfd3JpdHRlbjsKIGludCBudW1fYnVmZmVycyA9IE5VTV9TVUJCVUZTOwotaW50IHJlbGF5 X2ZkLCBvdXRmaWxlX2ZkID0gLTE7CitpbnQgbG9nX2xldmVsX2ZkLCBjb250cm9sX2ZkLCByZWxh eV9mZCwgb3V0ZmlsZV9mZCA9IC0xOwogdWludDMyX3QgdGVzdF9kdXJhdGlvbiwgbWF4X2ZpbGVz aXplOwogcHRocmVhZF9jb25kX3QgdW5kZXJmbG93X2NvbmQsIG92ZXJmbG93X2NvbmQ7CiBib29s IHN0b3BfbG9nZ2luZywgZGlzY2FyZF9vbGRsb2dzLCBjYXB0dXJpbmdfc3RvcHBlZDsKIAotc3Rh dGljIHZvaWQgZ3VjX2xvZ19jb250cm9sKGJvb2wgZW5hYmxlLCB1aW50MzJfdCBsb2dfbGV2ZWwp CitzdGF0aWMgdm9pZCBzZXRfbG9nX3ZlcmJvc2l0eSh2b2lkKQogewotCWludCBjb250cm9sX2Zk OwotCWNoYXIgZGF0YVsxOV07Ci0JdWludDY0X3QgdmFsOworCWNoYXIgZGF0YVsyXTsKIAlpbnQg cmV0OwogCi0JaWd0X2Fzc2VydF9sdGUobG9nX2xldmVsLCAzKTsKKwlsb2dfbGV2ZWxfZmQgPSBp Z3RfZGVidWdmc19vcGVuKC0xLCBMT0dfTEVWRUxfRklMRV9OQU1FLCBPX1dST05MWSk7CisJaWd0 X2Fzc2VydF9mKGNvbnRyb2xfZmQgPj0gMCwKKwkJICAgICAiY291bGRuJ3Qgb3BlbiB0aGUgZ3Vj IGxvZyBsZXZlbCBmaWxlXG4iKTsKIAotCWNvbnRyb2xfZmQgPSBpZ3RfZGVidWdmc19vcGVuKC0x LCBDT05UUk9MX0ZJTEVfTkFNRSwgT19XUk9OTFkpOwotCWlndF9hc3NlcnRfZihjb250cm9sX2Zk ID49IDAsICJjb3VsZG4ndCBvcGVuIHRoZSBndWMgbG9nIGNvbnRyb2wgZmlsZVxuIik7CisJcmV0 ID0gc25wcmludGYoZGF0YSwgc2l6ZW9mKGRhdGEpLCAiJWQiLCB2ZXJib3NpdHlfbGV2ZWwpOwor CXJldCA9IHdyaXRlKGxvZ19sZXZlbF9mZCwgZGF0YSwgcmV0KTsKKwlpZ3RfYXNzZXJ0X2YocmV0 ID4gMCwKKwkJICAgICAiY291bGRuJ3Qgd3JpdGUgdG8gdGhlIGxvZyBsZXZlbCBmaWxlXG4iKTsK IAotCS8qCi0JICogaTkxNSBleHBlY3RzIEd1QyBsb2cgbGV2ZWwgdG8gYmUgc3BlY2lmaWVkIGFz OgotCSAqIDA6IGRpc2FibGVkCi0JICogMTogZW5hYmxlZCAodmVyYm9zaXR5IGxldmVsIDAgPSBt aW4pCi0JICogMjogZW5hYmxlZCAodmVyYm9zaXR5IGxldmVsIDEpCi0JICogMzogZW5hYmxlZCAo dmVyYm9zaXR5IGxldmVsIDIpCi0JICogNDogZW5hYmxlZCAodmVyYm9zaXR5IGxldmVsIDMgPSBt YXgpCi0JICovCi0JdmFsID0gZW5hYmxlID8gbG9nX2xldmVsICsgMSA6IDA7CisJY2xvc2UobG9n X2xldmVsX2ZkKTsKK30KKworc3RhdGljIHZvaWQgZ3VjX2xvZ19jb250cm9sKGJvb2wgZW5hYmxl KQoreworCWNvbnN0IGNoYXIgY29udHJvbF92YWxbXSA9ICIxIjsKKwlpbnQgcmV0OwogCi0JcmV0 ID0gc25wcmludGYoZGF0YSwgc2l6ZW9mKGRhdGEpLCAiMHglIiBQUkl4NjQsIHZhbCk7Ci0JaWd0 X2Fzc2VydChyZXQgPiAyICYmIHJldCA8IHNpemVvZihkYXRhKSk7CisJaWYgKGVuYWJsZSkgewor CQlzZXRfbG9nX3ZlcmJvc2l0eSgpOwogCi0JcmV0ID0gd3JpdGUoY29udHJvbF9mZCwgZGF0YSwg cmV0KTsKLQlpZ3RfYXNzZXJ0X2YocmV0ID4gMCwgImNvdWxkbid0IHdyaXRlIHRvIHRoZSBsb2cg Y29udHJvbCBmaWxlXG4iKTsKKwkJY29udHJvbF9mZCA9IGlndF9kZWJ1Z2ZzX29wZW4oLTEsIENP TlRST0xfRklMRV9OQU1FLCBPX1dST05MWSk7CisJCWlndF9hc3NlcnRfZihjb250cm9sX2ZkID49 IDAsCisJCQkgICAgICJjb3VsZG4ndCBvcGVuIHRoZSBndWMgbG9nIGNvbnRyb2wgZmlsZVxuIik7 CiAKLQljbG9zZShjb250cm9sX2ZkKTsKKwkJLyogV3JpdGUgJzEnIHRvIGNvbnRyb2wgZmlsZSB0 byBzdGFydCBsb2dnaW5nLiAqLworCQlyZXQgPSB3cml0ZShjb250cm9sX2ZkLCBjb250cm9sX3Zh bCwgMSk7CisJCWlndF9hc3NlcnRfZihyZXQgPiAwLAorCQkJICAgICAiY291bGRuJ3Qgd3JpdGUg dG8gdGhlIGxvZyBjb250cm9sIGZpbGVcbiIpOworCX0gZWxzZSB7CisJCWNsb3NlKGNvbnRyb2xf ZmQpOworCX0KIH0KIAogc3RhdGljIHZvaWQgaW50X3NpZ19oYW5kbGVyKGludCBzaWcpCkBAIC0x MTUsOCArMTIzLDEzIEBAIHN0YXRpYyB2b2lkIGludF9zaWdfaGFuZGxlcihpbnQgc2lnKQogc3Rh dGljIHZvaWQgcHVsbF9sZWZ0b3Zlcl9kYXRhKHZvaWQpCiB7CiAJdW5zaWduZWQgaW50IGJ5dGVz X3JlYWQgPSAwOworCWNvbnN0IGNoYXIgY29udHJvbF92YWxbXSA9ICIwIjsKIAlpbnQgcmV0Owog CisJLyogV3JpdGUgJzAnIHRvIGNvbnRyb2wgZmlsZSB0byBmbHVzaCByZWxheSBsb2cuICovCisJ cmV0ID0gd3JpdGUoY29udHJvbF9mZCwgY29udHJvbF92YWwsIDEpOworCWlndF9hc3NlcnRfZihy ZXQgPj0gMCwgImNvdWxkbid0IHdyaXRlIHRvIHRoZSBsb2cgY29udHJvbCBmaWxlXG4iKTsKKwog CWRvIHsKIAkJLyogUmVhZCB0aGUgbG9ncyBmcm9tIHJlbGF5IGJ1ZmZlciAqLwogCQlyZXQgPSBy ZWFkKHJlbGF5X2ZkLCByZWFkX2J1ZmZlciwgU1VCQlVGX1NJWkUpOwpAQCAtMzIxLDcgKzMzNCw3 IEBAIHN0YXRpYyB2b2lkIGluaXRfbWFpbl90aHJlYWQodm9pZCkKIAkvKiBFbmFibGUgdGhlIGxv Z2dpbmcsIGl0IG1heSBub3QgaGF2ZSBiZWVuIGVuYWJsZWQgZnJvbSBib290IGFuZCBzbwogCSAq IHRoZSByZWxheSBmaWxlIGFsc28gd291bGRuJ3QgaGF2ZSBiZWVuIGNyZWF0ZWQuCiAJICovCi0J Z3VjX2xvZ19jb250cm9sKHRydWUsIHZlcmJvc2l0eV9sZXZlbCk7CisJZ3VjX2xvZ19jb250cm9s KHRydWUpOwogCiAJb3Blbl9yZWxheV9maWxlKCk7CiAJb3Blbl9vdXRwdXRfZmlsZSgpOwpAQCAt MzM0LDcgKzM0Nyw3IEBAIHN0YXRpYyBpbnQgcGFyc2Vfb3B0aW9ucyhpbnQgb3B0LCBpbnQgb3B0 X2luZGV4LCB2b2lkICpkYXRhKQogCXN3aXRjaChvcHQpIHsKIAljYXNlICd2JzoKIAkJdmVyYm9z aXR5X2xldmVsID0gYXRvaShvcHRhcmcpOwotCQlpZ3RfYXNzZXJ0X2YodmVyYm9zaXR5X2xldmVs ID49IDAgJiYgdmVyYm9zaXR5X2xldmVsIDw9IDMsICJpbnZhbGlkIGlucHV0IGZvciAtdiBvcHRp b25cbiIpOworCQlpZ3RfYXNzZXJ0X2YodmVyYm9zaXR5X2xldmVsID49IDEgJiYgdmVyYm9zaXR5 X2xldmVsIDw9IDUsICJpbnZhbGlkIGlucHV0IGZvciAtdiBvcHRpb25cbiIpOwogCQlpZ3RfZGVi dWcoInZlcmJvc2l0eSBsZXZlbCB0byBiZSB1c2VkIGlzICVkXG4iLCB2ZXJib3NpdHlfbGV2ZWwp OwogCQlicmVhazsKIAljYXNlICdvJzoKQEAgLTM4Niw3ICszOTksNyBAQCBzdGF0aWMgdm9pZCBw cm9jZXNzX2NvbW1hbmRfbGluZShpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJfTsKIAogCWNvbnN0 IGNoYXIgKmhlbHAgPQotCQkiICAtdiAtLXZlcmJvc2l0eT1sZXZlbCAgIHZlcmJvc2l0eSBsZXZl bCBvZiBHdUMgbG9nZ2luZyAoMC0zKVxuIgorCQkiICAtdiAtLXZlcmJvc2l0eT1sZXZlbCAgIHZl cmJvc2l0eSBsZXZlbCBvZiBHdUMgbG9nZ2luZyAoMS01KVxuIgogCQkiICAtbyAtLW91dHB1dGZp bGU9bmFtZSAgIG5hbWUgb2YgdGhlIG91dHB1dCBmaWxlLCBpbmNsdWRpbmcgdGhlIGxvY2F0aW9u LCB3aGVyZSBsb2dzIHdpbGwgYmUgc3RvcmVkXG4iCiAJCSIgIC1iIC0tYnVmZmVycz1udW0gICAg ICAgbnVtYmVyIG9mIGJ1ZmZlcnMgdG8gYmUgbWFpbnRhaW5lZCBvbiBsb2dnZXIgc2lkZSBmb3Ig c3RvcmluZyBsb2dzXG4iCiAJCSIgIC10IC0tdGVzdGR1cmF0aW9uPXNlYyAgbWF4IGR1cmF0aW9u IGluIHNlY29uZHMgZm9yIHdoaWNoIHRoZSBsb2dnZXIgc2hvdWxkIHJ1blxuIgpAQCAtNDUyLDkg KzQ2NSw2IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIAkJcHVsbF9kYXRhKCk7 CiAJfSB3aGlsZSAoIXN0b3BfbG9nZ2luZyk7CiAKLQkvKiBQYXVzZSBsb2dnaW5nIG9uIHRoZSBH dUMgc2lkZSAqLwotCWd1Y19sb2dfY29udHJvbChmYWxzZSwgMCk7Ci0KIAkvKiBTaWduYWwgZmx1 c2hlciB0aHJlYWQgdG8gbWFrZSBhbiBleGl0ICovCiAJY2FwdHVyaW5nX3N0b3BwZWQgPSAxOwog CXB0aHJlYWRfY29uZF9zaWduYWwoJnVuZGVyZmxvd19jb25kKTsKQEAgLTQ2Myw4ICs0NzMsMTIg QEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCXB1bGxfbGVmdG92ZXJfZGF0YSgp OwogCWlndF9pbmZvKCJ0b3RhbCBieXRlcyB3cml0dGVuICUiIFBSSXU2NCAiXG4iLCB0b3RhbF9i eXRlc193cml0dGVuKTsKIAorCS8qIFN0b3AgbG9nZ2luZyBvbiB0aGUgR3VDIHNpZGUgKi8KKwln dWNfbG9nX2NvbnRyb2woZmFsc2UpOworCiAJZnJlZShyZWFkX2J1ZmZlcik7CiAJY2xvc2UocmVs YXlfZmQpOwogCWNsb3NlKG91dGZpbGVfZmQpOworCiAJaWd0X2V4aXQoKTsKIH0KLS0gCjIuMjEu MC41LmdhZWI1ODJhOTgzCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXY=