From: Ronan Abhamon Subject: [PATCH] tools/xentop: Display '-' when stats are not available. Date: Wed, 20 Feb 2019 16:19:25 +0000 Message-ID: <20190220161922.14232-1-ronan.abhamon@vates.fr> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1gwUbq-00010S-45 for xen-devel@lists.xenproject.org; Wed, 20 Feb 2019 16:20:34 +0000 Received: from pmta02.mandrill.prod.suw01.rsglab.com (127.0.0.1) by mail186-15.suw21.mandrillapp.com id hdlv4s174bkj for ; Wed, 20 Feb 2019 16:19:25 +0000 (envelope-from ) List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Wei Liu , Pritha Srivastava , Ronan Abhamon , Ian Jackson List-Id: xen-devel@lists.xenproject.org RnJvbTogUHJpdGhhIFNyaXZhc3RhdmEgPHByaXRoYS5zcml2YXN0YXZhQGNpdHJpeC5jb20+CgpE aXNwbGF5aW5nIDAgaXMgbWlzbGVhZGluZy4KClNpZ25lZC1vZmYtYnk6IFByaXRoYSBTcml2YXN0 YXZhIDxwcml0aGEuc3JpdmFzdGF2YUBjaXRyaXguY29tPgpTaWduZWQtb2ZmLWJ5OiBSb25hbiBB YmhhbW9uIDxyb25hbi5hYmhhbW9uQHZhdGVzLmZyPgotLS0KIHRvb2xzL3hlbnN0YXQvbGlieGVu c3RhdC9zcmMveGVuc3RhdC5jICAgICAgIHwgICA2ICsKIHRvb2xzL3hlbnN0YXQvbGlieGVuc3Rh dC9zcmMveGVuc3RhdC5oICAgICAgIHwgICAzICsKIHRvb2xzL3hlbnN0YXQvbGlieGVuc3RhdC9z cmMveGVuc3RhdF9saW51eC5jIHwgIDQ3ICsrKy0tLQogdG9vbHMveGVuc3RhdC9saWJ4ZW5zdGF0 L3NyYy94ZW5zdGF0X3ByaXYuaCAgfCAgIDEgKwogdG9vbHMveGVuc3RhdC94ZW50b3AveGVudG9w LmMgICAgICAgICAgICAgICAgfCAxNTkgKysrKysrKysrKysrKysrLS0tLQogNSBmaWxlcyBjaGFu Z2VkLCAxNTggaW5zZXJ0aW9ucygrKSwgNTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9v bHMveGVuc3RhdC9saWJ4ZW5zdGF0L3NyYy94ZW5zdGF0LmMgYi90b29scy94ZW5zdGF0L2xpYnhl bnN0YXQvc3JjL3hlbnN0YXQuYwppbmRleCBmYmU0NGYzYzU2Li44ZmExMmQ3YmMwIDEwMDY0NAot LS0gYS90b29scy94ZW5zdGF0L2xpYnhlbnN0YXQvc3JjL3hlbnN0YXQuYworKysgYi90b29scy94 ZW5zdGF0L2xpYnhlbnN0YXQvc3JjL3hlbnN0YXQuYwpAQCAtNzI5LDYgKzcyOSwxMiBAQCB1bnNp Z25lZCBsb25nIGxvbmcgeGVuc3RhdF92YmRfd3Jfc2VjdHMoeGVuc3RhdF92YmQgKiB2YmQpCiAJ cmV0dXJuIHZiZC0+d3Jfc2VjdHM7CiB9CiAKKy8qIFJldHVybnMgZXJyb3Igd2hpbGUgZ2V0dGlu ZyBzdGF0cyAoMSBpZiBlcnJvciBoYXBwZW5lZCwgMCBvdGhlcndpc2UpICovCit1bnNpZ25lZCBp bnQgeGVuc3RhdF92YmRfZXJyb3IoeGVuc3RhdF92YmQgKiB2YmQpCit7CisJcmV0dXJuIHZiZC0+ ZXJyb3I7Cit9CisKIC8qCiAgKiBUbWVtIGZ1bmN0aW9ucwogICovCmRpZmYgLS1naXQgYS90b29s cy94ZW5zdGF0L2xpYnhlbnN0YXQvc3JjL3hlbnN0YXQuaCBiL3Rvb2xzL3hlbnN0YXQvbGlieGVu c3RhdC9zcmMveGVuc3RhdC5oCmluZGV4IDQ3ZWM2MGUxNGQuLmZlMTNiNjU3MjcgMTAwNjQ0Ci0t LSBhL3Rvb2xzL3hlbnN0YXQvbGlieGVuc3RhdC9zcmMveGVuc3RhdC5oCisrKyBiL3Rvb2xzL3hl bnN0YXQvbGlieGVuc3RhdC9zcmMveGVuc3RhdC5oCkBAIC0xOTMsNiArMTkzLDkgQEAgdW5zaWdu ZWQgbG9uZyBsb25nIHhlbnN0YXRfdmJkX3dyX3JlcXMoeGVuc3RhdF92YmQgKiB2YmQpOwogdW5z aWduZWQgbG9uZyBsb25nIHhlbnN0YXRfdmJkX3JkX3NlY3RzKHhlbnN0YXRfdmJkICogdmJkKTsK IHVuc2lnbmVkIGxvbmcgbG9uZyB4ZW5zdGF0X3ZiZF93cl9zZWN0cyh4ZW5zdGF0X3ZiZCAqIHZi ZCk7CiAKKy8qIFJldHVybnMgZXJyb3Igd2hpbGUgZ2V0dGluZyBzdGF0cyAoMSBpZiBlcnJvciBo YXBwZW5lZCwgMCBvdGhlcndpc2UpICovCit1bnNpZ25lZCBpbnQgeGVuc3RhdF92YmRfZXJyb3Io eGVuc3RhdF92YmQgKiB2YmQpOworCiAvKgogICogVG1lbSBmdW5jdGlvbnMgLSBleHRyYWN0IHRt ZW0gaW5mb3JtYXRpb24KICAqLwpkaWZmIC0tZ2l0IGEvdG9vbHMveGVuc3RhdC9saWJ4ZW5zdGF0 L3NyYy94ZW5zdGF0X2xpbnV4LmMgYi90b29scy94ZW5zdGF0L2xpYnhlbnN0YXQvc3JjL3hlbnN0 YXRfbGludXguYwppbmRleCA3Y2RkM2JmOTFmLi45NDIxY2E0M2M4IDEwMDY0NAotLS0gYS90b29s cy94ZW5zdGF0L2xpYnhlbnN0YXQvc3JjL3hlbnN0YXRfbGludXguYworKysgYi90b29scy94ZW5z dGF0L2xpYnhlbnN0YXQvc3JjL3hlbnN0YXRfbGludXguYwpAQCAtNDM2LDEzICs0MzYsMTUgQEAg aW50IHhlbnN0YXRfY29sbGVjdF92YmRzKHhlbnN0YXRfbm9kZSAqIG5vZGUpCiAJCXJldCA9IHNz Y2FuZihkcC0+ZF9uYW1lLCAiJTNzLSV1LSV1IiwgYnVmLCAmZG9taWQsICZ2YmQuZGV2KTsKIAkJ aWYgKHJldCAhPSAzKQogCQkJY29udGludWU7CisJCWlmICghKHN0cnN0cihidWYsICJ2YmQiKSkg JiYgIShzdHJzdHIoYnVmLCAidGFwIikpKQorCQkJY29udGludWU7CiAKIAkJaWYgKHN0cmNtcChi dWYsInZiZCIpID09IDApCiAJCQl2YmQuYmFja190eXBlID0gMTsKIAkJZWxzZSBpZiAoc3RyY21w KGJ1ZiwidGFwIikgPT0gMCkKIAkJCXZiZC5iYWNrX3R5cGUgPSAyOwogCQllbHNlCi0JCQljb250 aW51ZTsKKwkJCXZiZC5iYWNrX3R5cGUgPSAwOwogCiAJCWRvbWFpbiA9IHhlbnN0YXRfbm9kZV9k b21haW4obm9kZSwgZG9taWQpOwogCQlpZiAoZG9tYWluID09IE5VTEwpIHsKQEAgLTQ1MywzNiAr NDU1LDI5IEBAIGludCB4ZW5zdGF0X2NvbGxlY3RfdmJkcyh4ZW5zdGF0X25vZGUgKiBub2RlKQog CQkJY29udGludWU7CiAJCX0KIAotCQlpZigocmVhZF9hdHRyaWJ1dGVzX3ZiZChkcC0+ZF9uYW1l LCAic3RhdGlzdGljcy9vb19yZXEiLCBidWYsIDI1Nik8PTApCi0JCSAgIHx8ICgocmV0ID0gc3Nj YW5mKGJ1ZiwgIiVsbHUiLCAmdmJkLm9vX3JlcXMpKSAhPSAxKSkKLQkJewotCQkJY29udGludWU7 Ci0JCX0KLQotCQlpZigocmVhZF9hdHRyaWJ1dGVzX3ZiZChkcC0+ZF9uYW1lLCAic3RhdGlzdGlj cy9yZF9yZXEiLCBidWYsIDI1Nik8PTApCi0JCSAgIHx8ICgocmV0ID0gc3NjYW5mKGJ1ZiwgIiVs bHUiLCAmdmJkLnJkX3JlcXMpKSAhPSAxKSkKKwkJaWYgKHZiZC5iYWNrX3R5cGUgPT0gMSB8fCB2 YmQuYmFja190eXBlID09IDIpCiAJCXsKLQkJCWNvbnRpbnVlOwotCQl9CiAKLQkJaWYoKHJlYWRf YXR0cmlidXRlc192YmQoZHAtPmRfbmFtZSwgInN0YXRpc3RpY3Mvd3JfcmVxIiwgYnVmLCAyNTYp PD0wKQotCQkgICB8fCAoKHJldCA9IHNzY2FuZihidWYsICIlbGx1IiwgJnZiZC53cl9yZXFzKSkg IT0gMSkpCi0JCXsKLQkJCWNvbnRpbnVlOwotCQl9Ci0KLQkJaWYoKHJlYWRfYXR0cmlidXRlc192 YmQoZHAtPmRfbmFtZSwgInN0YXRpc3RpY3MvcmRfc2VjdCIsIGJ1ZiwgMjU2KTw9MCkKLQkJICAg fHwgKChyZXQgPSBzc2NhbmYoYnVmLCAiJWxsdSIsICZ2YmQucmRfc2VjdHMpKSAhPSAxKSkKLQkJ ewotCQkJY29udGludWU7CisJCQl2YmQuZXJyb3IgPSAwOworCisJCQlpZiAoKHJlYWRfYXR0cmli dXRlc192YmQoZHAtPmRfbmFtZSwgInN0YXRpc3RpY3Mvb29fcmVxIiwgYnVmLCAyNTYpPD0wKSB8 fAorCQkJCSgocmV0ID0gc3NjYW5mKGJ1ZiwgIiVsbHUiLCAmdmJkLm9vX3JlcXMpKSAhPSAxKSB8 fAorCQkJCShyZWFkX2F0dHJpYnV0ZXNfdmJkKGRwLT5kX25hbWUsICJzdGF0aXN0aWNzL3JkX3Jl cSIsIGJ1ZiwgMjU2KTw9MCkgfHwKKwkJCQkoKHJldCA9IHNzY2FuZihidWYsICIlbGx1IiwgJnZi ZC5yZF9yZXFzKSkgIT0gMSkgfHwKKwkJCQkocmVhZF9hdHRyaWJ1dGVzX3ZiZChkcC0+ZF9uYW1l LCAic3RhdGlzdGljcy93cl9yZXEiLCBidWYsIDI1Nik8PTApIHx8CisJCQkJKChyZXQgPSBzc2Nh bmYoYnVmLCAiJWxsdSIsICZ2YmQud3JfcmVxcykpICE9IDEpIHx8CisJCQkJKHJlYWRfYXR0cmli dXRlc192YmQoZHAtPmRfbmFtZSwgInN0YXRpc3RpY3MvcmRfc2VjdCIsIGJ1ZiwgMjU2KTw9MCkg fHwKKwkJCQkoKHJldCA9IHNzY2FuZihidWYsICIlbGx1IiwgJnZiZC53cl9zZWN0cykpICE9IDEp IHx8CisJCQkJKHJlYWRfYXR0cmlidXRlc192YmQoZHAtPmRfbmFtZSwgInN0YXRpc3RpY3Mvd3Jf c2VjdCIsIGJ1ZiwgMjU2KTw9MCkgfHwKKwkJCQkoKHJldCA9IHNzY2FuZihidWYsICIlbGx1Iiwg JnZiZC53cl9zZWN0cykpICE9IDEpKQorCQkJeworCQkJCXZiZC5lcnJvciA9IDE7CisJCQl9CiAJ CX0KLQotCQlpZigocmVhZF9hdHRyaWJ1dGVzX3ZiZChkcC0+ZF9uYW1lLCAic3RhdGlzdGljcy93 cl9zZWN0IiwgYnVmLCAyNTYpPD0wKQotCQkgICB8fCAoKHJldCA9IHNzY2FuZihidWYsICIlbGx1 IiwgJnZiZC53cl9zZWN0cykpICE9IDEpKQorCQllbHNlCiAJCXsKLQkJCWNvbnRpbnVlOworCQkJ dmJkLmVycm9yID0gMTsKIAkJfQotCiAJCWlmICgoeGVuc3RhdF9zYXZlX3ZiZChkb21haW4sICZ2 YmQpKSA9PSBOVUxMKSB7CiAJCQlwZXJyb3IoIkFsbG9jYXRpb24gZXJyb3IiKTsKIAkJCXJldHVy biAwOwpkaWZmIC0tZ2l0IGEvdG9vbHMveGVuc3RhdC9saWJ4ZW5zdGF0L3NyYy94ZW5zdGF0X3By aXYuaCBiL3Rvb2xzL3hlbnN0YXQvbGlieGVuc3RhdC9zcmMveGVuc3RhdF9wcml2LmgKaW5kZXgg NzRlMDc3NGE1ZS4uZWJmY2QwZmZmNiAxMDA2NDQKLS0tIGEvdG9vbHMveGVuc3RhdC9saWJ4ZW5z dGF0L3NyYy94ZW5zdGF0X3ByaXYuaAorKysgYi90b29scy94ZW5zdGF0L2xpYnhlbnN0YXQvc3Jj L3hlbnN0YXRfcHJpdi5oCkBAIC05OCw2ICs5OCw3IEBAIHN0cnVjdCB4ZW5zdGF0X25ldHdvcmsg ewogc3RydWN0IHhlbnN0YXRfdmJkIHsKIAl1bnNpZ25lZCBpbnQgYmFja190eXBlOwogCXVuc2ln bmVkIGludCBkZXY7CisJdW5zaWduZWQgaW50IGVycm9yOwogCXVuc2lnbmVkIGxvbmcgbG9uZyBv b19yZXFzOwogCXVuc2lnbmVkIGxvbmcgbG9uZyByZF9yZXFzOwogCXVuc2lnbmVkIGxvbmcgbG9u ZyB3cl9yZXFzOwpkaWZmIC0tZ2l0IGEvdG9vbHMveGVuc3RhdC94ZW50b3AveGVudG9wLmMgYi90 b29scy94ZW5zdGF0L3hlbnRvcC94ZW50b3AuYwppbmRleCBjNDY1ODEwNjJiLi44ZWY2ZjQ5ZmY5 IDEwMDY0NAotLS0gYS90b29scy94ZW5zdGF0L3hlbnRvcC94ZW50b3AuYworKysgYi90b29scy94 ZW5zdGF0L3hlbnRvcC94ZW50b3AuYwpAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgPHRpbWUu aD4KICNpbmNsdWRlIDx1bmlzdGQuaD4KICNpbmNsdWRlIDxzaWduYWwuaD4KKyNpbmNsdWRlIDxz dGRib29sLmg+CiAjaWYgZGVmaW5lZChfX2xpbnV4X18pCiAjaW5jbHVkZSA8bGludXgva2Rldl90 Lmg+CiAjZW5kaWYKQEAgLTg3LDcgKzg4LDcgQEAgc3RhdGljIGludCBoYW5kbGVfa2V5KGludCk7 CiBzdGF0aWMgaW50IGNvbXBhcmUodW5zaWduZWQgbG9uZyBsb25nLCB1bnNpZ25lZCBsb25nIGxv bmcpOwogc3RhdGljIGludCBjb21wYXJlX2RvbWFpbnMoeGVuc3RhdF9kb21haW4gKiosIHhlbnN0 YXRfZG9tYWluICoqKTsKIHN0YXRpYyB1bnNpZ25lZCBsb25nIGxvbmcgdG90X25ldF9ieXRlcygg eGVuc3RhdF9kb21haW4gKiwgaW50KTsKLXN0YXRpYyB1bnNpZ25lZCBsb25nIGxvbmcgdG90X3Zi ZF9yZXFzKCB4ZW5zdGF0X2RvbWFpbiAqLCBpbnQpOworc3RhdGljIGJvb2wgdG90X3ZiZF9yZXFz KCB4ZW5zdGF0X2RvbWFpbiAqLCBpbnQsIHVuc2lnbmVkIGxvbmcgbG9uZyAqKTsKIAogLyogRmll bGQgZnVuY3Rpb25zICovCiBzdGF0aWMgaW50IGNvbXBhcmVfc3RhdGUoeGVuc3RhdF9kb21haW4g KmRvbWFpbjEsIHhlbnN0YXRfZG9tYWluICpkb21haW4yKTsKQEAgLTY4NSw3MCArNjg2LDE0MCBA QCBzdGF0aWMgdm9pZCBwcmludF92YmRzKHhlbnN0YXRfZG9tYWluICpkb21haW4pCiAgICByZXR1 cm5pbmcgLTEsMCwxICogZm9yIDwsPSw+ICovCiBzdGF0aWMgaW50IGNvbXBhcmVfdmJkX29vKHhl bnN0YXRfZG9tYWluICpkb21haW4xLCB4ZW5zdGF0X2RvbWFpbiAqZG9tYWluMikKIHsKLSAgcmV0 dXJuIC1jb21wYXJlKHRvdF92YmRfcmVxcyhkb21haW4xLCBGSUVMRF9WQkRfT08pLAotCQkgIHRv dF92YmRfcmVxcyhkb21haW4yLCBGSUVMRF9WQkRfT08pKTsKKyAgdW5zaWduZWQgbG9uZyBsb25n IGRvbTFfdmJkX29vID0gMCwgZG9tMl92YmRfb28gPSAwOworCisgIHRvdF92YmRfcmVxcyhkb21h aW4xLCBGSUVMRF9WQkRfT08sICZkb20xX3ZiZF9vbyk7CisgIHRvdF92YmRfcmVxcyhkb21haW4x LCBGSUVMRF9WQkRfT08sICZkb20yX3ZiZF9vbyk7CisKKyAgcmV0dXJuIC1jb21wYXJlKGRvbTFf dmJkX29vLAorCQkgIGRvbTJfdmJkX29vKTsKIH0KIAogLyogUHJpbnRzIG51bWJlciBvZiB0b3Rh bCBWQkQgT08gcmVxdWVzdHMgc3RhdGlzdGljICovCiBzdGF0aWMgdm9pZCBwcmludF92YmRfb28o eGVuc3RhdF9kb21haW4gKmRvbWFpbikKIHsKLQlwcmludCgiJThsbHUiLCB0b3RfdmJkX3JlcXMo ZG9tYWluLCBGSUVMRF9WQkRfT08pKTsKKwl1bnNpZ25lZCBsb25nIGxvbmcgdmJkX29vOworCisJ aWYgKHRvdF92YmRfcmVxcyhkb21haW4sIEZJRUxEX1ZCRF9PTywgJnZiZF9vbykpCisJeworCQlw cmludCgiJThsbHUiLCB2YmRfb28pOworCX0KKwllbHNlCisJeworCQlwcmludCgiJThjIiwgJy0n KTsKKwl9CiB9CiAKIC8qIENvbXBhcmVzIG51bWJlciBvZiB0b3RhbCBWQkQgUkVBRCByZXF1ZXN0 cyBvZiB0d28gZG9tYWlucywKICAgIHJldHVybmluZyAtMSwwLDEgKiBmb3IgPCw9LD4gKi8KIHN0 YXRpYyBpbnQgY29tcGFyZV92YmRfcmQoeGVuc3RhdF9kb21haW4gKmRvbWFpbjEsIHhlbnN0YXRf ZG9tYWluICpkb21haW4yKQogewotCXJldHVybiAtY29tcGFyZSh0b3RfdmJkX3JlcXMoZG9tYWlu MSwgRklFTERfVkJEX1JEKSwKLQkJCXRvdF92YmRfcmVxcyhkb21haW4yLCBGSUVMRF9WQkRfUkQp KTsKKwl1bnNpZ25lZCBsb25nIGxvbmcgZG9tMV92YmRfcmQgPSAwLCBkb20yX3ZiZF9yZCA9IDA7 CisKKwl0b3RfdmJkX3JlcXMoZG9tYWluMSwgRklFTERfVkJEX1JELCAmZG9tMV92YmRfcmQpOwor CXRvdF92YmRfcmVxcyhkb21haW4xLCBGSUVMRF9WQkRfUkQsICZkb20yX3ZiZF9yZCk7CisKKwly ZXR1cm4gLWNvbXBhcmUoZG9tMV92YmRfcmQsCisJCQlkb20xX3ZiZF9yZCk7CiB9CiAKIC8qIFBy aW50cyBudW1iZXIgb2YgdG90YWwgVkJEIFJFQUQgcmVxdWVzdHMgc3RhdGlzdGljICovCiBzdGF0 aWMgdm9pZCBwcmludF92YmRfcmQoeGVuc3RhdF9kb21haW4gKmRvbWFpbikKIHsKLQlwcmludCgi JSpsbHUiLCBmaWVsZHNbRklFTERfVkJEX1JELTFdLmRlZmF1bHRfd2lkdGgsIHRvdF92YmRfcmVx cyhkb21haW4sIEZJRUxEX1ZCRF9SRCkpOworCXVuc2lnbmVkIGxvbmcgbG9uZyB2YmRfcmQ7CisK KwlpZiAodG90X3ZiZF9yZXFzKGRvbWFpbiwgRklFTERfVkJEX1JELCAmdmJkX3JkKSkKKwl7CisJ CXByaW50KCIlKmxsdSIsIGZpZWxkc1tGSUVMRF9WQkRfUkQtMV0uZGVmYXVsdF93aWR0aCwgdmJk X3JkKTsKKwl9CisJZWxzZQorCXsKKwkJcHJpbnQoIiUqYyIsIGZpZWxkc1tGSUVMRF9WQkRfUkQt MV0uZGVmYXVsdF93aWR0aCwgJy0nKTsKKwl9CiB9CiAKIC8qIENvbXBhcmVzIG51bWJlciBvZiB0 b3RhbCBWQkQgV1JJVEUgcmVxdWVzdHMgb2YgdHdvIGRvbWFpbnMsCiAgICByZXR1cm5pbmcgLTEs MCwxICogZm9yIDwsPSw+ICovCiBzdGF0aWMgaW50IGNvbXBhcmVfdmJkX3dyKHhlbnN0YXRfZG9t YWluICpkb21haW4xLCB4ZW5zdGF0X2RvbWFpbiAqZG9tYWluMikKIHsKLQlyZXR1cm4gLWNvbXBh cmUodG90X3ZiZF9yZXFzKGRvbWFpbjEsIEZJRUxEX1ZCRF9XUiksCi0JCQl0b3RfdmJkX3JlcXMo ZG9tYWluMiwgRklFTERfVkJEX1dSKSk7CisJdW5zaWduZWQgbG9uZyBsb25nIGRvbTFfdmJkX3dy ID0gMCwgZG9tMl92YmRfd3IgPSAwOworCisJdG90X3ZiZF9yZXFzKGRvbWFpbjEsIEZJRUxEX1ZC RF9XUiwgJmRvbTFfdmJkX3dyKTsKKwl0b3RfdmJkX3JlcXMoZG9tYWluMSwgRklFTERfVkJEX1dS LCAmZG9tMl92YmRfd3IpOworCisJcmV0dXJuIC1jb21wYXJlKGRvbTFfdmJkX3dyLAorCQkJZG9t Ml92YmRfd3IpOwogfQogCiAvKiBQcmludHMgbnVtYmVyIG9mIHRvdGFsIFZCRCBXUklURSByZXF1 ZXN0cyBzdGF0aXN0aWMgKi8KIHN0YXRpYyB2b2lkIHByaW50X3ZiZF93cih4ZW5zdGF0X2RvbWFp biAqZG9tYWluKQogewotCXByaW50KCIlKmxsdSIsIGZpZWxkc1tGSUVMRF9WQkRfV1ItMV0uZGVm YXVsdF93aWR0aCwgdG90X3ZiZF9yZXFzKGRvbWFpbiwgRklFTERfVkJEX1dSKSk7CisJdW5zaWdu ZWQgbG9uZyBsb25nIHZiZF93cjsKKworCWlmICh0b3RfdmJkX3JlcXMoZG9tYWluLCBGSUVMRF9W QkRfV1IsICZ2YmRfd3IpKQorCXsKKwkJcHJpbnQoIiUqbGx1IiwgZmllbGRzW0ZJRUxEX1ZCRF9X Ui0xXS5kZWZhdWx0X3dpZHRoLCB2YmRfd3IpOworCX0KKwllbHNlCisJeworCQlwcmludCgiJSpj IiwgZmllbGRzW0ZJRUxEX1ZCRF9XUi0xXS5kZWZhdWx0X3dpZHRoLCAnLScpOworCX0KIH0KIAog LyogQ29tcGFyZXMgbnVtYmVyIG9mIHRvdGFsIFZCRCBSRUFEIHNlY3RvcnMgb2YgdHdvIGRvbWFp bnMsCiAgICByZXR1cm5pbmcgLTEsMCwxICogZm9yIDwsPSw+ICovCiBzdGF0aWMgaW50IGNvbXBh cmVfdmJkX3JzZWN0KHhlbnN0YXRfZG9tYWluICpkb21haW4xLCB4ZW5zdGF0X2RvbWFpbiAqZG9t YWluMikKIHsKLQlyZXR1cm4gLWNvbXBhcmUodG90X3ZiZF9yZXFzKGRvbWFpbjEsIEZJRUxEX1ZC RF9SU0VDVCksCi0JCQl0b3RfdmJkX3JlcXMoZG9tYWluMiwgRklFTERfVkJEX1JTRUNUKSk7CisJ dW5zaWduZWQgbG9uZyBsb25nIGRvbTFfdmJkX3JzZWN0ID0gMCwgZG9tMl92YmRfcnNlY3QgPSAw OworCisJdG90X3ZiZF9yZXFzKGRvbWFpbjEsIEZJRUxEX1ZCRF9SU0VDVCwgJmRvbTFfdmJkX3Jz ZWN0KTsKKwl0b3RfdmJkX3JlcXMoZG9tYWluMSwgRklFTERfVkJEX1JTRUNULCAmZG9tMl92YmRf cnNlY3QpOworCisJcmV0dXJuIC1jb21wYXJlKGRvbTFfdmJkX3JzZWN0LAorCQkJZG9tMl92YmRf cnNlY3QpOwogfQogCiAvKiBQcmludHMgbnVtYmVyIG9mIHRvdGFsIFZCRCBSRUFEIHNlY3RvcnMg c3RhdGlzdGljICovCiBzdGF0aWMgdm9pZCBwcmludF92YmRfcnNlY3QoeGVuc3RhdF9kb21haW4g KmRvbWFpbikKIHsKLQlwcmludCgiJSpsbHUiLCBmaWVsZHNbRklFTERfVkJEX1JTRUNULTFdLmRl ZmF1bHRfd2lkdGgsIHRvdF92YmRfcmVxcyhkb21haW4sIEZJRUxEX1ZCRF9SU0VDVCkpOworCXVu c2lnbmVkIGxvbmcgbG9uZyB2YmRfcnNlY3Q7CisKKwlpZiAodG90X3ZiZF9yZXFzKGRvbWFpbiwg RklFTERfVkJEX1JTRUNULCAmdmJkX3JzZWN0KSkKKwl7CisJCXByaW50KCIlKmxsdSIsIGZpZWxk c1tGSUVMRF9WQkRfUlNFQ1QtMV0uZGVmYXVsdF93aWR0aCwgdmJkX3JzZWN0KTsKKwl9CisJZWxz ZQorCXsKKwkJcHJpbnQoIiUqYyIsIGZpZWxkc1tGSUVMRF9WQkRfUlNFQ1QtMV0uZGVmYXVsdF93 aWR0aCwgJy0nKTsKKwl9CiB9CiAKIC8qIENvbXBhcmVzIG51bWJlciBvZiB0b3RhbCBWQkQgV1JJ VEUgc2VjdG9ycyBvZiB0d28gZG9tYWlucywKICAgIHJldHVybmluZyAtMSwwLDEgKiBmb3IgPCw9 LD4gKi8KIHN0YXRpYyBpbnQgY29tcGFyZV92YmRfd3NlY3QoeGVuc3RhdF9kb21haW4gKmRvbWFp bjEsIHhlbnN0YXRfZG9tYWluICpkb21haW4yKQogewotCXJldHVybiAtY29tcGFyZSh0b3RfdmJk X3JlcXMoZG9tYWluMSwgRklFTERfVkJEX1dTRUNUKSwKLQkJCXRvdF92YmRfcmVxcyhkb21haW4y LCBGSUVMRF9WQkRfV1NFQ1QpKTsKKwl1bnNpZ25lZCBsb25nIGxvbmcgZG9tMV92YmRfd3NlY3Qg PSAwLCBkb20yX3ZiZF93c2VjdCA9IDA7CisKKwl0b3RfdmJkX3JlcXMoZG9tYWluMSwgRklFTERf VkJEX1dTRUNULCAmZG9tMV92YmRfd3NlY3QpOworCXRvdF92YmRfcmVxcyhkb21haW4yLCBGSUVM RF9WQkRfV1NFQ1QsICZkb20yX3ZiZF93c2VjdCk7CisKKwlyZXR1cm4gLWNvbXBhcmUoZG9tMV92 YmRfd3NlY3QsCisJCQlkb20yX3ZiZF93c2VjdCk7CiB9CiAKIC8qIFByaW50cyBudW1iZXIgb2Yg dG90YWwgVkJEIFdSSVRFIHNlY3RvcnMgc3RhdGlzdGljICovCiBzdGF0aWMgdm9pZCBwcmludF92 YmRfd3NlY3QoeGVuc3RhdF9kb21haW4gKmRvbWFpbikKIHsKLQlwcmludCgiJSpsbHUiLCBmaWVs ZHNbRklFTERfVkJEX1dTRUNULTFdLmRlZmF1bHRfd2lkdGgsIHRvdF92YmRfcmVxcyhkb21haW4s IEZJRUxEX1ZCRF9XU0VDVCkpOworCXVuc2lnbmVkIGxvbmcgbG9uZyB2YmRfd3NlY3Q7CisKKwlp ZiAodG90X3ZiZF9yZXFzKGRvbWFpbiwgRklFTERfVkJEX1dTRUNULCAmdmJkX3dzZWN0KSkKKwl7 CisJCXByaW50KCIlKmxsdSIsIGZpZWxkc1tGSUVMRF9WQkRfV1NFQ1QtMV0uZGVmYXVsdF93aWR0 aCwgdmJkX3dzZWN0KTsKKwl9CisJZWxzZQorCXsKKwkJcHJpbnQoIiUqYyIsIGZpZWxkc1tGSUVM RF9WQkRfV1NFQ1QtMV0uZGVmYXVsdF93aWR0aCwgJy0nKTsKKwl9CiB9CiAKIApAQCAtNzU5LDE3 ICs4MzAsMjUgQEAgc3RhdGljIHZvaWQgcHJpbnRfdmJkX3dzZWN0KHhlbnN0YXRfZG9tYWluICpk b21haW4pCiAgKiAgIGlmIGZsYWcgaXMgRklFTERfVkJEX1JTRUNULCB0aGVuIFJFQUQgc2VjdG9y cywKICAqICAgaWYgZmxhZyBpcyBGSUVMRF9WQkRfV1NFQ1QsIHRoZW4gV1JJVEUgc2VjdG9ycy4K ICAqLwotc3RhdGljIHVuc2lnbmVkIGxvbmcgbG9uZyB0b3RfdmJkX3JlcXMoeGVuc3RhdF9kb21h aW4gKmRvbWFpbiwgaW50IGZsYWcpCitzdGF0aWMgYm9vbCB0b3RfdmJkX3JlcXMoeGVuc3RhdF9k b21haW4gKmRvbWFpbiwgaW50IGZsYWcsIHVuc2lnbmVkIGxvbmcgbG9uZyAqcmVzKQogewogCWlu dCBpID0gMDsKIAl4ZW5zdGF0X3ZiZCAqdmJkOwogCXVuc2lnbmVkIG51bV92YmRzID0gMDsKIAl1 bnNpZ25lZCBsb25nIGxvbmcgdG90YWwgPSAwOworCWJvb2wgc2hvd19zdGF0cyA9IGZhbHNlOwog CQogCW51bV92YmRzID0geGVuc3RhdF9kb21haW5fbnVtX3ZiZHMoZG9tYWluKTsKLQkKKwlpZigh bnVtX3ZiZHMpCisgICAgICAgICAgICAgICBzaG93X3N0YXRzID0gdHJ1ZTsKKwogCWZvciAoIGk9 MCA7IGkgPCBudW1fdmJkcyA7IGkrKykgewogCQl2YmQgPSB4ZW5zdGF0X2RvbWFpbl92YmQoZG9t YWluLGkpOworCQlpZiAoeGVuc3RhdF92YmRfZXJyb3IodmJkKSkKKwkJCWNvbnRpbnVlOworCQll bHNlCisJCQlzaG93X3N0YXRzID0gdHJ1ZTsKKwogCQlzd2l0Y2goZmxhZykgewogCQljYXNlIEZJ RUxEX1ZCRF9PTzoKIAkJCXRvdGFsICs9IHhlbnN0YXRfdmJkX29vX3JlcXModmJkKTsKQEAgLTc5 MSw3ICs4NzAsOSBAQCBzdGF0aWMgdW5zaWduZWQgbG9uZyBsb25nIHRvdF92YmRfcmVxcyh4ZW5z dGF0X2RvbWFpbiAqZG9tYWluLCBpbnQgZmxhZykKIAkJfQogCX0KIAkKLQlyZXR1cm4gdG90YWw7 CisJKnJlcyA9IHRvdGFsOworCisJcmV0dXJuIHNob3dfc3RhdHM7CiB9CiAKIC8qIENvbXBhcmVz IHNlY3VyaXR5IGlkIChzc2lkKSBvZiB0d28gZG9tYWlucywgcmV0dXJuaW5nIC0xLDAsMSBmb3Ig PCw9LD4gKi8KQEAgLTgyMiw2ICs5MDMsNyBAQCB2b2lkIHJlc2V0X2ZpZWxkX3dpZHRocyh2b2lk KQogdm9pZCBhZGp1c3RfZmllbGRfd2lkdGhzKHhlbnN0YXRfZG9tYWluICpkb21haW4pCiB7CiAJ dW5zaWduZWQgaW50IGxlbmd0aDsKKwl1bnNpZ25lZCBsb25nIGxvbmcgdmJkX3JkLCB2YmRfd3Is IHZiZF9yc2VjdCwgdmJkX3dzZWN0OwogCiAJaWYgKHNob3dfZnVsbF9uYW1lKSB7CiAJCWxlbmd0 aCA9IHN0cmxlbih4ZW5zdGF0X2RvbWFpbl9uYW1lKGRvbWFpbikpOwpAQCAtODM3LDE5ICs5MTks MjMgQEAgdm9pZCBhZGp1c3RfZmllbGRfd2lkdGhzKHhlbnN0YXRfZG9tYWluICpkb21haW4pCiAJ aWYgKGxlbmd0aCA+IGZpZWxkc1tGSUVMRF9ORVRfUlgtMV0uZGVmYXVsdF93aWR0aCkKIAkJZmll bGRzW0ZJRUxEX05FVF9SWC0xXS5kZWZhdWx0X3dpZHRoID0gbGVuZ3RoOwogCi0JbGVuZ3RoID0g SU5UX0ZJRUxEX1dJRFRIKCh0b3RfdmJkX3JlcXMoZG9tYWluLCBGSUVMRF9WQkRfUkQpKSArIDEp OworCXRvdF92YmRfcmVxcyhkb21haW4sIEZJRUxEX1ZCRF9SRCwgJnZiZF9yZCk7CisJbGVuZ3Ro ID0gSU5UX0ZJRUxEX1dJRFRIKHZiZF9yZCArIDEpOwogCWlmIChsZW5ndGggPiBmaWVsZHNbRklF TERfVkJEX1JELTFdLmRlZmF1bHRfd2lkdGgpCiAJCWZpZWxkc1tGSUVMRF9WQkRfUkQtMV0uZGVm YXVsdF93aWR0aCA9IGxlbmd0aDsKIAotCWxlbmd0aCA9IElOVF9GSUVMRF9XSURUSCgodG90X3Zi ZF9yZXFzKGRvbWFpbiwgRklFTERfVkJEX1dSKSkgKyAxKTsKKwl0b3RfdmJkX3JlcXMoZG9tYWlu LCBGSUVMRF9WQkRfV1IsICZ2YmRfd3IpOworCWxlbmd0aCA9IElOVF9GSUVMRF9XSURUSCh2YmRf d3IgKyAxKTsKIAlpZiAobGVuZ3RoID4gZmllbGRzW0ZJRUxEX1ZCRF9XUi0xXS5kZWZhdWx0X3dp ZHRoKQogCQlmaWVsZHNbRklFTERfVkJEX1dSLTFdLmRlZmF1bHRfd2lkdGggPSBsZW5ndGg7CiAK LQlsZW5ndGggPSBJTlRfRklFTERfV0lEVEgoKHRvdF92YmRfcmVxcyhkb21haW4sIEZJRUxEX1ZC RF9SU0VDVCkpICsgMSk7CisJdG90X3ZiZF9yZXFzKGRvbWFpbiwgRklFTERfVkJEX1JTRUNULCAm dmJkX3JzZWN0KTsKKwlsZW5ndGggPSBJTlRfRklFTERfV0lEVEgodmJkX3JzZWN0ICsgMSk7CiAJ aWYgKGxlbmd0aCA+IGZpZWxkc1tGSUVMRF9WQkRfUlNFQ1QtMV0uZGVmYXVsdF93aWR0aCkKIAkJ ZmllbGRzW0ZJRUxEX1ZCRF9SU0VDVC0xXS5kZWZhdWx0X3dpZHRoID0gbGVuZ3RoOwogCi0JbGVu Z3RoID0gSU5UX0ZJRUxEX1dJRFRIKCh0b3RfdmJkX3JlcXMoZG9tYWluLCBGSUVMRF9WQkRfV1NF Q1QpKSArIDEpOworCXRvdF92YmRfcmVxcyhkb21haW4sIEZJRUxEX1ZCRF9XU0VDVCwgJnZiZF93 c2VjdCk7CisJbGVuZ3RoID0gSU5UX0ZJRUxEX1dJRFRIKHZiZF93c2VjdCArIDEpOwogCWlmIChs ZW5ndGggPiBmaWVsZHNbRklFTERfVkJEX1dTRUNULTFdLmRlZmF1bHRfd2lkdGgpCiAJCWZpZWxk c1tGSUVMRF9WQkRfV1NFQ1QtMV0uZGVmYXVsdF93aWR0aCA9IGxlbmd0aDsKIH0KQEAgLTEwNzQs MTUgKzExNjAsMjQgQEAgdm9pZCBkb192YmQoeGVuc3RhdF9kb21haW4gKmRvbWFpbikKIAkJCSBN QUpPUih4ZW5zdGF0X3ZiZF9kZXYodmJkKSksCiAJCQkgTUlOT1IoeGVuc3RhdF92YmRfZGV2KHZi ZCkpKTsKICNlbmRpZgotCi0JCXByaW50KCJWQkQgJXMgJTRkICVzIE9POiAlOGxsdSAgIFJEOiAl OGxsdSAgIFdSOiAlOGxsdSAgIFJTRUNUOiAlMTBsbHUgICBXU0VDVDogJTEwbGx1XG4iLAotCQkg ICAgICB2YmRfdHlwZVt4ZW5zdGF0X3ZiZF90eXBlKHZiZCldLAotCQkgICAgICB4ZW5zdGF0X3Zi ZF9kZXYodmJkKSwgZGV0YWlscywKLQkJICAgICAgeGVuc3RhdF92YmRfb29fcmVxcyh2YmQpLAot CQkgICAgICB4ZW5zdGF0X3ZiZF9yZF9yZXFzKHZiZCksCi0JCSAgICAgIHhlbnN0YXRfdmJkX3dy X3JlcXModmJkKSwKLQkJICAgICAgeGVuc3RhdF92YmRfcmRfc2VjdHModmJkKSwKLQkJICAgICAg eGVuc3RhdF92YmRfd3Jfc2VjdHModmJkKSk7CisJCWlmICh4ZW5zdGF0X3ZiZF9lcnJvcih2YmQp KQorCQl7CisJCQlwcmludCgiVkJEICVzICU0ZCAlcyBPTzogJThjICAgUkQ6ICU4YyAgIFdSOiAl OGMgICBSU0VDVDogJTEwYyAgIFdTRUNUOiAlMTBjXG4iLAorCQkJCXZiZF90eXBlW3hlbnN0YXRf dmJkX3R5cGUodmJkKV0sCisJCQkJeGVuc3RhdF92YmRfZGV2KHZiZCksIGRldGFpbHMsCisJCQkJ Jy0nLCAnLScsICctJywgJy0nLCctJyk7CisJCX0KKwkJZWxzZQorCQl7CisJCQlwcmludCgiVkJE ICVzICU0ZCAlcyBPTzogJThsbHUgICBSRDogJThsbHUgICBXUjogJThsbHUgICBSU0VDVDogJTEw bGx1ICAgV1NFQ1Q6ICUxMGxsdVxuIiwKKwkJCQl2YmRfdHlwZVt4ZW5zdGF0X3ZiZF90eXBlKHZi ZCldLAorCQkJCXhlbnN0YXRfdmJkX2Rldih2YmQpLCBkZXRhaWxzLAorCQkJCXhlbnN0YXRfdmJk X29vX3JlcXModmJkKSwKKwkJCQl4ZW5zdGF0X3ZiZF9yZF9yZXFzKHZiZCksCisJCQkJeGVuc3Rh dF92YmRfd3JfcmVxcyh2YmQpLAorCQkJCXhlbnN0YXRfdmJkX3JkX3NlY3RzKHZiZCksCisJCQkJ eGVuc3RhdF92YmRfd3Jfc2VjdHModmJkKSk7CisJCX0KIAl9CiB9CiAKLS0gCjIuMjAuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1h aWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54 ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==