From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3ECB89C2C for ; Wed, 20 Mar 2019 11:16:01 +0000 (UTC) From: Simon Ser Date: Wed, 20 Mar 2019 13:15:56 +0200 Message-Id: <20190320111556.2476-3-simon.ser@intel.com> In-Reply-To: <20190320111556.2476-1-simon.ser@intel.com> References: <20190320111556.2476-1-simon.ser@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 3/3] runner/executor: refactor error handling 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 List-ID: KiBSZWZhY3RvciB0byB1c2UgZ290byBlcnJvciBoYW5kbGluZwoqIE1ha2UgZXhlY3V0ZV90ZXN0 X3Byb2Nlc3Mgbm9yZXR1cm4gdG8gcmVtb3ZlIHVuaW5pdGlhbGl6ZWQgdmFyaWFibGUKICB3YXJu aW5nCiogQ2hlY2sgZm9yaygpIHJldHVybiB2YWx1ZQoKU2lnbmVkLW9mZi1ieTogU2ltb24gU2Vy IDxzaW1vbi5zZXJAaW50ZWwuY29tPgotLS0KIHJ1bm5lci9leGVjdXRvci5jIHwgNjMgKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAzMiBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ydW5uZXIv ZXhlY3V0b3IuYyBiL3J1bm5lci9leGVjdXRvci5jCmluZGV4IGQ1MzVjMjc2Li42YmY3Y2UxYyAx MDA2NDQKLS0tIGEvcnVubmVyL2V4ZWN1dG9yLmMKKysrIGIvcnVubmVyL2V4ZWN1dG9yLmMKQEAg LTc1Myw5ICs3NTMsMTAgQEAgc3RhdGljIGludCBtb25pdG9yX291dHB1dChwaWRfdCBjaGlsZCwK IAlyZXR1cm4ga2lsbGVkOwogfQogCi1zdGF0aWMgdm9pZCBleGVjdXRlX3Rlc3RfcHJvY2Vzcyhp bnQgb3V0ZmQsIGludCBlcnJmZCwKLQkJCQkgc3RydWN0IHNldHRpbmdzICpzZXR0aW5ncywKLQkJ CQkgc3RydWN0IGpvYl9saXN0X2VudHJ5ICplbnRyeSkKK3N0YXRpYyB2b2lkIF9fYXR0cmlidXRl X18oKG5vcmV0dXJuKSkKK2V4ZWN1dGVfdGVzdF9wcm9jZXNzKGludCBvdXRmZCwgaW50IGVycmZk LAorCQkgICAgIHN0cnVjdCBzZXR0aW5ncyAqc2V0dGluZ3MsCisJCSAgICAgc3RydWN0IGpvYl9s aXN0X2VudHJ5ICplbnRyeSkKIHsKIAljaGFyICphcmd2WzRdID0ge307CiAJc2l6ZV90IHJvb3Rs ZW47CkBAIC04ODQsOSArODg1LDkgQEAgc3RhdGljIGludCBleGVjdXRlX25leHRfZW50cnkoc3Ry dWN0IGV4ZWN1dGVfc3RhdGUgKnN0YXRlLAogCX0KIAogCWlmICghb3Blbl9vdXRwdXRfZmlsZXMo ZGlyZmQsIG91dHB1dHMsIHRydWUpKSB7Ci0JCWNsb3NlKGRpcmZkKTsKIAkJZnByaW50ZihzdGRl cnIsICJFcnJvciBvcGVuaW5nIG91dHB1dCBmaWxlc1xuIik7Ci0JCXJldHVybiAtMTsKKwkJcmVz dWx0ID0gLTE7CisJCWdvdG8gb3V0X2RpcmZkOwogCX0KIAogCWlmIChzZXR0aW5ncy0+c3luYykg ewpAQCAtODk1LDE0ICs4OTYsOSBAQCBzdGF0aWMgaW50IGV4ZWN1dGVfbmV4dF9lbnRyeShzdHJ1 Y3QgZXhlY3V0ZV9zdGF0ZSAqc3RhdGUsCiAJfQogCiAJaWYgKHBpcGUob3V0cGlwZSkgfHwgcGlw ZShlcnJwaXBlKSkgewotCQljbG9zZV9vdXRwdXRzKG91dHB1dHMpOwotCQljbG9zZShkaXJmZCk7 Ci0JCWNsb3NlKG91dHBpcGVbMF0pOwotCQljbG9zZShvdXRwaXBlWzFdKTsKLQkJY2xvc2UoZXJy cGlwZVswXSk7Ci0JCWNsb3NlKGVycnBpcGVbMV0pOwogCQlmcHJpbnRmKHN0ZGVyciwgIkVycm9y IGNyZWF0aW5nIHBpcGVzOiAlc1xuIiwgc3RyZXJyb3IoZXJybm8pKTsKLQkJcmV0dXJuIC0xOwor CQlyZXN1bHQgPSAtMTsKKwkJZ290byBvdXRfcGlwZTsKIAl9CiAKIAlpZiAoKGttc2dmZCA9IG9w ZW4oIi9kZXYva21zZyIsIE9fUkRPTkxZIHwgT19DTE9FWEVDKSkgPCAwKSB7CkBAIC05MjMsMTQg KzkxOSw4IEBAIHN0YXRpYyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBleGVjdXRlX3N0 YXRlICpzdGF0ZSwKIAlpZiAoc2lnZmQgPCAwKSB7CiAJCS8qIFRPRE86IEhhbmRsZSBiZXR0ZXIg Ki8KIAkJZnByaW50ZihzdGRlcnIsICJDYW5ub3QgbW9uaXRvciBjaGlsZCBwcm9jZXNzIHdpdGgg c2lnbmFsZmRcbiIpOwotCQljbG9zZShvdXRwaXBlWzBdKTsKLQkJY2xvc2UoZXJycGlwZVswXSk7 Ci0JCWNsb3NlKG91dHBpcGVbMV0pOwotCQljbG9zZShlcnJwaXBlWzFdKTsKLQkJY2xvc2Uoa21z Z2ZkKTsKLQkJY2xvc2Vfb3V0cHV0cyhvdXRwdXRzKTsKLQkJY2xvc2UoZGlyZmQpOwotCQlyZXR1 cm4gLTE7CisJCXJlc3VsdCA9IC0xOworCQlnb3RvIG91dF9rbXNnZmQ7CiAJfQogCiAJaWYgKHNl dHRpbmdzLT5sb2dfbGV2ZWwgPj0gTE9HX0xFVkVMX05PUk1BTCkgewpAQCAtOTUxLDE5ICs5NDEs MTUgQEAgc3RhdGljIGludCBleGVjdXRlX25leHRfZW50cnkoc3RydWN0IGV4ZWN1dGVfc3RhdGUg KnN0YXRlLAogCSAqIEZsdXNoIG91dHB1dHMgYmVmb3JlIGZvcmtpbmcgc28gb3VyIChidWZmZXJl ZCkgb3V0cHV0IHdvbid0CiAJICogZW5kIHVwIGluIHRoZSB0ZXN0IG91dHB1dHMuCiAJICovCi0K IAlmZmx1c2goc3Rkb3V0KTsKIAlmZmx1c2goc3RkZXJyKTsKIAotCWlmICgoY2hpbGQgPSBmb3Jr KCkpKSB7Ci0JCWludCBvdXRmZCA9IG91dHBpcGVbMF07Ci0JCWludCBlcnJmZCA9IGVycnBpcGVb MF07Ci0JCWNsb3NlKG91dHBpcGVbMV0pOwotCQljbG9zZShlcnJwaXBlWzFdKTsKLQotCQlyZXN1 bHQgPSBtb25pdG9yX291dHB1dChjaGlsZCwgb3V0ZmQsIGVycmZkLCBrbXNnZmQsIHNpZ2ZkLAot CQkJCQlvdXRwdXRzLCB0aW1lX3NwZW50LCBzZXR0aW5ncyk7Ci0JfSBlbHNlIHsKKwljaGlsZCA9 IGZvcmsoKTsKKwlpZiAoY2hpbGQgPCAwKSB7CisJCWZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRv IGZvcmsoKSIpOworCQlyZXN1bHQgPSAtMTsKKwkJZ290byBvdXRfa21zZ2ZkOworCX0gZWxzZSBp ZiAoY2hpbGQgPT0gMCkgewogCQlpbnQgb3V0ZmQgPSBvdXRwaXBlWzFdOwogCQlpbnQgZXJyZmQg PSBlcnJwaXBlWzFdOwogCQljbG9zZShvdXRwaXBlWzBdKTsKQEAgLTk3NCwxMyArOTYwLDI4IEBA IHN0YXRpYyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBleGVjdXRlX3N0YXRlICpzdGF0 ZSwKIAkJc2V0ZW52KCJJR1RfU0VOVElORUxfT05fU1RERVJSIiwgIjEiLCAxKTsKIAogCQlleGVj dXRlX3Rlc3RfcHJvY2VzcyhvdXRmZCwgZXJyZmQsIHNldHRpbmdzLCBlbnRyeSk7CisJCS8qIHVu cmVhY2hhYmxlICovCiAJfQogCi0JLyogVE9ETzogUmVmYWN0b3IgdGhpcyB3aG9sZSBmdW5jdGlv biB0byB1c2Ugb25pb24gdGVhcmRvd24gKi8KKwlpbnQgb3V0ZmQgPSBvdXRwaXBlWzBdOworCWlu dCBlcnJmZCA9IGVycnBpcGVbMF07CiAJY2xvc2Uob3V0cGlwZVsxXSk7CiAJY2xvc2UoZXJycGlw ZVsxXSk7CisJb3V0cGlwZVsxXSA9IGVycnBpcGVbMV0gPSAtMTsKKworCXJlc3VsdCA9IG1vbml0 b3Jfb3V0cHV0KGNoaWxkLCBvdXRmZCwgZXJyZmQsIGttc2dmZCwgc2lnZmQsCisJCQkJb3V0cHV0 cywgdGltZV9zcGVudCwgc2V0dGluZ3MpOworCitvdXRfa21zZ2ZkOgogCWNsb3NlKGttc2dmZCk7 CitvdXRfcGlwZToKKwljbG9zZV9vdXRwdXRzKG91dHB1dHMpOworCWNsb3NlKG91dHBpcGVbMF0p OworCWNsb3NlKG91dHBpcGVbMV0pOworCWNsb3NlKGVycnBpcGVbMF0pOworCWNsb3NlKGVycnBp cGVbMV0pOwogCWNsb3NlX291dHB1dHMob3V0cHV0cyk7CitvdXRfZGlyZmQ6CiAJY2xvc2UoZGly ZmQpOwogCiAJcmV0dXJuIHJlc3VsdDsKLS0gCjIuMjEuMAoKLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkludGVsIEZp bmxhbmQgT3kKUmVnaXN0ZXJlZCBBZGRyZXNzOiBQTCAyODEsIDAwMTgxIEhlbHNpbmtpIApCdXNp bmVzcyBJZGVudGl0eSBDb2RlOiAwMzU3NjA2IC0gNCAKRG9taWNpbGVkIGluIEhlbHNpbmtpIAoK VGhpcyBlLW1haWwgYW5kIGFueSBhdHRhY2htZW50cyBtYXkgY29udGFpbiBjb25maWRlbnRpYWwg bWF0ZXJpYWwgZm9yCnRoZSBzb2xlIHVzZSBvZiB0aGUgaW50ZW5kZWQgcmVjaXBpZW50KHMpLiBB bnkgcmV2aWV3IG9yIGRpc3RyaWJ1dGlvbgpieSBvdGhlcnMgaXMgc3RyaWN0bHkgcHJvaGliaXRl ZC4gSWYgeW91IGFyZSBub3QgdGhlIGludGVuZGVkCnJlY2lwaWVudCwgcGxlYXNlIGNvbnRhY3Qg dGhlIHNlbmRlciBhbmQgZGVsZXRlIGFsbCBjb3BpZXMuCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2lndC1kZXY=