From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CDEF89B57 for ; Wed, 20 Mar 2019 09:34:02 +0000 (UTC) From: "Ser, Simon" Date: Wed, 20 Mar 2019 09:33:55 +0000 Message-ID: <16366e407a6f744610a14d208b7ba26c64f7411c.camel@intel.com> Content-Language: en-US Content-ID: MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t] 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: KiBSZWZhY3RvciB0byB1c2UgZ290byBlcnJvciBoYW5kbGluZw0KKiBNYWtlIGV4ZWN1dGVfdGVz dF9wcm9jZXNzIG5vcmV0dXJuIHRvIHJlbW92ZSB1bmluaXRpYWxpemVkIHZhcmlhYmxlDQogIHdh cm5pbmcNCiogQ2hlY2sgZm9yaygpIHJldHVybiB2YWx1ZQ0KDQpTaWduZWQtb2ZmLWJ5OiBTaW1v biBTZXIgPHNpbW9uLnNlckBpbnRlbC5jb20+DQotLS0NCiBydW5uZXIvZXhlY3V0b3IuYyB8IDYz ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogMSBmaWxl IGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0 IGEvcnVubmVyL2V4ZWN1dG9yLmMgYi9ydW5uZXIvZXhlY3V0b3IuYw0KaW5kZXggZDUzNWMyNzYu LjZiZjdjZTFjIDEwMDY0NA0KLS0tIGEvcnVubmVyL2V4ZWN1dG9yLmMNCisrKyBiL3J1bm5lci9l eGVjdXRvci5jDQpAQCAtNzUzLDkgKzc1MywxMCBAQCBzdGF0aWMgaW50IG1vbml0b3Jfb3V0cHV0 KHBpZF90IGNoaWxkLA0KIAlyZXR1cm4ga2lsbGVkOw0KIH0NCiANCi1zdGF0aWMgdm9pZCBleGVj dXRlX3Rlc3RfcHJvY2VzcyhpbnQgb3V0ZmQsIGludCBlcnJmZCwNCi0JCQkJIHN0cnVjdCBzZXR0 aW5ncyAqc2V0dGluZ3MsDQotCQkJCSBzdHJ1Y3Qgam9iX2xpc3RfZW50cnkgKmVudHJ5KQ0KK3N0 YXRpYyB2b2lkIF9fYXR0cmlidXRlX18oKG5vcmV0dXJuKSkNCitleGVjdXRlX3Rlc3RfcHJvY2Vz cyhpbnQgb3V0ZmQsIGludCBlcnJmZCwNCisJCSAgICAgc3RydWN0IHNldHRpbmdzICpzZXR0aW5n cywNCisJCSAgICAgc3RydWN0IGpvYl9saXN0X2VudHJ5ICplbnRyeSkNCiB7DQogCWNoYXIgKmFy Z3ZbNF0gPSB7fTsNCiAJc2l6ZV90IHJvb3RsZW47DQpAQCAtODg0LDkgKzg4NSw5IEBAIHN0YXRp YyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBleGVjdXRlX3N0YXRlDQoqc3RhdGUsDQog CX0NCiANCiAJaWYgKCFvcGVuX291dHB1dF9maWxlcyhkaXJmZCwgb3V0cHV0cywgdHJ1ZSkpIHsN Ci0JCWNsb3NlKGRpcmZkKTsNCiAJCWZwcmludGYoc3RkZXJyLCAiRXJyb3Igb3BlbmluZyBvdXRw dXQgZmlsZXNcbiIpOw0KLQkJcmV0dXJuIC0xOw0KKwkJcmVzdWx0ID0gLTE7DQorCQlnb3RvIG91 dF9kaXJmZDsNCiAJfQ0KIA0KIAlpZiAoc2V0dGluZ3MtPnN5bmMpIHsNCkBAIC04OTUsMTQgKzg5 Niw5IEBAIHN0YXRpYyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBleGVjdXRlX3N0YXRl DQoqc3RhdGUsDQogCX0NCiANCiAJaWYgKHBpcGUob3V0cGlwZSkgfHwgcGlwZShlcnJwaXBlKSkg ew0KLQkJY2xvc2Vfb3V0cHV0cyhvdXRwdXRzKTsNCi0JCWNsb3NlKGRpcmZkKTsNCi0JCWNsb3Nl KG91dHBpcGVbMF0pOw0KLQkJY2xvc2Uob3V0cGlwZVsxXSk7DQotCQljbG9zZShlcnJwaXBlWzBd KTsNCi0JCWNsb3NlKGVycnBpcGVbMV0pOw0KIAkJZnByaW50ZihzdGRlcnIsICJFcnJvciBjcmVh dGluZyBwaXBlczogJXNcbiIsDQpzdHJlcnJvcihlcnJubykpOw0KLQkJcmV0dXJuIC0xOw0KKwkJ cmVzdWx0ID0gLTE7DQorCQlnb3RvIG91dF9waXBlOw0KIAl9DQogDQogCWlmICgoa21zZ2ZkID0g b3BlbigiL2Rldi9rbXNnIiwgT19SRE9OTFkgfCBPX0NMT0VYRUMpKSA8IDApIHsNCkBAIC05MjMs MTQgKzkxOSw4IEBAIHN0YXRpYyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5KHN0cnVjdCBleGVjdXRl X3N0YXRlDQoqc3RhdGUsDQogCWlmIChzaWdmZCA8IDApIHsNCiAJCS8qIFRPRE86IEhhbmRsZSBi ZXR0ZXIgKi8NCiAJCWZwcmludGYoc3RkZXJyLCAiQ2Fubm90IG1vbml0b3IgY2hpbGQgcHJvY2Vz cyB3aXRoDQpzaWduYWxmZFxuIik7DQotCQljbG9zZShvdXRwaXBlWzBdKTsNCi0JCWNsb3NlKGVy cnBpcGVbMF0pOw0KLQkJY2xvc2Uob3V0cGlwZVsxXSk7DQotCQljbG9zZShlcnJwaXBlWzFdKTsN Ci0JCWNsb3NlKGttc2dmZCk7DQotCQljbG9zZV9vdXRwdXRzKG91dHB1dHMpOw0KLQkJY2xvc2Uo ZGlyZmQpOw0KLQkJcmV0dXJuIC0xOw0KKwkJcmVzdWx0ID0gLTE7DQorCQlnb3RvIG91dF9rbXNn ZmQ7DQogCX0NCiANCiAJaWYgKHNldHRpbmdzLT5sb2dfbGV2ZWwgPj0gTE9HX0xFVkVMX05PUk1B TCkgew0KQEAgLTk1MSwxOSArOTQxLDE1IEBAIHN0YXRpYyBpbnQgZXhlY3V0ZV9uZXh0X2VudHJ5 KHN0cnVjdA0KZXhlY3V0ZV9zdGF0ZSAqc3RhdGUsDQogCSAqIEZsdXNoIG91dHB1dHMgYmVmb3Jl IGZvcmtpbmcgc28gb3VyIChidWZmZXJlZCkgb3V0cHV0IHdvbid0DQogCSAqIGVuZCB1cCBpbiB0 aGUgdGVzdCBvdXRwdXRzLg0KIAkgKi8NCi0NCiAJZmZsdXNoKHN0ZG91dCk7DQogCWZmbHVzaChz dGRlcnIpOw0KIA0KLQlpZiAoKGNoaWxkID0gZm9yaygpKSkgew0KLQkJaW50IG91dGZkID0gb3V0 cGlwZVswXTsNCi0JCWludCBlcnJmZCA9IGVycnBpcGVbMF07DQotCQljbG9zZShvdXRwaXBlWzFd KTsNCi0JCWNsb3NlKGVycnBpcGVbMV0pOw0KLQ0KLQkJcmVzdWx0ID0gbW9uaXRvcl9vdXRwdXQo Y2hpbGQsIG91dGZkLCBlcnJmZCwga21zZ2ZkLA0Kc2lnZmQsDQotCQkJCQlvdXRwdXRzLCB0aW1l X3NwZW50LCBzZXR0aW5ncyk7DQotCX0gZWxzZSB7DQorCWNoaWxkID0gZm9yaygpOw0KKwlpZiAo Y2hpbGQgPCAwKSB7DQorCQlmcHJpbnRmKHN0ZGVyciwgIkZhaWxlZCB0byBmb3JrKCkiKTsNCisJ CXJlc3VsdCA9IC0xOw0KKwkJZ290byBvdXRfa21zZ2ZkOw0KKwl9IGVsc2UgaWYgKGNoaWxkID09 IDApIHsNCiAJCWludCBvdXRmZCA9IG91dHBpcGVbMV07DQogCQlpbnQgZXJyZmQgPSBlcnJwaXBl WzFdOw0KIAkJY2xvc2Uob3V0cGlwZVswXSk7DQpAQCAtOTc0LDEzICs5NjAsMjggQEAgc3RhdGlj IGludCBleGVjdXRlX25leHRfZW50cnkoc3RydWN0DQpleGVjdXRlX3N0YXRlICpzdGF0ZSwNCiAJ CXNldGVudigiSUdUX1NFTlRJTkVMX09OX1NUREVSUiIsICIxIiwgMSk7DQogDQogCQlleGVjdXRl X3Rlc3RfcHJvY2VzcyhvdXRmZCwgZXJyZmQsIHNldHRpbmdzLCBlbnRyeSk7DQorCQkvKiB1bnJl YWNoYWJsZSAqLw0KIAl9DQogDQotCS8qIFRPRE86IFJlZmFjdG9yIHRoaXMgd2hvbGUgZnVuY3Rp b24gdG8gdXNlIG9uaW9uIHRlYXJkb3duICovDQorCWludCBvdXRmZCA9IG91dHBpcGVbMF07DQor CWludCBlcnJmZCA9IGVycnBpcGVbMF07DQogCWNsb3NlKG91dHBpcGVbMV0pOw0KIAljbG9zZShl cnJwaXBlWzFdKTsNCisJb3V0cGlwZVsxXSA9IGVycnBpcGVbMV0gPSAtMTsNCisNCisJcmVzdWx0 ID0gbW9uaXRvcl9vdXRwdXQoY2hpbGQsIG91dGZkLCBlcnJmZCwga21zZ2ZkLCBzaWdmZCwNCisJ CQkJb3V0cHV0cywgdGltZV9zcGVudCwgc2V0dGluZ3MpOw0KKw0KK291dF9rbXNnZmQ6DQogCWNs b3NlKGttc2dmZCk7DQorb3V0X3BpcGU6DQorCWNsb3NlX291dHB1dHMob3V0cHV0cyk7DQorCWNs b3NlKG91dHBpcGVbMF0pOw0KKwljbG9zZShvdXRwaXBlWzFdKTsNCisJY2xvc2UoZXJycGlwZVsw XSk7DQorCWNsb3NlKGVycnBpcGVbMV0pOw0KIAljbG9zZV9vdXRwdXRzKG91dHB1dHMpOw0KK291 dF9kaXJmZDoNCiAJY2xvc2UoZGlyZmQpOw0KIA0KIAlyZXR1cm4gcmVzdWx0Ow0KLS0gDQoyLjIx LjANCg0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCkludGVsIEZpbmxhbmQgT3kKUmVnaXN0ZXJlZCBBZGRyZXNzOiBQ TCAyODEsIDAwMTgxIEhlbHNpbmtpIApCdXNpbmVzcyBJZGVudGl0eSBDb2RlOiAwMzU3NjA2IC0g NCAKRG9taWNpbGVkIGluIEhlbHNpbmtpIAoKVGhpcyBlLW1haWwgYW5kIGFueSBhdHRhY2htZW50 cyBtYXkgY29udGFpbiBjb25maWRlbnRpYWwgbWF0ZXJpYWwgZm9yCnRoZSBzb2xlIHVzZSBvZiB0 aGUgaW50ZW5kZWQgcmVjaXBpZW50KHMpLiBBbnkgcmV2aWV3IG9yIGRpc3RyaWJ1dGlvbgpieSBv dGhlcnMgaXMgc3RyaWN0bHkgcHJvaGliaXRlZC4gSWYgeW91IGFyZSBub3QgdGhlIGludGVuZGVk CnJlY2lwaWVudCwgcGxlYXNlIGNvbnRhY3QgdGhlIHNlbmRlciBhbmQgZGVsZXRlIGFsbCBjb3Bp ZXMuCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1k ZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldg==