From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9615689C63 for ; Wed, 20 Mar 2019 11:24:55 +0000 (UTC) From: Simon Ser Date: Wed, 20 Mar 2019 13:24:52 +0200 Message-Id: <20190320112452.3375-1-simon.ser@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v2] 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 IDxzaW1vbi5zZXJAaW50ZWwuY29tPgotLS0KIHJ1bm5lci9leGVjdXRvci5jIHwgNjggKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAzNSBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ydW5uZXIv ZXhlY3V0b3IuYyBiL3J1bm5lci9leGVjdXRvci5jCmluZGV4IGQ1MzVjMjc2Li4yODlmZTQ5OCAx MDA2NDQKLS0tIGEvcnVubmVyL2V4ZWN1dG9yLmMKKysrIGIvcnVubmVyL2V4ZWN1dG9yLmMKQEAg LTc1Myw5ICs3NTMsMTAgQEAgc3RhdGljIGludCBtb25pdG9yX291dHB1dChwaWRfdCBjaGlsZCwK IAlyZXR1cm4ga2lsbGVkOwogfQogCi1zdGF0aWMgdm9pZCBleGVjdXRlX3Rlc3RfcHJvY2Vzcyhp bnQgb3V0ZmQsIGludCBlcnJmZCwKLQkJCQkgc3RydWN0IHNldHRpbmdzICpzZXR0aW5ncywKLQkJ CQkgc3RydWN0IGpvYl9saXN0X2VudHJ5ICplbnRyeSkKK3N0YXRpYyB2b2lkIF9fYXR0cmlidXRl X18oKG5vcmV0dXJuKSkKK2V4ZWN1dGVfdGVzdF9wcm9jZXNzKGludCBvdXRmZCwgaW50IGVycmZk LAorCQkgICAgIHN0cnVjdCBzZXR0aW5ncyAqc2V0dGluZ3MsCisJCSAgICAgc3RydWN0IGpvYl9s aXN0X2VudHJ5ICplbnRyeSkKIHsKIAljaGFyICphcmd2WzRdID0ge307CiAJc2l6ZV90IHJvb3Rs ZW47CkBAIC04NzEsNiArODcyLDcgQEAgc3RhdGljIGludCBleGVjdXRlX25leHRfZW50cnkoc3Ry dWN0IGV4ZWN1dGVfc3RhdGUgKnN0YXRlLAogCXNpZ3NldF90IG1hc2s7CiAJaW50IG91dHBpcGVb Ml0gPSB7IC0xLCAtMSB9OwogCWludCBlcnJwaXBlWzJdID0geyAtMSwgLTEgfTsKKwlpbnQgb3V0 ZmQsIGVycmZkOwogCWNoYXIgbmFtZVszMl07CiAJcGlkX3QgY2hpbGQ7CiAJaW50IHJlc3VsdDsK QEAgLTg4NCw5ICs4ODYsOSBAQCBzdGF0aWMgaW50IGV4ZWN1dGVfbmV4dF9lbnRyeShzdHJ1Y3Qg ZXhlY3V0ZV9zdGF0ZSAqc3RhdGUsCiAJfQogCiAJaWYgKCFvcGVuX291dHB1dF9maWxlcyhkaXJm ZCwgb3V0cHV0cywgdHJ1ZSkpIHsKLQkJY2xvc2UoZGlyZmQpOwogCQlmcHJpbnRmKHN0ZGVyciwg IkVycm9yIG9wZW5pbmcgb3V0cHV0IGZpbGVzXG4iKTsKLQkJcmV0dXJuIC0xOworCQlyZXN1bHQg PSAtMTsKKwkJZ290byBvdXRfZGlyZmQ7CiAJfQogCiAJaWYgKHNldHRpbmdzLT5zeW5jKSB7CkBA IC04OTUsMTQgKzg5Nyw5IEBAIHN0YXRpYyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBl eGVjdXRlX3N0YXRlICpzdGF0ZSwKIAl9CiAKIAlpZiAocGlwZShvdXRwaXBlKSB8fCBwaXBlKGVy cnBpcGUpKSB7Ci0JCWNsb3NlX291dHB1dHMob3V0cHV0cyk7Ci0JCWNsb3NlKGRpcmZkKTsKLQkJ Y2xvc2Uob3V0cGlwZVswXSk7Ci0JCWNsb3NlKG91dHBpcGVbMV0pOwotCQljbG9zZShlcnJwaXBl WzBdKTsKLQkJY2xvc2UoZXJycGlwZVsxXSk7CiAJCWZwcmludGYoc3RkZXJyLCAiRXJyb3IgY3Jl YXRpbmcgcGlwZXM6ICVzXG4iLCBzdHJlcnJvcihlcnJubykpOwotCQlyZXR1cm4gLTE7CisJCXJl c3VsdCA9IC0xOworCQlnb3RvIG91dF9waXBlOwogCX0KIAogCWlmICgoa21zZ2ZkID0gb3Blbigi L2Rldi9rbXNnIiwgT19SRE9OTFkgfCBPX0NMT0VYRUMpKSA8IDApIHsKQEAgLTkyMywxNCArOTIw LDggQEAgc3RhdGljIGludCBleGVjdXRlX25leHRfZW50cnkoc3RydWN0IGV4ZWN1dGVfc3RhdGUg KnN0YXRlLAogCWlmIChzaWdmZCA8IDApIHsKIAkJLyogVE9ETzogSGFuZGxlIGJldHRlciAqLwog CQlmcHJpbnRmKHN0ZGVyciwgIkNhbm5vdCBtb25pdG9yIGNoaWxkIHByb2Nlc3Mgd2l0aCBzaWdu YWxmZFxuIik7Ci0JCWNsb3NlKG91dHBpcGVbMF0pOwotCQljbG9zZShlcnJwaXBlWzBdKTsKLQkJ Y2xvc2Uob3V0cGlwZVsxXSk7Ci0JCWNsb3NlKGVycnBpcGVbMV0pOwotCQljbG9zZShrbXNnZmQp OwotCQljbG9zZV9vdXRwdXRzKG91dHB1dHMpOwotCQljbG9zZShkaXJmZCk7Ci0JCXJldHVybiAt MTsKKwkJcmVzdWx0ID0gLTE7CisJCWdvdG8gb3V0X2ttc2dmZDsKIAl9CiAKIAlpZiAoc2V0dGlu Z3MtPmxvZ19sZXZlbCA+PSBMT0dfTEVWRUxfTk9STUFMKSB7CkBAIC05NTEsMjEgKzk0MiwxNyBA QCBzdGF0aWMgaW50IGV4ZWN1dGVfbmV4dF9lbnRyeShzdHJ1Y3QgZXhlY3V0ZV9zdGF0ZSAqc3Rh dGUsCiAJICogRmx1c2ggb3V0cHV0cyBiZWZvcmUgZm9ya2luZyBzbyBvdXIgKGJ1ZmZlcmVkKSBv dXRwdXQgd29uJ3QKIAkgKiBlbmQgdXAgaW4gdGhlIHRlc3Qgb3V0cHV0cy4KIAkgKi8KLQogCWZm bHVzaChzdGRvdXQpOwogCWZmbHVzaChzdGRlcnIpOwogCi0JaWYgKChjaGlsZCA9IGZvcmsoKSkp IHsKLQkJaW50IG91dGZkID0gb3V0cGlwZVswXTsKLQkJaW50IGVycmZkID0gZXJycGlwZVswXTsK LQkJY2xvc2Uob3V0cGlwZVsxXSk7Ci0JCWNsb3NlKGVycnBpcGVbMV0pOwotCi0JCXJlc3VsdCA9 IG1vbml0b3Jfb3V0cHV0KGNoaWxkLCBvdXRmZCwgZXJyZmQsIGttc2dmZCwgc2lnZmQsCi0JCQkJ CW91dHB1dHMsIHRpbWVfc3BlbnQsIHNldHRpbmdzKTsKLQl9IGVsc2UgewotCQlpbnQgb3V0ZmQg PSBvdXRwaXBlWzFdOwotCQlpbnQgZXJyZmQgPSBlcnJwaXBlWzFdOworCWNoaWxkID0gZm9yaygp OworCWlmIChjaGlsZCA8IDApIHsKKwkJZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gZm9yaygp Iik7CisJCXJlc3VsdCA9IC0xOworCQlnb3RvIG91dF9rbXNnZmQ7CisJfSBlbHNlIGlmIChjaGls ZCA9PSAwKSB7CisJCW91dGZkID0gb3V0cGlwZVsxXTsKKwkJZXJyZmQgPSBlcnJwaXBlWzFdOwog CQljbG9zZShvdXRwaXBlWzBdKTsKIAkJY2xvc2UoZXJycGlwZVswXSk7CiAKQEAgLTk3NCwxMyAr OTYxLDI4IEBAIHN0YXRpYyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBleGVjdXRlX3N0 YXRlICpzdGF0ZSwKIAkJc2V0ZW52KCJJR1RfU0VOVElORUxfT05fU1RERVJSIiwgIjEiLCAxKTsK IAogCQlleGVjdXRlX3Rlc3RfcHJvY2VzcyhvdXRmZCwgZXJyZmQsIHNldHRpbmdzLCBlbnRyeSk7 CisJCS8qIHVucmVhY2hhYmxlICovCiAJfQogCi0JLyogVE9ETzogUmVmYWN0b3IgdGhpcyB3aG9s ZSBmdW5jdGlvbiB0byB1c2Ugb25pb24gdGVhcmRvd24gKi8KKwlvdXRmZCA9IG91dHBpcGVbMF07 CisJZXJyZmQgPSBlcnJwaXBlWzBdOwogCWNsb3NlKG91dHBpcGVbMV0pOwogCWNsb3NlKGVycnBp cGVbMV0pOworCW91dHBpcGVbMV0gPSBlcnJwaXBlWzFdID0gLTE7CisKKwlyZXN1bHQgPSBtb25p dG9yX291dHB1dChjaGlsZCwgb3V0ZmQsIGVycmZkLCBrbXNnZmQsIHNpZ2ZkLAorCQkJCW91dHB1 dHMsIHRpbWVfc3BlbnQsIHNldHRpbmdzKTsKKworb3V0X2ttc2dmZDoKIAljbG9zZShrbXNnZmQp Oworb3V0X3BpcGU6CisJY2xvc2Vfb3V0cHV0cyhvdXRwdXRzKTsKKwljbG9zZShvdXRwaXBlWzBd KTsKKwljbG9zZShvdXRwaXBlWzFdKTsKKwljbG9zZShlcnJwaXBlWzBdKTsKKwljbG9zZShlcnJw aXBlWzFdKTsKIAljbG9zZV9vdXRwdXRzKG91dHB1dHMpOworb3V0X2RpcmZkOgogCWNsb3NlKGRp cmZkKTsKIAogCXJldHVybiByZXN1bHQ7Ci0tIAoyLjIxLjAKCi0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpJbnRlbCBG aW5sYW5kIE95ClJlZ2lzdGVyZWQgQWRkcmVzczogUEwgMjgxLCAwMDE4MSBIZWxzaW5raSAKQnVz aW5lc3MgSWRlbnRpdHkgQ29kZTogMDM1NzYwNiAtIDQgCkRvbWljaWxlZCBpbiBIZWxzaW5raSAK ClRoaXMgZS1tYWlsIGFuZCBhbnkgYXR0YWNobWVudHMgbWF5IGNvbnRhaW4gY29uZmlkZW50aWFs IG1hdGVyaWFsIGZvcgp0aGUgc29sZSB1c2Ugb2YgdGhlIGludGVuZGVkIHJlY2lwaWVudChzKS4g QW55IHJldmlldyBvciBkaXN0cmlidXRpb24KYnkgb3RoZXJzIGlzIHN0cmljdGx5IHByb2hpYml0 ZWQuIElmIHlvdSBhcmUgbm90IHRoZSBpbnRlbmRlZApyZWNpcGllbnQsIHBsZWFzZSBjb250YWN0 IHRoZSBzZW5kZXIgYW5kIGRlbGV0ZSBhbGwgY29waWVzLgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pZ3QtZGV2