From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH i-g-t 2/4] trace.pl: Fix request split mode Date: Thu, 19 Jul 2018 10:35:59 +0100 Message-ID: <20180719093601.11788-3-tvrtko.ursulin@linux.intel.com> References: <20180719093601.11788-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB1596ED69 for ; Thu, 19 Jul 2018 09:36:10 +0000 (UTC) Received: by mail-wr1-x433.google.com with SMTP id h10-v6so7356703wre.6 for ; Thu, 19 Jul 2018 02:36:10 -0700 (PDT) In-Reply-To: <20180719093601.11788-1-tvrtko.ursulin@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: igt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlcXVlc3Qg c3BsaXQgbW9kZSBoYWQgc2V2ZXJhbCBidWdzLCBib3RoIGluIHRoZSBvcmlnaW5hbCB2ZXJzaW9u IGFuZCBhbHNvCmFmdGVyIHRoZSByZWNlbnQgcmVmYWN0b3JpbmdzLgoKT25lIGJpZyBvbmUgd2Fz IHRoYXQgaXQgd2Fzbid0IGNvbnNpZGVyaW5nIGRpZmZlcmVudCBzdWJtaXQgcG9ydHMgYXMgYQpy ZWFzb24gdG8gc3BsaXQgZXhlY3V0aW9uLCBhbmQgYWxzbyB0aGF0IGl0IHdhcyB0b28gdGltZSBi YXNlZCBpbnN0ZWFkIG9mCmxvb2tpbmcgYXQgcmVsZXZhbnQgdGltZWxpbmVzLgoKSW4gdGhpcyBy ZWZhY3RvcmluZyB3ZSBhZGRyZXNzIHRoZSBmb3JtZXIgYnkgdXNpbmcgdGhlIGVuZ2luZSB0aW1l bGluZXMKaW50cm9kdWNlZCBpbiB0aGUgcHJldmlvdXMgcGF0Y2guIFNlY29uZGFyeSBwb3J0IHN1 Ym1pc3Npb25zIGFyZSBtb3ZlZAp0byBmb2xsb3cgdGhlIHByZWNlZGluZyBzdWJtaXNzaW9uIGFz IGEgZmlyc3Qgc3RlcCBpbiB0aGUgY29ycmVjdGlvbgpwcm9jZXNzLgoKSW4gdGhlIHNlY29uZCBz dGVwLCB3ZSBhZGQgY29udGV4dCB0aW1lbGluZXMgYW5kIHVzZSB0aGVuIGluIGEgc2ltaWxhcgpm YXNoaW9uIHRvIHNlcGFyYXRlIHN0YXJ0IGFuZCBlbmQgdGltZSBvZiBjb2FsZXNjZWQgcmVxdWVz dHMuIEZvciBlYWNoCmNvYWxlc2NlZCByZXF1ZXN0IHdlIGtub3cgaXRzIGJvdW5kYXJpZXMgYnkg bG9va2luZyBhdCB0aGUgZW5naW5lCnRpbWVsaW5lICh2aWEgZ2xvYmFsIHNlcW5vcyksIGFuZCB3 ZSBrbm93IHRoZSBwcmV2aW91cyByZXF1ZXN0IGl0IHNob3VsZApvbmx5IHN0YXJ0IGFmdGVyLCBi eSBsb29raW5nIGF0IHRoZSBjb250ZXh0IHRpbWVsaW5lLgoKdjI6CiAqIFJlbW92ZSBzb21lIGRl YWQgY29kZS4KICogRml4ICFwb3J0MCBzaGlmdGluZyBsb2dpYy4KCnYzOgogKiBSZWZhY3RvciBm b3IgbGVzcyBsaXN0IHdhbGtpbmcgYXMgd2l0aCBpbmNvbXBsZXRlIGhhbmRsaW5nLgoKdjQ6CiAq IERhdGFiYXNlIG9mIGNvbnRleHQgdGltZWxpbmVzIHNob3VsZCBub3QgY29udGFpbiBkdXBsaWNh dGVzIQogICAoQ29udmVydGVkIGZyb20gYXJyYXkgaW50byBhIGhhc2guKQoKdjU6CiAqIEF2b2lk IG92ZXItYWNjb3VudGluZyBydW5uYWJsZSB0aW1lIGZvciBhIGNvYWxlc2NlZCBncm91cCBieSBy ZWNvcmRpbmcKICAgdGhlIHRpbWUgZmlyc3QgcmVxdWVzdCBlbnRlcmVkIHRoZSBHUFUgYW5kIGVu ZGluZyB0aGUgZXhlY3V0ZSBkZWxheSBhdAogICB0aGF0IHBvaW50IGZvciB0aGUgd2hvbGUgZ3Jv dXAuCgp2NjoKICogVXBkYXRlIGZvciBlbmdpbmUgY2xhc3M6aW5zdGFuY2UuCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogSm9obiBI YXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQGludGVsLmNvbT4KLS0tCiBzY3JpcHRzL3RyYWNlLnBs IHwgMTM4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMTA4IGluc2VydGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3NjcmlwdHMvdHJhY2UucGwgYi9zY3JpcHRzL3RyYWNlLnBsCmluZGV4IDQxYmVkZWVm Yjc3Ni4uNTlmNmQzMmRjM2M4IDEwMDc1NQotLS0gYS9zY3JpcHRzL3RyYWNlLnBsCisrKyBiL3Nj cmlwdHMvdHJhY2UucGwKQEAgLTI3LDcgKzI3LDcgQEAgdXNlIHdhcm5pbmdzOwogdXNlIDUuMDEw OwogCiBteSAkZ2lkID0gMDsKLW15ICglZGIsICVxdWV1ZSwgJXN1Ym1pdCwgJW5vdGlmeSwgJXJp bmdzLCAlY3R4ZGIsICVyaW5nbWFwLCAlcmVxd2FpdCk7CitteSAoJWRiLCAlcXVldWUsICVzdWJt aXQsICVub3RpZnksICVyaW5ncywgJWN0eGRiLCAlcmluZ21hcCwgJXJlcXdhaXQsICVjdHh0aW1l bGluZXMpOwogbXkgQGZyZXFzOwogCiBteSAkbWF4X2l0ZW1zID0gMzAwMDsKQEAgLTQxOCw2ICs0 MTgsNyBAQCB3aGlsZSAoPD4pIHsKIAkJJHJlcXsncmluZyd9ID0gJHJpbmc7CiAJCSRyZXF7J3Nl cW5vJ30gPSAkc2Vxbm87CiAJCSRyZXF7J2N0eCd9ID0gJGN0eDsKKwkJJGN0eHRpbWVsaW5lc3sk Y3R4IC4gJy8nIC4gJHJpbmd9ID0gMTsKIAkJJHJlcXsnbmFtZSd9ID0gJGN0eCAuICcvJyAuICRz ZXFubzsKIAkJJHJlcXsnZ2xvYmFsJ30gPSAkdHB7J2dsb2JhbCd9OwogCQkkcmVxeydwb3J0J30g PSAkdHB7J3BvcnQnfTsKQEAgLTU3Myw0MSArNTc0LDExMyBAQCBzdWIgc29ydFN0YXJ0IHsKIAly ZXR1cm4gJHZhbDsKIH0KIAotbXkgQHNvcnRlZF9rZXlzID0gc29ydCBzb3J0U3RhcnQga2V5cyAl ZGI7Ci1teSAkcmVfc29ydCA9IDA7CitteSAkcmVfc29ydCA9IDE7CitteSBAc29ydGVkX2tleXM7 CiAKLWRpZSAiRGF0YWJhc2UgY2hhbmdlZCBzaXplPyEiIHVubGVzcyBzY2FsYXIoQHNvcnRlZF9r ZXlzKSA9PSAka2V5X2NvdW50Oworc3ViIG1heWJlX3NvcnRfa2V5cworeworCWlmICgkcmVfc29y dCkgeworCQlAc29ydGVkX2tleXMgPSBzb3J0IHNvcnRTdGFydCBrZXlzICVkYjsKKwkJJHJlX3Nv cnQgPSAwOworCQlkaWUgIkRhdGFiYXNlIGNoYW5nZWQgc2l6ZT8hIiB1bmxlc3Mgc2NhbGFyKEBz b3J0ZWRfa2V5cykgPT0KKwkJCQkJCSAgICAgJGtleV9jb3VudDsKKwl9Cit9CiAKLWZvcmVhY2gg bXkgJGtleSAoQHNvcnRlZF9rZXlzKSB7Ci0JbXkgJHJpbmcgPSAkZGJ7JGtleX0tPnsncmluZyd9 OwotCW15ICRlbmQgPSAkZGJ7JGtleX0tPnsnZW5kJ307CittYXliZV9zb3J0X2tleXMoKTsKKwor bXkgJWN0eF90aW1lbGluZXM7CisKK3N1YiBzb3J0Q29udGV4dCB7CisJbXkgJGFzID0gJGRieyRh fS0+eydzZXFubyd9OworCW15ICRicyA9ICRkYnskYn0tPnsnc2Vxbm8nfTsKKwlteSAkdmFsOwor CisJJHZhbCA9ICRhcyA8PT4gJGJzOworCisJZGllIGlmICR2YWwgPT0gMDsKKworCXJldHVybiAk dmFsOworfQorCitzdWIgZ2V0X2N0eF90aW1lbGluZSB7CisJbXkgKCRjdHgsICRyaW5nLCAka2V5 KSA9IEBfOworCW15IEB0aW1lbGluZTsKKworCXJldHVybiAkY3R4X3RpbWVsaW5lc3ska2V5fSBp ZiBleGlzdHMgJGN0eF90aW1lbGluZXN7JGtleX07CisKKwlAdGltZWxpbmUgPSBncmVwIHsgJGRi eyRffS0+eydyaW5nJ30gZXEgJHJpbmcgYW5kCisJCQkgICAkZGJ7JF99LT57J2N0eCd9ID09ICRj dHggfSBAc29ydGVkX2tleXM7CisJIyBGSVhNRSBzZXFubyByZXN0YXJ0CisJQHRpbWVsaW5lID0g c29ydCBzb3J0Q29udGV4dCBAdGltZWxpbmU7CisKKwkkY3R4X3RpbWVsaW5lc3ska2V5fSA9IFxA dGltZWxpbmU7CisKKwlyZXR1cm4gXEB0aW1lbGluZTsKK30KKworIyBTcGxpdCBvdXQgbWVyZ2Vk IGJhdGNoZXMgaWYgcmVxdWVzdGVkLgoraWYgKCRjb3JyZWN0X2R1cmF0aW9ucykgeworCSMgU2hp ZnQgIXBvcnQwIHJlcXVlc3RzIHN0YXJ0IHRpbWUgdG8gYWZ0ZXIgdGhlIHByZXZpb3VzIGNvbnRl eHQgb24gdGhlCisJIyBzYW1lIHRpbWVsaW5lIGhhcyBmaW5pc2hlZC4KKwlmb3JlYWNoIG15ICRn aWQgKHNvcnQga2V5cyAlcmluZ3MpIHsKKwkJbXkgJHJpbmcgPSAkcmluZ21hcHskcmluZ3N7JGdp ZH19OworCQlteSAkdGltZWxpbmUgPSBnZXRfZW5naW5lX3RpbWVsaW5lKCRyaW5nKTsKKwkJbXkg JGNvbXBsZXRlOworCisJCWZvcmVhY2ggbXkgJHBvcyAoMC4uJCN7JHRpbWVsaW5lfSkgeworCQkJ bXkgJGtleSA9IEB7JHRpbWVsaW5lfVskcG9zXTsKKwkJCW15ICRwcmV2ID0gJGNvbXBsZXRlOwor CQkJbXkgJHBrZXk7CisKKwkJCSRjb21wbGV0ZSA9ICRrZXkgdW5sZXNzIGV4aXN0cyAkZGJ7JGtl eX0tPnsnbm8tZW5kJ307CisJCQkkcGtleSA9ICRjb21wbGV0ZTsKKworCQkJbmV4dCBpZiAkZGJ7 JGtleX0tPnsncG9ydCd9ID09IDA7CisKKwkJCSRwa2V5ID0gJHByZXYgaWYgJGNvbXBsZXRlIGVx ICRrZXk7CisKKwkJCWRpZSB1bmxlc3MgZGVmaW5lZCAkcGtleTsKKworCQkJJGRieyRrZXl9LT57 J3N0YXJ0J30gPSAkZGJ7JHBrZXl9LT57J2VuZCd9OworCQkJJGRieyRrZXl9LT57J3N0YXJ0J30g PSAkZGJ7JHBrZXl9LT57J25vdGlmeSd9IGlmICRkYnska2V5fS0+eydzdGFydCd9ID4gJGRieyRr ZXl9LT57J2VuZCd9OworCisJCQlkaWUgaWYgJGRieyRrZXl9LT57J3N0YXJ0J30gPiAkZGJ7JGtl eX0tPnsnZW5kJ307CiAKLQkjIGNvcnJlY3QgZHVyYXRpb24gb2YgbWVyZ2VkIGJhdGNoZXMKLQlp ZiAoJGNvcnJlY3RfZHVyYXRpb25zIGFuZCBleGlzdHMgJGRieyRrZXl9LT57J25vLWVuZCd9KSB7 Ci0JCW15ICRjdHggPSAkZGJ7JGtleX0tPnsnY3R4J307Ci0JCW15ICRzZXFubyA9ICRkYnska2V5 fS0+eydzZXFubyd9OwotCQlteSAkc3RhcnQgPSAkZGJ7JGtleX0tPnsnc3RhcnQnfTsKLQkJbXkg JG5leHRfa2V5OwotCQlteSAkaSA9IDE7Ci0KLQkJZG8gewotCQkJJG5leHRfa2V5ID0gZGJfa2V5 KCRyaW5nLCAkY3R4LCAkc2Vxbm8gKyAkaSk7Ci0JCQkkaSsrOwotCQl9IHVudGlsIChleGlzdHMg JGRieyRuZXh0X2tleX0gb3IgJGkgPiAka2V5X2NvdW50KTsgICMgdWdseSBzdG9wIGhhY2sKLQot CQkjIDIwdXMgdG9sZXJhbmNlCi0JCWlmIChleGlzdHMgJGRieyRuZXh0X2tleX0gYW5kICRkYnsk bmV4dF9rZXl9LT57J3N0YXJ0J30gPCAkc3RhcnQgKyAyMCkgewotCQkJbXkgJG5vdGlmeSA9ICRk Ynska2V5fS0+eydub3RpZnknfTsKIAkJCSRyZV9zb3J0ID0gMTsKLQkJCSRkYnskbmV4dF9rZXl9 LT57J3N0YXJ0J30gPSAkbm90aWZ5OwotCQkJJGRieyRuZXh0X2tleX0tPnsnc3RhcnQnfSA9ICRk YnskbmV4dF9rZXl9LT57J2VuZCd9IGlmICRkYnskbmV4dF9rZXl9LT57J3N0YXJ0J30gPiAkZGJ7 JG5leHRfa2V5fS0+eydlbmQnfTsKLQkJCWRpZSBpZiAkZGJ7JG5leHRfa2V5fS0+eydzdGFydCd9 ID4gJGRieyRuZXh0X2tleX0tPnsnZW5kJ307CiAJCX0KLQkJZGllIGlmICRzdGFydCA+ICRlbmQ7 CisJfQorCisJbWF5YmVfc29ydF9rZXlzKCk7CisKKwkjIEJhdGNoIHdpdGggbm8tZW5kIChubyBy ZXF1ZXN0X291dCkgbWVhbnMgaXQgd2FzIHN1Ym1pdHRlZCBhcyBwYXJ0IG9mCisJIyBjb2FsZXNj ZWQgY29udGV4dC4gVGhpcyBtZWFucyBpdCdzIHN0YXJ0IHRpbWUgc2hvdWxkIGJlIHNldCB0byB0 aGUgZW5kCisJIyB0aW1lIG9mIGEgZm9sbG93aW5nIHJlcXVlc3Qgb24gdGhpcyBjb250ZXh0IHRp bWVsaW5lLgorCWZvcmVhY2ggbXkgJHRrZXkgKHNvcnQga2V5cyAlY3R4dGltZWxpbmVzKSB7CisJ CW15ICgkY3R4LCAkcmluZykgPSBzcGxpdCAnLycsICR0a2V5OworCQlteSAkdGltZWxpbmUgPSBn ZXRfY3R4X3RpbWVsaW5lKCRjdHgsICRyaW5nLCAkdGtleSk7CisJCW15ICRsYXN0X2NvbXBsZXRl ID0gLTE7CisJCW15ICRjb21wbGV0ZTsKKworCQlmb3JlYWNoIG15ICRwb3MgKDAuLiQjeyR0aW1l bGluZX0pIHsKKwkJCW15ICRrZXkgPSBAeyR0aW1lbGluZX1bJHBvc107CisJCQlteSAkbmV4dF9r ZXk7CisKKwkJCW5leHQgdW5sZXNzIGV4aXN0cyAkZGJ7JGtleX0tPnsnbm8tZW5kJ307CisJCQls YXN0IGlmICRwb3MgPT0gJCN7JHRpbWVsaW5lfTsKKworCQkJIyBTaGlmdCBmb2xsb3dpbmcgcmVx dWVzdCB0byBzdGFydCBhZnRlciB0aGUgY3VycmVudCBvbmUKKwkJCSRuZXh0X2tleSA9ICR7JHRp bWVsaW5lfVskcG9zICsgMV07CisJCQlpZiAoZXhpc3RzICRkYnska2V5fS0+eydub3RpZnknfSkg eworCQkJCSRkYnskbmV4dF9rZXl9LT57J2VuZ2luZS1zdGFydCd9ID0gJGRieyRuZXh0X2tleX0t Pnsnc3RhcnQnfTsKKwkJCQkkZGJ7JG5leHRfa2V5fS0+eydzdGFydCd9ID0gJGRieyRrZXl9LT57 J25vdGlmeSd9OworCQkJCSRyZV9zb3J0ID0gMTsKKwkJCX0KKwkJfQogCX0KIH0KIAotQHNvcnRl ZF9rZXlzID0gc29ydCBzb3J0U3RhcnQga2V5cyAlZGIgaWYgJHJlX3NvcnQ7CittYXliZV9zb3J0 X2tleXMoKTsKIAogIyBHUFUgdGltZSBhY2NvdW50aW5nCiBteSAoJXJ1bm5pbmcsICVydW5uYWJs ZSwgJXF1ZXVlZCwgJWJhdGNoX2F2ZywgJWJhdGNoX3RvdGFsX2F2ZywgJWJhdGNoX2NvdW50KTsK QEAgLTYyMSw2ICs2OTQsNyBAQCBmb3JlYWNoIG15ICRrZXkgKEBzb3J0ZWRfa2V5cykgewogCW15 ICRyaW5nID0gJGRieyRrZXl9LT57J3JpbmcnfTsKIAlteSAkZW5kID0gJGRieyRrZXl9LT57J2Vu ZCd9OwogCW15ICRzdGFydCA9ICRkYnska2V5fS0+eydzdGFydCd9OworCW15ICRlbmdpbmVfc3Rh cnQgPSAkZGJ7JGtleX0tPnsnZW5naW5lX3N0YXJ0J307CiAJbXkgJG5vdGlmeSA9ICRkYnska2V5 fS0+eydub3RpZnknfTsKIAogCSRmaXJzdF90cyA9ICRkYnska2V5fS0+eydxdWV1ZSd9IGlmIG5v dCBkZWZpbmVkICRmaXJzdF90cyBvciAkZGJ7JGtleX0tPnsncXVldWUnfSA8ICRmaXJzdF90czsK QEAgLTYzMyw3ICs3MDcsOSBAQCBmb3JlYWNoIG15ICRrZXkgKEBzb3J0ZWRfa2V5cykgewogCX0g ZWxzZSB7CiAJCSRkYnska2V5fS0+eydjb250ZXh0LWNvbXBsZXRlLWRlbGF5J30gPSAwOwogCX0K LQkkZGJ7JGtleX0tPnsnZXhlY3V0ZS1kZWxheSd9ID0gJHN0YXJ0IC0gJGRieyRrZXl9LT57J3N1 Ym1pdCd9OworCisJJGVuZ2luZV9zdGFydCA9ICRkYnska2V5fS0+eydzdGFydCd9IHVubGVzcyBk ZWZpbmVkICRlbmdpbmVfc3RhcnQ7CisJJGRieyRrZXl9LT57J2V4ZWN1dGUtZGVsYXknfSA9ICRl bmdpbmVfc3RhcnQgLSAkZGJ7JGtleX0tPnsnc3VibWl0J307CiAJJGRieyRrZXl9LT57J3N1Ym1p dC1kZWxheSd9ID0gJGRieyRrZXl9LT57J3N1Ym1pdCd9IC0gJGRieyRrZXl9LT57J3F1ZXVlJ307 CiAJdW5sZXNzIChleGlzdHMgJGRieyRrZXl9LT57J25vLW5vdGlmeSd9KSB7CiAJCSRkYnska2V5 fS0+eydkdXJhdGlvbid9ID0gJG5vdGlmeSAtICRzdGFydDsKQEAgLTEwNTksNiArMTEzNSw3IEBA IG15ICRpID0gMDsKIGZvcmVhY2ggbXkgJGtleSAoc29ydCBzb3J0UXVldWUga2V5cyAlZGIpIHsK IAlteSAoJG5hbWUsICRjdHgsICRzZXFubykgPSAoJGRieyRrZXl9LT57J25hbWUnfSwgJGRieyRr ZXl9LT57J2N0eCd9LCAkZGJ7JGtleX0tPnsnc2Vxbm8nfSk7CiAJbXkgKCRxdWV1ZSwgJHN0YXJ0 LCAkbm90aWZ5LCAkZW5kKSA9ICgkZGJ7JGtleX0tPnsncXVldWUnfSwgJGRieyRrZXl9LT57J3N0 YXJ0J30sICRkYnska2V5fS0+eydub3RpZnknfSwgJGRieyRrZXl9LT57J2VuZCd9KTsKKwlteSAk ZW5naW5lX3N0YXJ0ID0gJGRieyRrZXl9LT57J2VuZ2luZS1zdGFydCd9OwogCW15ICRzdWJtaXQg PSAkcXVldWUgKyAkZGJ7JGtleX0tPnsnc3VibWl0LWRlbGF5J307CiAJbXkgKCRjb250ZW50LCAk c3R5bGUpOwogCW15ICRncm91cCA9ICRlbmdpbmVfc3RhcnRfaWQgKyAkcmluZ3N7JGRieyRrZXl9 LT57J3JpbmcnfX07CkBAIC0xMDc4LDExICsxMTU1LDEyIEBAIGZvcmVhY2ggbXkgJGtleSAoc29y dCBzb3J0UXVldWUga2V5cyAlZGIpIHsKIAl9CiAKIAkjIGV4ZWN1dGUgdG8gc3RhcnQKKwkkZW5n aW5lX3N0YXJ0ID0gJGRieyRrZXl9LT57J3N0YXJ0J30gdW5sZXNzIGRlZmluZWQgJGVuZ2luZV9z dGFydDsKIAl1bmxlc3MgKGV4aXN0cyAkc2tpcF9ib3h7J3JlYWR5J30pIHsKIAkJJHNrZXkgPSAy ICogJG1heF9zZXFubyAqICRjdHggKyAyICogJHNlcW5vICsgMTsKIAkJJHN0eWxlID0gYm94X3N0 eWxlKCRjdHgsICdyZWFkeScpOwogCQkkY29udGVudCA9ICI8c21hbGw+JG5hbWU8YnI+JGRieyRr ZXl9LT57J2V4ZWN1dGUtZGVsYXknfXVzPC9zbWFsbD4iOwotCQkkc3RhcnRlbmQgPSAnc3RhcnQ6 ICcgLiAkc3VibWl0IC4gJywgZW5kOiAnIC4gJHN0YXJ0OworCQkkc3RhcnRlbmQgPSAnc3RhcnQ6 ICcgLiAkc3VibWl0IC4gJywgZW5kOiAnIC4gJGVuZ2luZV9zdGFydDsKIAkJcHJpbnQgIlx0e2lk OiAkaSwga2V5OiAkc2tleSwgJHR5cGUgZ3JvdXA6ICRncm91cCwgc3ViZ3JvdXA6ICRzdWJncm91 cCwgc3ViZ3JvdXBPcmRlcjogJHN1Ymdyb3VwLCBjb250ZW50OiAnJGNvbnRlbnQnLCAkc3RhcnRl bmQsIHN0eWxlOiBcJyRzdHlsZVwnfSxcbiI7CiAJCSRpKys7CiAJfQotLSAKMi4xNy4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by gabe.freedesktop.org (Postfix) with ESMTPS id C6A9C6ED6A for ; Thu, 19 Jul 2018 09:36:10 +0000 (UTC) Received: by mail-wr1-x433.google.com with SMTP id r16-v6so7348143wrt.11 for ; Thu, 19 Jul 2018 02:36:10 -0700 (PDT) From: Tvrtko Ursulin Date: Thu, 19 Jul 2018 10:35:59 +0100 Message-Id: <20180719093601.11788-3-tvrtko.ursulin@linux.intel.com> In-Reply-To: <20180719093601.11788-1-tvrtko.ursulin@linux.intel.com> References: <20180719093601.11788-1-tvrtko.ursulin@linux.intel.com> Subject: [igt-dev] [PATCH i-g-t 2/4] trace.pl: Fix request split mode List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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: intel-gfx@lists.freedesktop.org, Tvrtko Ursulin List-ID: RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlcXVlc3Qg c3BsaXQgbW9kZSBoYWQgc2V2ZXJhbCBidWdzLCBib3RoIGluIHRoZSBvcmlnaW5hbCB2ZXJzaW9u IGFuZCBhbHNvCmFmdGVyIHRoZSByZWNlbnQgcmVmYWN0b3JpbmdzLgoKT25lIGJpZyBvbmUgd2Fz IHRoYXQgaXQgd2Fzbid0IGNvbnNpZGVyaW5nIGRpZmZlcmVudCBzdWJtaXQgcG9ydHMgYXMgYQpy ZWFzb24gdG8gc3BsaXQgZXhlY3V0aW9uLCBhbmQgYWxzbyB0aGF0IGl0IHdhcyB0b28gdGltZSBi YXNlZCBpbnN0ZWFkIG9mCmxvb2tpbmcgYXQgcmVsZXZhbnQgdGltZWxpbmVzLgoKSW4gdGhpcyBy ZWZhY3RvcmluZyB3ZSBhZGRyZXNzIHRoZSBmb3JtZXIgYnkgdXNpbmcgdGhlIGVuZ2luZSB0aW1l bGluZXMKaW50cm9kdWNlZCBpbiB0aGUgcHJldmlvdXMgcGF0Y2guIFNlY29uZGFyeSBwb3J0IHN1 Ym1pc3Npb25zIGFyZSBtb3ZlZAp0byBmb2xsb3cgdGhlIHByZWNlZGluZyBzdWJtaXNzaW9uIGFz IGEgZmlyc3Qgc3RlcCBpbiB0aGUgY29ycmVjdGlvbgpwcm9jZXNzLgoKSW4gdGhlIHNlY29uZCBz dGVwLCB3ZSBhZGQgY29udGV4dCB0aW1lbGluZXMgYW5kIHVzZSB0aGVuIGluIGEgc2ltaWxhcgpm YXNoaW9uIHRvIHNlcGFyYXRlIHN0YXJ0IGFuZCBlbmQgdGltZSBvZiBjb2FsZXNjZWQgcmVxdWVz dHMuIEZvciBlYWNoCmNvYWxlc2NlZCByZXF1ZXN0IHdlIGtub3cgaXRzIGJvdW5kYXJpZXMgYnkg bG9va2luZyBhdCB0aGUgZW5naW5lCnRpbWVsaW5lICh2aWEgZ2xvYmFsIHNlcW5vcyksIGFuZCB3 ZSBrbm93IHRoZSBwcmV2aW91cyByZXF1ZXN0IGl0IHNob3VsZApvbmx5IHN0YXJ0IGFmdGVyLCBi eSBsb29raW5nIGF0IHRoZSBjb250ZXh0IHRpbWVsaW5lLgoKdjI6CiAqIFJlbW92ZSBzb21lIGRl YWQgY29kZS4KICogRml4ICFwb3J0MCBzaGlmdGluZyBsb2dpYy4KCnYzOgogKiBSZWZhY3RvciBm b3IgbGVzcyBsaXN0IHdhbGtpbmcgYXMgd2l0aCBpbmNvbXBsZXRlIGhhbmRsaW5nLgoKdjQ6CiAq IERhdGFiYXNlIG9mIGNvbnRleHQgdGltZWxpbmVzIHNob3VsZCBub3QgY29udGFpbiBkdXBsaWNh dGVzIQogICAoQ29udmVydGVkIGZyb20gYXJyYXkgaW50byBhIGhhc2guKQoKdjU6CiAqIEF2b2lk IG92ZXItYWNjb3VudGluZyBydW5uYWJsZSB0aW1lIGZvciBhIGNvYWxlc2NlZCBncm91cCBieSBy ZWNvcmRpbmcKICAgdGhlIHRpbWUgZmlyc3QgcmVxdWVzdCBlbnRlcmVkIHRoZSBHUFUgYW5kIGVu ZGluZyB0aGUgZXhlY3V0ZSBkZWxheSBhdAogICB0aGF0IHBvaW50IGZvciB0aGUgd2hvbGUgZ3Jv dXAuCgp2NjoKICogVXBkYXRlIGZvciBlbmdpbmUgY2xhc3M6aW5zdGFuY2UuCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogSm9obiBI YXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQGludGVsLmNvbT4KLS0tCiBzY3JpcHRzL3RyYWNlLnBs IHwgMTM4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMTA4IGluc2VydGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3NjcmlwdHMvdHJhY2UucGwgYi9zY3JpcHRzL3RyYWNlLnBsCmluZGV4IDQxYmVkZWVm Yjc3Ni4uNTlmNmQzMmRjM2M4IDEwMDc1NQotLS0gYS9zY3JpcHRzL3RyYWNlLnBsCisrKyBiL3Nj cmlwdHMvdHJhY2UucGwKQEAgLTI3LDcgKzI3LDcgQEAgdXNlIHdhcm5pbmdzOwogdXNlIDUuMDEw OwogCiBteSAkZ2lkID0gMDsKLW15ICglZGIsICVxdWV1ZSwgJXN1Ym1pdCwgJW5vdGlmeSwgJXJp bmdzLCAlY3R4ZGIsICVyaW5nbWFwLCAlcmVxd2FpdCk7CitteSAoJWRiLCAlcXVldWUsICVzdWJt aXQsICVub3RpZnksICVyaW5ncywgJWN0eGRiLCAlcmluZ21hcCwgJXJlcXdhaXQsICVjdHh0aW1l bGluZXMpOwogbXkgQGZyZXFzOwogCiBteSAkbWF4X2l0ZW1zID0gMzAwMDsKQEAgLTQxOCw2ICs0 MTgsNyBAQCB3aGlsZSAoPD4pIHsKIAkJJHJlcXsncmluZyd9ID0gJHJpbmc7CiAJCSRyZXF7J3Nl cW5vJ30gPSAkc2Vxbm87CiAJCSRyZXF7J2N0eCd9ID0gJGN0eDsKKwkJJGN0eHRpbWVsaW5lc3sk Y3R4IC4gJy8nIC4gJHJpbmd9ID0gMTsKIAkJJHJlcXsnbmFtZSd9ID0gJGN0eCAuICcvJyAuICRz ZXFubzsKIAkJJHJlcXsnZ2xvYmFsJ30gPSAkdHB7J2dsb2JhbCd9OwogCQkkcmVxeydwb3J0J30g PSAkdHB7J3BvcnQnfTsKQEAgLTU3Myw0MSArNTc0LDExMyBAQCBzdWIgc29ydFN0YXJ0IHsKIAly ZXR1cm4gJHZhbDsKIH0KIAotbXkgQHNvcnRlZF9rZXlzID0gc29ydCBzb3J0U3RhcnQga2V5cyAl ZGI7Ci1teSAkcmVfc29ydCA9IDA7CitteSAkcmVfc29ydCA9IDE7CitteSBAc29ydGVkX2tleXM7 CiAKLWRpZSAiRGF0YWJhc2UgY2hhbmdlZCBzaXplPyEiIHVubGVzcyBzY2FsYXIoQHNvcnRlZF9r ZXlzKSA9PSAka2V5X2NvdW50Oworc3ViIG1heWJlX3NvcnRfa2V5cworeworCWlmICgkcmVfc29y dCkgeworCQlAc29ydGVkX2tleXMgPSBzb3J0IHNvcnRTdGFydCBrZXlzICVkYjsKKwkJJHJlX3Nv cnQgPSAwOworCQlkaWUgIkRhdGFiYXNlIGNoYW5nZWQgc2l6ZT8hIiB1bmxlc3Mgc2NhbGFyKEBz b3J0ZWRfa2V5cykgPT0KKwkJCQkJCSAgICAgJGtleV9jb3VudDsKKwl9Cit9CiAKLWZvcmVhY2gg bXkgJGtleSAoQHNvcnRlZF9rZXlzKSB7Ci0JbXkgJHJpbmcgPSAkZGJ7JGtleX0tPnsncmluZyd9 OwotCW15ICRlbmQgPSAkZGJ7JGtleX0tPnsnZW5kJ307CittYXliZV9zb3J0X2tleXMoKTsKKwor bXkgJWN0eF90aW1lbGluZXM7CisKK3N1YiBzb3J0Q29udGV4dCB7CisJbXkgJGFzID0gJGRieyRh fS0+eydzZXFubyd9OworCW15ICRicyA9ICRkYnskYn0tPnsnc2Vxbm8nfTsKKwlteSAkdmFsOwor CisJJHZhbCA9ICRhcyA8PT4gJGJzOworCisJZGllIGlmICR2YWwgPT0gMDsKKworCXJldHVybiAk dmFsOworfQorCitzdWIgZ2V0X2N0eF90aW1lbGluZSB7CisJbXkgKCRjdHgsICRyaW5nLCAka2V5 KSA9IEBfOworCW15IEB0aW1lbGluZTsKKworCXJldHVybiAkY3R4X3RpbWVsaW5lc3ska2V5fSBp ZiBleGlzdHMgJGN0eF90aW1lbGluZXN7JGtleX07CisKKwlAdGltZWxpbmUgPSBncmVwIHsgJGRi eyRffS0+eydyaW5nJ30gZXEgJHJpbmcgYW5kCisJCQkgICAkZGJ7JF99LT57J2N0eCd9ID09ICRj dHggfSBAc29ydGVkX2tleXM7CisJIyBGSVhNRSBzZXFubyByZXN0YXJ0CisJQHRpbWVsaW5lID0g c29ydCBzb3J0Q29udGV4dCBAdGltZWxpbmU7CisKKwkkY3R4X3RpbWVsaW5lc3ska2V5fSA9IFxA dGltZWxpbmU7CisKKwlyZXR1cm4gXEB0aW1lbGluZTsKK30KKworIyBTcGxpdCBvdXQgbWVyZ2Vk IGJhdGNoZXMgaWYgcmVxdWVzdGVkLgoraWYgKCRjb3JyZWN0X2R1cmF0aW9ucykgeworCSMgU2hp ZnQgIXBvcnQwIHJlcXVlc3RzIHN0YXJ0IHRpbWUgdG8gYWZ0ZXIgdGhlIHByZXZpb3VzIGNvbnRl eHQgb24gdGhlCisJIyBzYW1lIHRpbWVsaW5lIGhhcyBmaW5pc2hlZC4KKwlmb3JlYWNoIG15ICRn aWQgKHNvcnQga2V5cyAlcmluZ3MpIHsKKwkJbXkgJHJpbmcgPSAkcmluZ21hcHskcmluZ3N7JGdp ZH19OworCQlteSAkdGltZWxpbmUgPSBnZXRfZW5naW5lX3RpbWVsaW5lKCRyaW5nKTsKKwkJbXkg JGNvbXBsZXRlOworCisJCWZvcmVhY2ggbXkgJHBvcyAoMC4uJCN7JHRpbWVsaW5lfSkgeworCQkJ bXkgJGtleSA9IEB7JHRpbWVsaW5lfVskcG9zXTsKKwkJCW15ICRwcmV2ID0gJGNvbXBsZXRlOwor CQkJbXkgJHBrZXk7CisKKwkJCSRjb21wbGV0ZSA9ICRrZXkgdW5sZXNzIGV4aXN0cyAkZGJ7JGtl eX0tPnsnbm8tZW5kJ307CisJCQkkcGtleSA9ICRjb21wbGV0ZTsKKworCQkJbmV4dCBpZiAkZGJ7 JGtleX0tPnsncG9ydCd9ID09IDA7CisKKwkJCSRwa2V5ID0gJHByZXYgaWYgJGNvbXBsZXRlIGVx ICRrZXk7CisKKwkJCWRpZSB1bmxlc3MgZGVmaW5lZCAkcGtleTsKKworCQkJJGRieyRrZXl9LT57 J3N0YXJ0J30gPSAkZGJ7JHBrZXl9LT57J2VuZCd9OworCQkJJGRieyRrZXl9LT57J3N0YXJ0J30g PSAkZGJ7JHBrZXl9LT57J25vdGlmeSd9IGlmICRkYnska2V5fS0+eydzdGFydCd9ID4gJGRieyRr ZXl9LT57J2VuZCd9OworCisJCQlkaWUgaWYgJGRieyRrZXl9LT57J3N0YXJ0J30gPiAkZGJ7JGtl eX0tPnsnZW5kJ307CiAKLQkjIGNvcnJlY3QgZHVyYXRpb24gb2YgbWVyZ2VkIGJhdGNoZXMKLQlp ZiAoJGNvcnJlY3RfZHVyYXRpb25zIGFuZCBleGlzdHMgJGRieyRrZXl9LT57J25vLWVuZCd9KSB7 Ci0JCW15ICRjdHggPSAkZGJ7JGtleX0tPnsnY3R4J307Ci0JCW15ICRzZXFubyA9ICRkYnska2V5 fS0+eydzZXFubyd9OwotCQlteSAkc3RhcnQgPSAkZGJ7JGtleX0tPnsnc3RhcnQnfTsKLQkJbXkg JG5leHRfa2V5OwotCQlteSAkaSA9IDE7Ci0KLQkJZG8gewotCQkJJG5leHRfa2V5ID0gZGJfa2V5 KCRyaW5nLCAkY3R4LCAkc2Vxbm8gKyAkaSk7Ci0JCQkkaSsrOwotCQl9IHVudGlsIChleGlzdHMg JGRieyRuZXh0X2tleX0gb3IgJGkgPiAka2V5X2NvdW50KTsgICMgdWdseSBzdG9wIGhhY2sKLQot CQkjIDIwdXMgdG9sZXJhbmNlCi0JCWlmIChleGlzdHMgJGRieyRuZXh0X2tleX0gYW5kICRkYnsk bmV4dF9rZXl9LT57J3N0YXJ0J30gPCAkc3RhcnQgKyAyMCkgewotCQkJbXkgJG5vdGlmeSA9ICRk Ynska2V5fS0+eydub3RpZnknfTsKIAkJCSRyZV9zb3J0ID0gMTsKLQkJCSRkYnskbmV4dF9rZXl9 LT57J3N0YXJ0J30gPSAkbm90aWZ5OwotCQkJJGRieyRuZXh0X2tleX0tPnsnc3RhcnQnfSA9ICRk YnskbmV4dF9rZXl9LT57J2VuZCd9IGlmICRkYnskbmV4dF9rZXl9LT57J3N0YXJ0J30gPiAkZGJ7 JG5leHRfa2V5fS0+eydlbmQnfTsKLQkJCWRpZSBpZiAkZGJ7JG5leHRfa2V5fS0+eydzdGFydCd9 ID4gJGRieyRuZXh0X2tleX0tPnsnZW5kJ307CiAJCX0KLQkJZGllIGlmICRzdGFydCA+ICRlbmQ7 CisJfQorCisJbWF5YmVfc29ydF9rZXlzKCk7CisKKwkjIEJhdGNoIHdpdGggbm8tZW5kIChubyBy ZXF1ZXN0X291dCkgbWVhbnMgaXQgd2FzIHN1Ym1pdHRlZCBhcyBwYXJ0IG9mCisJIyBjb2FsZXNj ZWQgY29udGV4dC4gVGhpcyBtZWFucyBpdCdzIHN0YXJ0IHRpbWUgc2hvdWxkIGJlIHNldCB0byB0 aGUgZW5kCisJIyB0aW1lIG9mIGEgZm9sbG93aW5nIHJlcXVlc3Qgb24gdGhpcyBjb250ZXh0IHRp bWVsaW5lLgorCWZvcmVhY2ggbXkgJHRrZXkgKHNvcnQga2V5cyAlY3R4dGltZWxpbmVzKSB7CisJ CW15ICgkY3R4LCAkcmluZykgPSBzcGxpdCAnLycsICR0a2V5OworCQlteSAkdGltZWxpbmUgPSBn ZXRfY3R4X3RpbWVsaW5lKCRjdHgsICRyaW5nLCAkdGtleSk7CisJCW15ICRsYXN0X2NvbXBsZXRl ID0gLTE7CisJCW15ICRjb21wbGV0ZTsKKworCQlmb3JlYWNoIG15ICRwb3MgKDAuLiQjeyR0aW1l bGluZX0pIHsKKwkJCW15ICRrZXkgPSBAeyR0aW1lbGluZX1bJHBvc107CisJCQlteSAkbmV4dF9r ZXk7CisKKwkJCW5leHQgdW5sZXNzIGV4aXN0cyAkZGJ7JGtleX0tPnsnbm8tZW5kJ307CisJCQls YXN0IGlmICRwb3MgPT0gJCN7JHRpbWVsaW5lfTsKKworCQkJIyBTaGlmdCBmb2xsb3dpbmcgcmVx dWVzdCB0byBzdGFydCBhZnRlciB0aGUgY3VycmVudCBvbmUKKwkJCSRuZXh0X2tleSA9ICR7JHRp bWVsaW5lfVskcG9zICsgMV07CisJCQlpZiAoZXhpc3RzICRkYnska2V5fS0+eydub3RpZnknfSkg eworCQkJCSRkYnskbmV4dF9rZXl9LT57J2VuZ2luZS1zdGFydCd9ID0gJGRieyRuZXh0X2tleX0t Pnsnc3RhcnQnfTsKKwkJCQkkZGJ7JG5leHRfa2V5fS0+eydzdGFydCd9ID0gJGRieyRrZXl9LT57 J25vdGlmeSd9OworCQkJCSRyZV9zb3J0ID0gMTsKKwkJCX0KKwkJfQogCX0KIH0KIAotQHNvcnRl ZF9rZXlzID0gc29ydCBzb3J0U3RhcnQga2V5cyAlZGIgaWYgJHJlX3NvcnQ7CittYXliZV9zb3J0 X2tleXMoKTsKIAogIyBHUFUgdGltZSBhY2NvdW50aW5nCiBteSAoJXJ1bm5pbmcsICVydW5uYWJs ZSwgJXF1ZXVlZCwgJWJhdGNoX2F2ZywgJWJhdGNoX3RvdGFsX2F2ZywgJWJhdGNoX2NvdW50KTsK QEAgLTYyMSw2ICs2OTQsNyBAQCBmb3JlYWNoIG15ICRrZXkgKEBzb3J0ZWRfa2V5cykgewogCW15 ICRyaW5nID0gJGRieyRrZXl9LT57J3JpbmcnfTsKIAlteSAkZW5kID0gJGRieyRrZXl9LT57J2Vu ZCd9OwogCW15ICRzdGFydCA9ICRkYnska2V5fS0+eydzdGFydCd9OworCW15ICRlbmdpbmVfc3Rh cnQgPSAkZGJ7JGtleX0tPnsnZW5naW5lX3N0YXJ0J307CiAJbXkgJG5vdGlmeSA9ICRkYnska2V5 fS0+eydub3RpZnknfTsKIAogCSRmaXJzdF90cyA9ICRkYnska2V5fS0+eydxdWV1ZSd9IGlmIG5v dCBkZWZpbmVkICRmaXJzdF90cyBvciAkZGJ7JGtleX0tPnsncXVldWUnfSA8ICRmaXJzdF90czsK QEAgLTYzMyw3ICs3MDcsOSBAQCBmb3JlYWNoIG15ICRrZXkgKEBzb3J0ZWRfa2V5cykgewogCX0g ZWxzZSB7CiAJCSRkYnska2V5fS0+eydjb250ZXh0LWNvbXBsZXRlLWRlbGF5J30gPSAwOwogCX0K LQkkZGJ7JGtleX0tPnsnZXhlY3V0ZS1kZWxheSd9ID0gJHN0YXJ0IC0gJGRieyRrZXl9LT57J3N1 Ym1pdCd9OworCisJJGVuZ2luZV9zdGFydCA9ICRkYnska2V5fS0+eydzdGFydCd9IHVubGVzcyBk ZWZpbmVkICRlbmdpbmVfc3RhcnQ7CisJJGRieyRrZXl9LT57J2V4ZWN1dGUtZGVsYXknfSA9ICRl bmdpbmVfc3RhcnQgLSAkZGJ7JGtleX0tPnsnc3VibWl0J307CiAJJGRieyRrZXl9LT57J3N1Ym1p dC1kZWxheSd9ID0gJGRieyRrZXl9LT57J3N1Ym1pdCd9IC0gJGRieyRrZXl9LT57J3F1ZXVlJ307 CiAJdW5sZXNzIChleGlzdHMgJGRieyRrZXl9LT57J25vLW5vdGlmeSd9KSB7CiAJCSRkYnska2V5 fS0+eydkdXJhdGlvbid9ID0gJG5vdGlmeSAtICRzdGFydDsKQEAgLTEwNTksNiArMTEzNSw3IEBA IG15ICRpID0gMDsKIGZvcmVhY2ggbXkgJGtleSAoc29ydCBzb3J0UXVldWUga2V5cyAlZGIpIHsK IAlteSAoJG5hbWUsICRjdHgsICRzZXFubykgPSAoJGRieyRrZXl9LT57J25hbWUnfSwgJGRieyRr ZXl9LT57J2N0eCd9LCAkZGJ7JGtleX0tPnsnc2Vxbm8nfSk7CiAJbXkgKCRxdWV1ZSwgJHN0YXJ0 LCAkbm90aWZ5LCAkZW5kKSA9ICgkZGJ7JGtleX0tPnsncXVldWUnfSwgJGRieyRrZXl9LT57J3N0 YXJ0J30sICRkYnska2V5fS0+eydub3RpZnknfSwgJGRieyRrZXl9LT57J2VuZCd9KTsKKwlteSAk ZW5naW5lX3N0YXJ0ID0gJGRieyRrZXl9LT57J2VuZ2luZS1zdGFydCd9OwogCW15ICRzdWJtaXQg PSAkcXVldWUgKyAkZGJ7JGtleX0tPnsnc3VibWl0LWRlbGF5J307CiAJbXkgKCRjb250ZW50LCAk c3R5bGUpOwogCW15ICRncm91cCA9ICRlbmdpbmVfc3RhcnRfaWQgKyAkcmluZ3N7JGRieyRrZXl9 LT57J3JpbmcnfX07CkBAIC0xMDc4LDExICsxMTU1LDEyIEBAIGZvcmVhY2ggbXkgJGtleSAoc29y dCBzb3J0UXVldWUga2V5cyAlZGIpIHsKIAl9CiAKIAkjIGV4ZWN1dGUgdG8gc3RhcnQKKwkkZW5n aW5lX3N0YXJ0ID0gJGRieyRrZXl9LT57J3N0YXJ0J30gdW5sZXNzIGRlZmluZWQgJGVuZ2luZV9z dGFydDsKIAl1bmxlc3MgKGV4aXN0cyAkc2tpcF9ib3h7J3JlYWR5J30pIHsKIAkJJHNrZXkgPSAy ICogJG1heF9zZXFubyAqICRjdHggKyAyICogJHNlcW5vICsgMTsKIAkJJHN0eWxlID0gYm94X3N0 eWxlKCRjdHgsICdyZWFkeScpOwogCQkkY29udGVudCA9ICI8c21hbGw+JG5hbWU8YnI+JGRieyRr ZXl9LT57J2V4ZWN1dGUtZGVsYXknfXVzPC9zbWFsbD4iOwotCQkkc3RhcnRlbmQgPSAnc3RhcnQ6 ICcgLiAkc3VibWl0IC4gJywgZW5kOiAnIC4gJHN0YXJ0OworCQkkc3RhcnRlbmQgPSAnc3RhcnQ6 ICcgLiAkc3VibWl0IC4gJywgZW5kOiAnIC4gJGVuZ2luZV9zdGFydDsKIAkJcHJpbnQgIlx0e2lk OiAkaSwga2V5OiAkc2tleSwgJHR5cGUgZ3JvdXA6ICRncm91cCwgc3ViZ3JvdXA6ICRzdWJncm91 cCwgc3ViZ3JvdXBPcmRlcjogJHN1Ymdyb3VwLCBjb250ZW50OiAnJGNvbnRlbnQnLCAkc3RhcnRl bmQsIHN0eWxlOiBcJyRzdHlsZVwnfSxcbiI7CiAJCSRpKys7CiAJfQotLSAKMi4xNy4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxp bmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXYK