From mboxrd@z Thu Jan 1 00:00:00 1970 From: Razvan Cojocaru Subject: [PATCH] tools/xenstore-watch: Add new timeout parameter Date: Wed, 16 Mar 2016 17:50:46 +0200 Message-ID: <1458143446-18346-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 UmF6dmFuIENvam9jYXJ1IDxyY29qb2NhcnVAYml0ZGVmZW5kZXIuY29tPgotLS0KIHRvb2xzL3hl bnN0b3JlL3hlbnN0b3JlX2NsaWVudC5jIHwgNjQgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ4IGluc2VydGlvbnMoKyksIDE2IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL3hlbnN0b3JlL3hlbnN0b3JlX2NsaWVudC5jIGIv dG9vbHMveGVuc3RvcmUveGVuc3RvcmVfY2xpZW50LmMKaW5kZXggM2QxNGQzNy4uMjg3M2I3MSAx MDA2NDQKLS0tIGEvdG9vbHMveGVuc3RvcmUveGVuc3RvcmVfY2xpZW50LmMKKysrIGIvdG9vbHMv eGVuc3RvcmUveGVuc3RvcmVfY2xpZW50LmMKQEAgLTEyLDYgKzEyLDcgQEAKICNpbmNsdWRlIDxl cnJuby5oPgogI2luY2x1ZGUgPGZjbnRsLmg+CiAjaW5jbHVkZSA8Z2V0b3B0Lmg+CisjaW5jbHVk ZSA8cG9sbC5oPgogI2luY2x1ZGUgPHN0ZGFyZy5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+CiAjaW5j bHVkZSA8c3RkbGliLmg+CkBAIC05OSw3ICsxMDAsNyBAQCB1c2FnZShlbnVtIG1vZGUgbW9kZSwg aW50IGluY2xfbW9kZSwgY29uc3QgY2hhciAqcHJvZ25hbWUpCiAJZXJyeCgxLCAiVXNhZ2U6ICVz ICVzWy1oXSBbLXVdIFstcl0gWy1zXSBrZXkgPG1vZGUgW21vZGVzLi4uXT4iLCBwcm9nbmFtZSwg bXN0cik7CiAgICAgY2FzZSBNT0RFX3dhdGNoOgogCW1zdHIgPSBpbmNsX21vZGUgPyAid2F0Y2gg IiA6ICIiOwotCWVycngoMSwgIlVzYWdlOiAlcyAlc1staF0gWy1uIE5SXSBrZXkiLCBwcm9nbmFt ZSwgbXN0cik7CisJZXJyeCgxLCAiVXNhZ2U6ICVzICVzWy1oXSBbLW4gTlJdIFstVCBUSU1FT1VU XSBrZXkiLCBwcm9nbmFtZSwgbXN0cik7CiAgICAgfQogfQogCkBAIC0yNzMsMjcgKzI3NCw0OSBA QCBkb19jaG1vZChjaGFyICpwYXRoLCBzdHJ1Y3QgeHNfcGVybWlzc2lvbnMgKnBlcm1zLCBpbnQg bnBlcm1zLCBpbnQgdXB0bywKIH0KIAogc3RhdGljIHZvaWQKLWRvX3dhdGNoKHN0cnVjdCB4c19o YW5kbGUgKnhzaCwgaW50IG1heF9ldmVudHMpCitkb193YXRjaChzdHJ1Y3QgeHNfaGFuZGxlICp4 c2gsIGludCBtYXhfZXZlbnRzLCBpbnQgdGltZW91dCkKIHsKLSAgICBpbnQgY291bnQgPSAwOwor ICAgIGludCByYywgbXNfdGltZW91dCA9IHRpbWVvdXQgKiAxMDAwOwogICAgIGNoYXIgKip2ZWMg PSBOVUxMOworICAgIHN0cnVjdCBwb2xsZmQgZmQ7CiAKLSAgICBmb3IgKCBjb3VudCA9IDA7IG1h eF9ldmVudHMgPT0gLTEgfHwgY291bnQgPCBtYXhfZXZlbnRzOyBjb3VudCsrICkgewotCXVuc2ln bmVkIGludCBudW07CisgICAgZmQuZmQgPSB4c19maWxlbm8oeHNoKTsKKyAgICBmZC5ldmVudHMg PSBQT0xMSU4gfCBQT0xMRVJSOwogCi0JdmVjID0geHNfcmVhZF93YXRjaCh4c2gsICZudW0pOwot CWlmICh2ZWMgPT0gTlVMTCkKLQkgICAgY29udGludWU7CisgICAgZG8geworICAgICAgICByYyA9 IHBvbGwoJmZkLCAxLCAxMDApOwogCi0JcHJpbnRmKCIlc1xuIiwgdmVjW1hTX1dBVENIX1BBVEhd KTsKLQlmZmx1c2goc3Rkb3V0KTsKLQlmcmVlKHZlYyk7Ci0gICAgfQorICAgICAgICBpZiAocmMg PT0gMCB8fCAocmMgPCAwICYmIGVycm5vID09IEVJTlRSKSkgeworICAgICAgICAgICAgbXNfdGlt ZW91dCAtPSAxMDA7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorCisgICAgICAg IGlmIChyYyA8IDApIHsKKyAgICAgICAgICAgIGVycigxLCAicG9sbCgpIGZhaWxlZDogJXMiLCBz dHJlcnJvcihlcnJubykpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisKKyAgICAg ICAgaWYgKGZkLnJldmVudHMgJiBQT0xMSU4pIHsKKyAgICAgICAgICAgIHVuc2lnbmVkIGludCBu dW07CisKKyAgICAgICAgICAgIC0tbWF4X2V2ZW50czsKKyAgICAgICAgICAgIHZlYyA9IHhzX3Jl YWRfd2F0Y2goeHNoLCAmbnVtKTsKKworICAgICAgICAgICAgaWYgKHZlYyA9PSBOVUxMKQorICAg ICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBwcmludGYoIiVzXG4iLCB2ZWNb WFNfV0FUQ0hfUEFUSF0pOworICAgICAgICAgICAgZmZsdXNoKHN0ZG91dCk7CisgICAgICAgICAg ICBmcmVlKHZlYyk7CisgICAgICAgIH0KKworICAgIH0gd2hpbGUgKChtc190aW1lb3V0ID4gMCB8 fCB0aW1lb3V0ID09IC0xKSAmJiBtYXhfZXZlbnRzID4gMCk7CiB9CiAKIHN0YXRpYyBpbnQKIHBl cmZvcm0oZW51bSBtb2RlIG1vZGUsIGludCBvcHRpbmQsIGludCBhcmdjLCBjaGFyICoqYXJndiwg c3RydWN0IHhzX2hhbmRsZSAqeHNoLAotICAgICAgICB4c190cmFuc2FjdGlvbl90IHh0aCwgaW50 IHByZWZpeCwgaW50IHRpZHksIGludCB1cHRvLCBpbnQgcmVjdXJzZSwgaW50IG5yX3dhdGNoZXMp CisgICAgICAgIHhzX3RyYW5zYWN0aW9uX3QgeHRoLCBpbnQgcHJlZml4LCBpbnQgdGlkeSwgaW50 IHVwdG8sIGludCByZWN1cnNlLCBpbnQgbnJfd2F0Y2hlcywKKyAgICAgICAgaW50IHRpbWVvdXQp CiB7CiAgICAgc3dpdGNoIChtb2RlKSB7CiAgICAgY2FzZSBNT0RFX2xzOgpAQCAtNDYxLDcgKzQ4 NCw3IEBAIHBlcmZvcm0oZW51bSBtb2RlIG1vZGUsIGludCBvcHRpbmQsIGludCBhcmdjLCBjaGFy ICoqYXJndiwgc3RydWN0IHhzX2hhbmRsZSAqeHNoCiAgICAgICAgICAgICAgICAgaWYgKCF4c193 YXRjaCh4c2gsIHcsIHcpKQogICAgICAgICAgICAgICAgICAgICBlcnJ4KDEsICJVbmFibGUgdG8g YWRkIHdhdGNoIG9uICVzXG4iLCB3KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRvX3dh dGNoKHhzaCwgbnJfd2F0Y2hlcyk7CisgICAgICAgICAgICBkb193YXRjaCh4c2gsIG5yX3dhdGNo ZXMsIHRpbWVvdXQpOwogICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkBAIC01MDUsNiArNTI4 LDcgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAgICAgaW50IHVwdG8gPSAwOwogICAg IGludCByZWN1cnNlID0gMDsKICAgICBpbnQgbnJfd2F0Y2hlcyA9IC0xOworICAgIGludCB0aW1l b3V0ID0gLTE7CiAgICAgaW50IHRyYW5zYWN0aW9uOwogICAgIHN0cnVjdCB3aW5zaXplIHdzOwog ICAgIGVudW0gbW9kZSBtb2RlOwpAQCAtNTM5LDEwICs1NjMsMTEgQEAgbWFpbihpbnQgYXJnYywg Y2hhciAqKmFyZ3YpCiAJICAgIHsidXB0byIsICAgIDAsIDAsICd1J30sIC8qIE1PREVfY2htb2Qg Ki8KIAkgICAgeyJyZWN1cnNlIiwgMCwgMCwgJ3InfSwgLyogTU9ERV9jaG1vZCAqLwogCSAgICB7 Im51bWJlciIsICAxLCAwLCAnbid9LCAvKiBNT0RFX3dhdGNoICovCisJICAgIHsidGltZW91dCIs IDEsIDAsICdUJ30sIC8qIE1PREVfd2F0Y2ggKi8KIAkgICAgezAsIDAsIDAsIDB9CiAJfTsKIAot CWMgPSBnZXRvcHRfbG9uZyhhcmdjIC0gc3dpdGNoX2FyZ3YsIGFyZ3YgKyBzd2l0Y2hfYXJndiwg Imhmc3B0dXJuOiIsCisJYyA9IGdldG9wdF9sb25nKGFyZ2MgLSBzd2l0Y2hfYXJndiwgYXJndiAr IHN3aXRjaF9hcmd2LCAiaGZzcHR1cm46VDoiLAogCQkJbG9uZ19vcHRpb25zLCAmaW5kZXgpOwog CWlmIChjID09IC0xKQogCSAgICBicmVhazsKQEAgLTU5Myw2ICs2MTgsMTIgQEAgbWFpbihpbnQg YXJnYywgY2hhciAqKmFyZ3YpCiAJICAgIGVsc2UKIAkJdXNhZ2UobW9kZSwgc3dpdGNoX2FyZ3Ys IGFyZ3ZbMF0pOwogCSAgICBicmVhazsKKwljYXNlICdUJzoKKwkgICAgaWYgKCBtb2RlID09IE1P REVfd2F0Y2ggKQorCQl0aW1lb3V0ID0gYXRvaShvcHRhcmcpOworCSAgICBlbHNlCisJCXVzYWdl KG1vZGUsIHN3aXRjaF9hcmd2LCBhcmd2WzBdKTsKKwkgICAgYnJlYWs7CiAJfQogICAgIH0KIApA QCAtNjQ2LDcgKzY3Nyw4IEBAIGFnYWluOgogCSAgICBlcnJ4KDEsICJjb3VsZG4ndCBzdGFydCB0 cmFuc2FjdGlvbiIpOwogICAgIH0KIAotICAgIHJldCA9IHBlcmZvcm0obW9kZSwgb3B0aW5kLCBh cmdjIC0gc3dpdGNoX2FyZ3YsIGFyZ3YgKyBzd2l0Y2hfYXJndiwgeHNoLCB4dGgsIHByZWZpeCwg dGlkeSwgdXB0bywgcmVjdXJzZSwgbnJfd2F0Y2hlcyk7CisgICAgcmV0ID0gcGVyZm9ybShtb2Rl LCBvcHRpbmQsIGFyZ2MgLSBzd2l0Y2hfYXJndiwgYXJndiArIHN3aXRjaF9hcmd2LCB4c2gsIHh0 aCwgcHJlZml4LCB0aWR5LCB1cHRvLCByZWN1cnNlLAorICAgICAgICAgICAgICAgICAgbnJfd2F0 Y2hlcywgdGltZW91dCk7CiAKICAgICBpZiAodHJhbnNhY3Rpb24gJiYgIXhzX3RyYW5zYWN0aW9u X2VuZCh4c2gsIHh0aCwgcmV0KSkgewogCWlmIChyZXQgPT0gMCAmJiBlcnJubyA9PSBFQUdBSU4p IHsKLS0gCjEuOS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRw Oi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK