From mboxrd@z Thu Jan 1 00:00:00 1970 From: Razvan Cojocaru Subject: [PATCH V2] tools/xenstore-watch: Add new timeout parameter Date: Thu, 17 Mar 2016 10:55:10 +0200 Message-ID: <1458204910-8144-1-git-send-email-rcojocaru@bitdefender.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: wei.liu2@citrix.com, ian.jackson@eu.citrix.com, Razvan Cojocaru , stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCBhbGxvd3MgeGVuc3RvcmUtd2F0Y2ggdG8gZXhpdCBldmVuIGlmIG5vIGNoYW5n ZXMgdG8gaXRzClhlblN0b3JlIGtleSBoYXZlIG9jY3VyZWQgaW4gYSBzcGVjaWZpZWQgaW50ZXJ2 YWwgKGluIHNlY29uZHMpLCB2aWEKYSBuZXcgLVQgcGFyYW1ldGVyLgoKU2lnbmVkLW9mZi1ieTog UmF6dmFuIENvam9jYXJ1IDxyY29qb2NhcnVAYml0ZGVmZW5kZXIuY29tPgoKLS0tCkNoYW5nZXMg c2luY2UgVjE6CiAtIEV4aXRpbmcgdGhlIHRpbWVvdXQgbG9vcCBldmVuIG9uIEVJTlRSLgotLS0K IHRvb2xzL3hlbnN0b3JlL3hlbnN0b3JlX2NsaWVudC5jIHwgNjQgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ4IGluc2VydGlvbnMoKyks IDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL3hlbnN0b3JlL3hlbnN0b3JlX2Ns aWVudC5jIGIvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVfY2xpZW50LmMKaW5kZXggM2QxNGQzNy4u Njc4ODE1OCAxMDA2NDQKLS0tIGEvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVfY2xpZW50LmMKKysr IGIvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVfY2xpZW50LmMKQEAgLTEyLDYgKzEyLDcgQEAKICNp bmNsdWRlIDxlcnJuby5oPgogI2luY2x1ZGUgPGZjbnRsLmg+CiAjaW5jbHVkZSA8Z2V0b3B0Lmg+ CisjaW5jbHVkZSA8cG9sbC5oPgogI2luY2x1ZGUgPHN0ZGFyZy5oPgogI2luY2x1ZGUgPHN0ZGlv Lmg+CiAjaW5jbHVkZSA8c3RkbGliLmg+CkBAIC05OSw3ICsxMDAsNyBAQCB1c2FnZShlbnVtIG1v ZGUgbW9kZSwgaW50IGluY2xfbW9kZSwgY29uc3QgY2hhciAqcHJvZ25hbWUpCiAJZXJyeCgxLCAi VXNhZ2U6ICVzICVzWy1oXSBbLXVdIFstcl0gWy1zXSBrZXkgPG1vZGUgW21vZGVzLi4uXT4iLCBw cm9nbmFtZSwgbXN0cik7CiAgICAgY2FzZSBNT0RFX3dhdGNoOgogCW1zdHIgPSBpbmNsX21vZGUg PyAid2F0Y2ggIiA6ICIiOwotCWVycngoMSwgIlVzYWdlOiAlcyAlc1staF0gWy1uIE5SXSBrZXki LCBwcm9nbmFtZSwgbXN0cik7CisJZXJyeCgxLCAiVXNhZ2U6ICVzICVzWy1oXSBbLW4gTlJdIFst VCBUSU1FT1VUXSBrZXkiLCBwcm9nbmFtZSwgbXN0cik7CiAgICAgfQogfQogCkBAIC0yNzMsMjcg KzI3NCw0OSBAQCBkb19jaG1vZChjaGFyICpwYXRoLCBzdHJ1Y3QgeHNfcGVybWlzc2lvbnMgKnBl cm1zLCBpbnQgbnBlcm1zLCBpbnQgdXB0bywKIH0KIAogc3RhdGljIHZvaWQKLWRvX3dhdGNoKHN0 cnVjdCB4c19oYW5kbGUgKnhzaCwgaW50IG1heF9ldmVudHMpCitkb193YXRjaChzdHJ1Y3QgeHNf aGFuZGxlICp4c2gsIGludCBtYXhfZXZlbnRzLCBpbnQgdGltZW91dCkKIHsKLSAgICBpbnQgY291 bnQgPSAwOworICAgIGludCByYywgbXNfdGltZW91dCA9IHRpbWVvdXQgKiAxMDAwOwogICAgIGNo YXIgKip2ZWMgPSBOVUxMOworICAgIHN0cnVjdCBwb2xsZmQgZmQ7CiAKLSAgICBmb3IgKCBjb3Vu dCA9IDA7IG1heF9ldmVudHMgPT0gLTEgfHwgY291bnQgPCBtYXhfZXZlbnRzOyBjb3VudCsrICkg ewotCXVuc2lnbmVkIGludCBudW07CisgICAgZmQuZmQgPSB4c19maWxlbm8oeHNoKTsKKyAgICBm ZC5ldmVudHMgPSBQT0xMSU4gfCBQT0xMRVJSOwogCi0JdmVjID0geHNfcmVhZF93YXRjaCh4c2gs ICZudW0pOwotCWlmICh2ZWMgPT0gTlVMTCkKLQkgICAgY29udGludWU7CisgICAgZG8geworICAg ICAgICByYyA9IHBvbGwoJmZkLCAxLCAxMDApOwogCi0JcHJpbnRmKCIlc1xuIiwgdmVjW1hTX1dB VENIX1BBVEhdKTsKLQlmZmx1c2goc3Rkb3V0KTsKLQlmcmVlKHZlYyk7Ci0gICAgfQorICAgICAg ICBpZiAocmMgPT0gMCkgeworICAgICAgICAgICAgbXNfdGltZW91dCAtPSAxMDA7CisgICAgICAg ICAgICBjb250aW51ZTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChyYyA8IDApIHsKKyAgICAg ICAgICAgIGVycigxLCAicG9sbCgpIGZhaWxlZDogJXMiLCBzdHJlcnJvcihlcnJubykpOworICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGZkLnJldmVudHMgJiBQ T0xMSU4pIHsKKyAgICAgICAgICAgIHVuc2lnbmVkIGludCBudW07CisKKyAgICAgICAgICAgIC0t bWF4X2V2ZW50czsKKyAgICAgICAgICAgIHZlYyA9IHhzX3JlYWRfd2F0Y2goeHNoLCAmbnVtKTsK KworICAgICAgICAgICAgaWYgKHZlYyA9PSBOVUxMKQorICAgICAgICAgICAgICAgIGNvbnRpbnVl OworCisgICAgICAgICAgICBwcmludGYoIiVzXG4iLCB2ZWNbWFNfV0FUQ0hfUEFUSF0pOworICAg ICAgICAgICAgZmZsdXNoKHN0ZG91dCk7CisgICAgICAgICAgICBmcmVlKHZlYyk7CisgICAgICAg IH0KKworICAgIH0gd2hpbGUgKChtc190aW1lb3V0ID4gMCB8fCB0aW1lb3V0ID09IC0xKSAmJiBt YXhfZXZlbnRzID4gMCk7CiB9CiAKIHN0YXRpYyBpbnQKIHBlcmZvcm0oZW51bSBtb2RlIG1vZGUs IGludCBvcHRpbmQsIGludCBhcmdjLCBjaGFyICoqYXJndiwgc3RydWN0IHhzX2hhbmRsZSAqeHNo LAotICAgICAgICB4c190cmFuc2FjdGlvbl90IHh0aCwgaW50IHByZWZpeCwgaW50IHRpZHksIGlu dCB1cHRvLCBpbnQgcmVjdXJzZSwgaW50IG5yX3dhdGNoZXMpCisgICAgICAgIHhzX3RyYW5zYWN0 aW9uX3QgeHRoLCBpbnQgcHJlZml4LCBpbnQgdGlkeSwgaW50IHVwdG8sIGludCByZWN1cnNlLCBp bnQgbnJfd2F0Y2hlcywKKyAgICAgICAgaW50IHRpbWVvdXQpCiB7CiAgICAgc3dpdGNoIChtb2Rl KSB7CiAgICAgY2FzZSBNT0RFX2xzOgpAQCAtNDYxLDcgKzQ4NCw3IEBAIHBlcmZvcm0oZW51bSBt b2RlIG1vZGUsIGludCBvcHRpbmQsIGludCBhcmdjLCBjaGFyICoqYXJndiwgc3RydWN0IHhzX2hh bmRsZSAqeHNoCiAgICAgICAgICAgICAgICAgaWYgKCF4c193YXRjaCh4c2gsIHcsIHcpKQogICAg ICAgICAgICAgICAgICAgICBlcnJ4KDEsICJVbmFibGUgdG8gYWRkIHdhdGNoIG9uICVzXG4iLCB3 KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRvX3dhdGNoKHhzaCwgbnJfd2F0Y2hlcyk7 CisgICAgICAgICAgICBkb193YXRjaCh4c2gsIG5yX3dhdGNoZXMsIHRpbWVvdXQpOwogICAgICAg ICB9CiAgICAgICAgIH0KICAgICB9CkBAIC01MDUsNiArNTI4LDcgQEAgbWFpbihpbnQgYXJnYywg Y2hhciAqKmFyZ3YpCiAgICAgaW50IHVwdG8gPSAwOwogICAgIGludCByZWN1cnNlID0gMDsKICAg ICBpbnQgbnJfd2F0Y2hlcyA9IC0xOworICAgIGludCB0aW1lb3V0ID0gLTE7CiAgICAgaW50IHRy YW5zYWN0aW9uOwogICAgIHN0cnVjdCB3aW5zaXplIHdzOwogICAgIGVudW0gbW9kZSBtb2RlOwpA QCAtNTM5LDEwICs1NjMsMTEgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJICAgIHsi dXB0byIsICAgIDAsIDAsICd1J30sIC8qIE1PREVfY2htb2QgKi8KIAkgICAgeyJyZWN1cnNlIiwg MCwgMCwgJ3InfSwgLyogTU9ERV9jaG1vZCAqLwogCSAgICB7Im51bWJlciIsICAxLCAwLCAnbid9 LCAvKiBNT0RFX3dhdGNoICovCisJICAgIHsidGltZW91dCIsIDEsIDAsICdUJ30sIC8qIE1PREVf d2F0Y2ggKi8KIAkgICAgezAsIDAsIDAsIDB9CiAJfTsKIAotCWMgPSBnZXRvcHRfbG9uZyhhcmdj IC0gc3dpdGNoX2FyZ3YsIGFyZ3YgKyBzd2l0Y2hfYXJndiwgImhmc3B0dXJuOiIsCisJYyA9IGdl dG9wdF9sb25nKGFyZ2MgLSBzd2l0Y2hfYXJndiwgYXJndiArIHN3aXRjaF9hcmd2LCAiaGZzcHR1 cm46VDoiLAogCQkJbG9uZ19vcHRpb25zLCAmaW5kZXgpOwogCWlmIChjID09IC0xKQogCSAgICBi cmVhazsKQEAgLTU5Myw2ICs2MTgsMTIgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJ ICAgIGVsc2UKIAkJdXNhZ2UobW9kZSwgc3dpdGNoX2FyZ3YsIGFyZ3ZbMF0pOwogCSAgICBicmVh azsKKwljYXNlICdUJzoKKwkgICAgaWYgKCBtb2RlID09IE1PREVfd2F0Y2ggKQorCQl0aW1lb3V0 ID0gYXRvaShvcHRhcmcpOworCSAgICBlbHNlCisJCXVzYWdlKG1vZGUsIHN3aXRjaF9hcmd2LCBh cmd2WzBdKTsKKwkgICAgYnJlYWs7CiAJfQogICAgIH0KIApAQCAtNjQ2LDcgKzY3Nyw4IEBAIGFn YWluOgogCSAgICBlcnJ4KDEsICJjb3VsZG4ndCBzdGFydCB0cmFuc2FjdGlvbiIpOwogICAgIH0K IAotICAgIHJldCA9IHBlcmZvcm0obW9kZSwgb3B0aW5kLCBhcmdjIC0gc3dpdGNoX2FyZ3YsIGFy Z3YgKyBzd2l0Y2hfYXJndiwgeHNoLCB4dGgsIHByZWZpeCwgdGlkeSwgdXB0bywgcmVjdXJzZSwg bnJfd2F0Y2hlcyk7CisgICAgcmV0ID0gcGVyZm9ybShtb2RlLCBvcHRpbmQsIGFyZ2MgLSBzd2l0 Y2hfYXJndiwgYXJndiArIHN3aXRjaF9hcmd2LCB4c2gsIHh0aCwgcHJlZml4LCB0aWR5LCB1cHRv LCByZWN1cnNlLAorICAgICAgICAgICAgICAgICAgbnJfd2F0Y2hlcywgdGltZW91dCk7CiAKICAg ICBpZiAodHJhbnNhY3Rpb24gJiYgIXhzX3RyYW5zYWN0aW9uX2VuZCh4c2gsIHh0aCwgcmV0KSkg ewogCWlmIChyZXQgPT0gMCAmJiBlcnJubyA9PSBFQUdBSU4pIHsKLS0gCjEuOS4xCgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxp bmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9yZy94ZW4t ZGV2ZWwK