From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [XTF PATCH] xtf-runner: fix two synchronisation issues Date: Fri, 29 Jul 2016 13:07:03 +0100 Message-ID: <1469794023-10594-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bT6ZI-0008Mh-Um for xen-devel@lists.xenproject.org; Fri, 29 Jul 2016 12:07:09 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: andrew.cooper3@citrix.com, Wei Liu , Ian Jackson List-Id: xen-devel@lists.xenproject.org VGhlcmUgd2VyZSB0d28gc3luY2hyb25pc2F0aW9uIGlzc3VlcyBmb3IgdGhlIG9sZCBjb2RlOgoK MS4gVGhlcmUgd2FzIG5vIGd1YXJhbnRlZSB0aGF0IGd1ZXN0IGNvbnNvbGUgd2FzIHJlYWR5IGJl Zm9yZSAieGwKICAgY29uc29sZSIgaW52b2NhdGlvbi4KMi4gVGhlcmUgd2FzIG5vIGd1YXJhbnRl ZSB0aGF0IHJ1bm5lciB3b3VsZG4ndCBub3QgZXhpdCBiZWZvcmUgYWxsIHRlc3QKICAgZ3Vlc3Rz IHdlcmUgZ29uZS4KCkZvciB4dGYtcnVubmVyIHRvIGJlIHN1aXRhYmxlIHRvIHJ1biBpbiBhbiBh dXRvbWF0aWMgdGVzdGluZyBzeXN0ZW0gbGlrZQpvc3N0ZXN0LCB3ZSBuZWVkIHRvIGVsaW1pbmF0 ZSB0aG9zZSB0d28gaXNzdWVzLCBvdGhlcndpc2Ugd2UgcmlzayBzZWVpbmcKZmFpbHVyZXMgdGhh dCBhcmUgY2F1c2VkIGJ5IHJhY2VzLgoKVG8gZml4IHRoZXNlIHR3byBpc3N1ZXM6CgoxLiBVc2Ug InhsIGNyZWF0ZSAtRiIgdG8gZm9yY2UgdGhlIHByb2Nlc3MgdGhhdCBjcmVhdGVzIGEgZ3Vlc3Qg dG8KICAgc3RheSB1bnRpbCB0aGUgZ3Vlc3QgaXMgZGVhZC4gV2l0aCB0aGlzIHdlIGNhbiB3YWl0 IGZvciB0aGF0CiAgIHBhcnRpY3VsYXIgc3VicHJvY2VzcyBpbiBydW5uZXIgdG8gbWFrZSBzdXJl IHRoZSBndWVzdCBpcyBnb25lLgoyLiBQb2xsIHhlbnN0b3JlIGd1ZXN0IGNvbnNvbGUgbm9kZSB0 byBtYWtlIHN1cmUgY29uc29sZSBpcyBhdmFpbGFibGUKICAgYmVmb3JlICJ4bCBjb25zb2xlIiBp bnZvY2F0aW9uLgoKVG8gYXZvaWQgdGhlIHJ1bm5lciBsb29wcyBmb3JldmVyIGluIHRoYXQgY29u c29sZSBjaGVja2luZyBsb29wLCB1c2UKU0lHQUxSTSB0byBtYWtlIGl0IHRpbWUgb3V0IGFmdGVy IDUgc2Vjb25kcy4KClJlZGlyZWN0IG91dHB1dCB0aGF0IHdlJ3JlIG5vdCBpbnRlcmVzdGVkIGlu IHRvIERFVk5VTEwuCgpTaWduZWQtb2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29t PgotLS0KIHh0Zi1ydW5uZXIgfCA1NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1MCBpbnNlcnRpb25zKCsp LCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3h0Zi1ydW5uZXIgYi94dGYtcnVubmVyCmlu ZGV4IDY2YjJmYjcuLjMyOTZjZGYgMTAwNzU1Ci0tLSBhL3h0Zi1ydW5uZXIKKysrIGIveHRmLXJ1 bm5lcgpAQCAtNyw3ICs3LDcgQEAgeHRmLXJ1bm5lciAtIEEgdXRpbGl0eSBmb3IgZW51bWVyYXRp bmcgYW5kIHJ1bm5pbmcgWFRGIHRlc3RzLgogQ3VycmVudGx5IGFzc3VtZXMgdGhlIHByZXNlbmNl IGFuZCBhdmFpbGFiaWxpdHkgb2YgdGhlIGB4bGAgdG9vbHN0YWNrLgogIiIiCiAKLWltcG9ydCBz eXMsIG9zLCBvcy5wYXRoIGFzIHBhdGgKK2ltcG9ydCBzeXMsIG9zLCBvcy5wYXRoIGFzIHBhdGgs IHNpZ25hbAogCiBmcm9tIG9wdHBhcnNlIGltcG9ydCBPcHRpb25QYXJzZXIKIGZyb20gc3VicHJv Y2VzcyBpbXBvcnQgUG9wZW4sIFBJUEUsIGNhbGwgYXMgc3VicHJvY19jYWxsLCBjaGVja19vdXRw dXQKQEAgLTE3LDYgKzE3LDExIEBAIHRyeToKIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICBpbXBv cnQgc2ltcGxlanNvbiBhcyBqc29uCiAKK3RyeToKKyAgICBmcm9tIHN1YnByb2Nlc3MgaW1wb3J0 IERFVk5VTEwKK2V4Y2VwdCBJbXBvcnRFcnJvcjoKKyAgICBERVZOVUxMID0gb3Blbihvcy5kZXZu dWxsLCAnd2InKQorCiAjIEFsbCByZXN1bHRzIG9mIGEgdGVzdCwga2VlcCBpbiBzeW5jIHdpdGgg QyBjb2RlIHJlcG9ydC5oLgogIyBOb3RlIHRoYXQgd2FybmluZyBpcyBub3QgYSByZXN1bHQgb24g aXRzIG93bi4KIGFsbF9yZXN1bHRzID0gKCdTVUNDRVNTJywgJ1NLSVAnLCAnRVJST1InLCAnRkFJ TFVSRScpCkBAIC00MSw2ICs0NiwxMCBAQCBhbGxfZW52aXJvbm1lbnRzID0gcHZfZW52aXJvbm1l bnRzICsgaHZtX2Vudmlyb25tZW50cwogY2xhc3MgUnVubmVyRXJyb3IoRXhjZXB0aW9uKToKICAg ICAiIiIgRXJyb3JzIHJlbGF0aW5nIHRvIHh0Zi1ydW5uZXIgaXRzZWxmICIiIgogCitkZWYgc2ln YWxybV9oYW5kbGVyKHNpZ251bSwgZnJhbWUpOgorICAgICIiIiBTaWduYWwgaGFuZGxlciBmb3Ig U0lHQUxSTSAiIiIKKyAgICByYWlzZSBSdW5uZXJFcnJvcigiT3BlcmF0aW9uIHRpbWVkIG91dCIp CisKIGRlZiBvcGVuX3Rlc3RfaW5mbygpOgogICAgICIiIiBPcGVuIGFuZCBjb2xsYXRlIGVhY2gg dGVzdC1pbmZvLmpzb24gIiIiCiAKQEAgLTEzMiwyNCArMTQxLDUzIEBAIGRlZiBsaXN0X3Rlc3Rz KGFyZ3MpOgogCiAgICAgICAgIHByaW50IG5hbWUKIAorIyBBIGxpc3Qgb2YgcHJvY2Vzc2VzIHRo YXQgd2UgbmVlZCB0byB3YWl0IHVudGlsIHRoZXkgZXhpdHMuCit3YWl0X2xpc3QgPSBbXQogCiBk ZWYgcnVuX3Rlc3QodGVzdCk6CiAgICAgIiIiIFJ1biBhIHNwZWNpZmljIHRlc3QgIiIiCiAKKyAg ICBjb25zb2xlX3BhdGggPSAnL2xvY2FsL2RvbWFpbi8wL2JhY2tlbmQvY29uc29sZScKKyAgICAj IFNldHVwIHdhdGNoIGZvciBjb25zb2xlCisgICAgY21kID0gWyd4ZW5zdG9yZS13YXRjaCcsIGNv bnNvbGVfcGF0aF0KKyAgICBwcmludCAiRXhlY3V0aW5nICclcyciICUgKCIgIi5qb2luKGNtZCks ICkKKyAgICB4c193YXRjaCA9IFBvcGVuKGNtZCwgc3Rkb3V0ID0gUElQRSwgc3RkZXJyID0gUElQ RSkKKwogICAgIF8sIF8sIG5hbWUgPSB0ZXN0LnNwbGl0KCctJywgMikKIAogICAgIGNmZyA9IHBh dGguam9pbigidGVzdHMiLCBuYW1lLCB0ZXN0ICsgIi5jZmciKQogCi0gICAgY21kID0gWyd4bCcs ICdjcmVhdGUnLCAnLXAnLCBjZmddCisgICAgY21kID0gWyd4bCcsICdjcmVhdGUnLCAnLUZwJywg Y2ZnXQogCiAgICAgcHJpbnQgIkV4ZWN1dGluZyAnJXMnIiAlICgiICIuam9pbihjbWQpLCApCi0g ICAgcmMgPSBzdWJwcm9jX2NhbGwoY21kKQotICAgIGlmIHJjOgotICAgICAgICByYWlzZSBSdW5u ZXJFcnJvcigiRmFpbGVkIHRvIGNyZWF0ZSBWTSIpCisgICAgd2FpdCA9IFBvcGVuKGNtZCwgc3Rk b3V0ID0gREVWTlVMTCwgc3RkZXJyID0gREVWTlVMTCkKKyAgICB3YWl0X2xpc3QuYXBwZW5kKHdh aXQpCisKKyAgICAjIFdhaXQgdXAgdG8gNSBzZWNvbmRzIGZvciBjb25zb2xlIHRvIHNob3cgdXAK KyAgICBzaWduYWwuYWxhcm0oNSkKKyAgICB3aGlsZSBUcnVlOgorICAgICAgICBsID0geHNfd2F0 Y2guc3Rkb3V0LnJlYWRsaW5lKCkKKyAgICAgICAgZG9taWQgPSBsW2xlbihjb25zb2xlX3BhdGgp KzE6XS5zcGxpdCgnLycpWzBdCisgICAgICAgIGlmIGRvbWlkID09ICcnOiBjb250aW51ZQorCisg ICAgICAgIGNtZCA9IFsneGVuc3RvcmUtcmVhZCcsICcvbG9jYWwvZG9tYWluLycrZG9taWQrJy9u YW1lJ10KKyAgICAgICAgcHJpbnQgIkV4ZWN1dGluZyAnJXMnIiAlICgiICIuam9pbihjbWQpLCAp CisgICAgICAgIGduYW1lID0gY2hlY2tfb3V0cHV0KGNtZCkuc3BsaXRsaW5lcygpWzBdCisgICAg ICAgIGlmIGduYW1lICE9IHRlc3Q6IGNvbnRpbnVlCisKKyAgICAgICAgY21kID0gWyd4ZW5zdG9y ZS1yZWFkJywgJy9sb2NhbC9kb21haW4vJytkb21pZCsnL2NvbnNvbGUvdHR5J10KKyAgICAgICAg cHJpbnQgIkV4ZWN1dGluZyAnJXMnIiAlICgiICIuam9pbihjbWQpLCApCisgICAgICAgIGNvbiA9 IGNoZWNrX291dHB1dChjbWQpLnNwbGl0bGluZXMoKVswXQorICAgICAgICBpZiBjb24gIT0gJyc6 IGJyZWFrCisKKyAgICAjIFRlYXIgZG93biB3YXRjaCBhbmQgdGltZXIKKyAgICBzaWduYWwuYWxh cm0oMCkKKyAgICB4c193YXRjaC5raWxsKCkKIAogICAgIGNtZCA9IFsneGwnLCAnY29uc29sZScs IHRlc3RdCiAgICAgcHJpbnQgIkV4ZWN1dGluZyAnJXMnIiAlICgiICIuam9pbihjbWQpLCApCiAg ICAgY29uc29sZSA9IFBvcGVuKGNtZCwgc3Rkb3V0ID0gUElQRSkKKyAgICB3YWl0X2xpc3QuYXBw ZW5kKGNvbnNvbGUpCiAKICAgICBjbWQgPSBbJ3hsJywgJ3VucGF1c2UnLCB0ZXN0XQogICAgIHBy aW50ICJFeGVjdXRpbmcgJyVzJyIgJSAoIiAiLmpvaW4oY21kKSwgKQpAQCAtMzI3LDEyICszNjUs MTcgQEAgZGVmIG1haW4oKToKICAgICBvcHRzLCBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQog CiAgICAgaWYgb3B0cy5saXN0X3Rlc3RzOgotICAgICAgICByZXR1cm4gbGlzdF90ZXN0cyhhcmdz KQorICAgICAgICByZXQgPSBsaXN0X3Rlc3RzKGFyZ3MpCiAgICAgZWxzZToKLSAgICAgICAgcmV0 dXJuIHJ1bl90ZXN0cyhhcmdzKQorICAgICAgICByZXQgPSBydW5fdGVzdHMoYXJncykKKworICAg IGZvciBjaGlsZCBpbiB3YWl0X2xpc3Q6IGNoaWxkLndhaXQoKQorCisgICAgcmV0dXJuIHJldAog CiAKIGlmIF9fbmFtZV9fID09ICJfX21haW5fXyI6CisgICAgc2lnbmFsLnNpZ25hbChzaWduYWwu U0lHQUxSTSwgc2lnYWxybV9oYW5kbGVyKQogICAgIHRyeToKICAgICAgICAgc3lzLmV4aXQobWFp bigpKQogICAgIGV4Y2VwdCBSdW5uZXJFcnJvciwgZToKLS0gCjIuMS40CgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlz dApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVs Cg==