From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B1E86E07E for ; Mon, 1 Apr 2019 06:47:09 +0000 (UTC) From: Arkadiusz Hiler Date: Mon, 1 Apr 2019 09:46:56 +0300 Message-Id: <20190401064657.23322-2-arkadiusz.hiler@intel.com> In-Reply-To: <20190401064657.23322-1-arkadiusz.hiler@intel.com> References: <20190401064657.23322-1-arkadiusz.hiler@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 2/3] runner: Refactor metadata parsing 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: VG8gYWlkIHRlc3RpbmcgZnVuY3Rpb24gcGFyc2luZyBtZXRhZGF0YS50eHQgaXMgc3BsaXQgaW50 byBvdXRlciBoZWxwZXIKdGhhdCBvcGVyYXRlcyBvbiBkaXJmZCBhbmQgaW5uZXIgZnVuY3Rpb24g dGhhdCBvcGVyYXRlcyBvbiBGSUxFKi4KClRoaXMgYWxsb3dzIHVzIHRvIHRlc3QgdGhlIHBhcnNp bmcgdXNpbmcgZm1lbW9wZW4oKSwgbGltaXRpbmcgdGhlIGFtb3VudApvZiBuZWNlc3NhcnkgYm9p bGVycGxhdGUuCgpTaWduZWQtb2ZmLWJ5OiBBcmthZGl1c3ogSGlsZXIgPGFya2FkaXVzei5oaWxl ckBpbnRlbC5jb20+Ci0tLQogcnVubmVyL2V4ZWN1dG9yLmMgICAgIHwgIDIgKy0KIHJ1bm5lci9y ZXN1bHRnZW4uYyAgICB8ICAyICstCiBydW5uZXIvcnVubmVyX3Rlc3RzLmMgfCAgMiArLQogcnVu bmVyL3NldHRpbmdzLmMgICAgIHwgNDAgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLQogcnVubmVyL3NldHRpbmdzLmggICAgIHwgIDQgKysrLQogNSBmaWxlcyBjaGFuZ2Vk LCAzMiBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ydW5uZXIv ZXhlY3V0b3IuYyBiL3J1bm5lci9leGVjdXRvci5jCmluZGV4IGE0MGUyZGQxLi4wZTkxYjdhYiAx MDA2NDQKLS0tIGEvcnVubmVyL2V4ZWN1dG9yLmMKKysrIGIvcnVubmVyL2V4ZWN1dG9yLmMKQEAg LTExMTIsNyArMTExMiw3IEBAIGJvb2wgaW5pdGlhbGl6ZV9leGVjdXRlX3N0YXRlX2Zyb21fcmVz dW1lKGludCBkaXJmZCwKIAltZW1zZXQoc3RhdGUsIDAsIHNpemVvZigqc3RhdGUpKTsKIAlzdGF0 ZS0+cmVzdW1pbmcgPSB0cnVlOwogCi0JaWYgKCFyZWFkX3NldHRpbmdzKHNldHRpbmdzLCBkaXJm ZCkgfHwKKwlpZiAoIXJlYWRfc2V0dGluZ3NfZnJvbV9kaXIoc2V0dGluZ3MsIGRpcmZkKSB8fAog CSAgICAhcmVhZF9qb2JfbGlzdChsaXN0LCBkaXJmZCkpIHsKIAkJY2xvc2UoZGlyZmQpOwogCQly ZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9ydW5uZXIvcmVzdWx0Z2VuLmMgYi9ydW5uZXIvcmVz dWx0Z2VuLmMKaW5kZXggNzNmZGE2NGYuLjQwZDFjZmNjIDEwMDY0NAotLS0gYS9ydW5uZXIvcmVz dWx0Z2VuLmMKKysrIGIvcnVubmVyL3Jlc3VsdGdlbi5jCkBAIC0xMDg1LDcgKzEwODUsNyBAQCBz dHJ1Y3QganNvbl9vYmplY3QgKmdlbmVyYXRlX3Jlc3VsdHNfanNvbihpbnQgZGlyZmQpCiAJaW5p dF9zZXR0aW5ncygmc2V0dGluZ3MpOwogCWluaXRfam9iX2xpc3QoJmpvYl9saXN0KTsKIAotCWlm ICghcmVhZF9zZXR0aW5ncygmc2V0dGluZ3MsIGRpcmZkKSkgeworCWlmICghcmVhZF9zZXR0aW5n c19mcm9tX2Rpcigmc2V0dGluZ3MsIGRpcmZkKSkgewogCQlmcHJpbnRmKHN0ZGVyciwgInJlc3Vs dGdlbjogQ2Fubm90IHBhcnNlIHNldHRpbmdzXG4iKTsKIAkJcmV0dXJuIE5VTEw7CiAJfQpkaWZm IC0tZ2l0IGEvcnVubmVyL3J1bm5lcl90ZXN0cy5jIGIvcnVubmVyL3J1bm5lcl90ZXN0cy5jCmlu ZGV4IGU0NjU2OGFjLi4wNjcyNTUzNiAxMDA2NDQKLS0tIGEvcnVubmVyL3J1bm5lcl90ZXN0cy5j CisrKyBiL3J1bm5lci9ydW5uZXJfdGVzdHMuYwpAQCAtNjgwLDcgKzY4MCw3IEBAIGlndF9tYWlu CiAJCQkJICAgICAiT3BlbmluZyAlcy9tZXRhZGF0YS50eHQgZmFpbGVkXG4iLCBkaXJuYW1lKTsK IAkJCWNsb3NlKGZkKTsKIAotCQkJaWd0X2Fzc2VydF9mKHJlYWRfc2V0dGluZ3MoJmNtcF9zZXR0 aW5ncywgZGlyZmQpLCAiUmVhZGluZyBzZXR0aW5ncyBmYWlsZWRcbiIpOworCQkJaWd0X2Fzc2Vy dF9mKHJlYWRfc2V0dGluZ3NfZnJvbV9kaXIoJmNtcF9zZXR0aW5ncywgZGlyZmQpLCAiUmVhZGlu ZyBzZXR0aW5ncyBmYWlsZWRcbiIpOwogCQkJYXNzZXJ0X3NldHRpbmdzX2VxdWFsKCZzZXR0aW5n cywgJmNtcF9zZXR0aW5ncyk7CiAJCX0KIApkaWZmIC0tZ2l0IGEvcnVubmVyL3NldHRpbmdzLmMg Yi9ydW5uZXIvc2V0dGluZ3MuYwppbmRleCBlNjQyNDRlNi4uMjBiMjEzNzggMTAwNjQ0Ci0tLSBh L3J1bm5lci9zZXR0aW5ncy5jCisrKyBiL3J1bm5lci9zZXR0aW5ncy5jCkBAIC01NDAsNyArNTQw LDcgQEAgYm9vbCBzZXJpYWxpemVfc2V0dGluZ3Moc3RydWN0IHNldHRpbmdzICpzZXR0aW5ncykK ICN1bmRlZiBTRVJJQUxJWkVfTElORQogfQogCi1ib29sIHJlYWRfc2V0dGluZ3Moc3RydWN0IHNl dHRpbmdzICpzZXR0aW5ncywgaW50IGRpcmZkKQorYm9vbCByZWFkX3NldHRpbmdzX2Zyb21fZmls ZShzdHJ1Y3Qgc2V0dGluZ3MgKnNldHRpbmdzLCBGSUxFICpmKQogewogI2RlZmluZSBQQVJTRV9M SU5FKHMsIG5hbWUsIHZhbCwgZmllbGQsIHdyaXRlKSBcCiAJaWYgKCFzdHJjbXAobmFtZSwgI2Zp ZWxkKSkgewkgICAgICAgXApAQCAtNTUxLDIwICs1NTEsOCBAQCBib29sIHJlYWRfc2V0dGluZ3Mo c3RydWN0IHNldHRpbmdzICpzZXR0aW5ncywgaW50IGRpcmZkKQogCQljb250aW51ZTsJCSAgICAg ICBcCiAJfQogCi0JaW50IGZkOwotCUZJTEUgKmY7CiAJY2hhciAqbmFtZSA9IE5VTEwsICp2YWwg PSBOVUxMOwogCi0JZnJlZV9zZXR0aW5ncyhzZXR0aW5ncyk7Ci0KLQlpZiAoKGZkID0gb3BlbmF0 KGRpcmZkLCBzZXR0aW5nc19maWxlbmFtZSwgT19SRE9OTFkpKSA8IDApCi0JCXJldHVybiBmYWxz ZTsKLQotCWYgPSBmZG9wZW4oZmQsICJyIik7Ci0JaWYgKCFmKSB7Ci0JCWNsb3NlKGZkKTsKLQkJ cmV0dXJuIGZhbHNlOwotCX0KIAogCXdoaWxlIChmc2NhbmYoZiwgIiVtcyA6ICVtcyIsICZuYW1l LCAmdmFsKSA9PSAyKSB7CiAJCWludCBudW12YWwgPSBhdG9pKHZhbCk7CkBAIC01OTIsOSArNTgw LDMzIEBAIGJvb2wgcmVhZF9zZXR0aW5ncyhzdHJ1Y3Qgc2V0dGluZ3MgKnNldHRpbmdzLCBpbnQg ZGlyZmQpCiAKIAlmcmVlKG5hbWUpOwogCWZyZWUodmFsKTsKLQlmY2xvc2UoZik7CiAKIAlyZXR1 cm4gdHJ1ZTsKIAogI3VuZGVmIFBBUlNFX0xJTkUKIH0KKworYm9vbCByZWFkX3NldHRpbmdzX2Zy b21fZGlyKHN0cnVjdCBzZXR0aW5ncyAqc2V0dGluZ3MsIGludCBkaXJmZCkKK3sKKwlpbnQgZmQ7 CisJRklMRSAqZjsKKworCisJZnJlZV9zZXR0aW5ncyhzZXR0aW5ncyk7CisKKwlpZiAoKGZkID0g b3BlbmF0KGRpcmZkLCBzZXR0aW5nc19maWxlbmFtZSwgT19SRE9OTFkpKSA8IDApCisJCXJldHVy biBmYWxzZTsKKworCWYgPSBmZG9wZW4oZmQsICJyIik7CisJaWYgKCFmKSB7CisJCWNsb3NlKGZk KTsKKwkJcmV0dXJuIGZhbHNlOworCX0KKworCWlmICghcmVhZF9zZXR0aW5nc19mcm9tX2ZpbGUo c2V0dGluZ3MsIGYpKQorCQlyZXR1cm4gZmFsc2U7CisKKwlmY2xvc2UoZik7CisKKwlyZXR1cm4g dHJ1ZTsKK30KZGlmZiAtLWdpdCBhL3J1bm5lci9zZXR0aW5ncy5oIGIvcnVubmVyL3NldHRpbmdz LmgKaW5kZXggMjY3ZDcyY2YuLmFlOTA4OTdjIDEwMDY0NAotLS0gYS9ydW5uZXIvc2V0dGluZ3Mu aAorKysgYi9ydW5uZXIvc2V0dGluZ3MuaApAQCAtNSw2ICs1LDcgQEAKICNpbmNsdWRlIDxzdGRk ZWYuaD4KICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KICNpbmNsdWRlIDxyZWdleC5oPgorI2luY2x1 ZGUgPHN0ZGlvLmg+CiAKIGVudW0gewogCUxPR19MRVZFTF9OT1JNQUwgPSAwLApAQCAtMTE0LDYg KzExNSw3IEBAIGNoYXIgKmFic29sdXRlX3BhdGgoY2hhciAqcGF0aCk7CiAgKi8KIGJvb2wgc2Vy aWFsaXplX3NldHRpbmdzKHN0cnVjdCBzZXR0aW5ncyAqc2V0dGluZ3MpOwogCi1ib29sIHJlYWRf c2V0dGluZ3Moc3RydWN0IHNldHRpbmdzICpzZXR0aW5ncywgaW50IGRpcmZkKTsKK2Jvb2wgcmVh ZF9zZXR0aW5nc19mcm9tX2ZpbGUoc3RydWN0IHNldHRpbmdzICpzZXR0aW5ncywgRklMRSogZik7 Citib29sIHJlYWRfc2V0dGluZ3NfZnJvbV9kaXIoc3RydWN0IHNldHRpbmdzICpzZXR0aW5ncywg aW50IGRpcmZkKTsKIAogI2VuZGlmCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaWd0LWRldg==