From nobody Tue Nov 26 13:23:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1573595127; cv=none; d=zoho.com; s=zohoarc; b=kASvjayjYWpYy9z1vhWNPsIRs9WLM1vFyLHv7ktRBfMWNPF6uA5cjL3pkyBeUyX+98l9oLOOs5MZhVpq0Fs/RGSuK/z3Xws8uPW/Zvzj84wUr8DD7ofrL1pxvFBZysHLGKvh2cOVYRaVnzU9wGKiPLgadrFTISYRGbdk2Gca1po= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573595127; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GwpSCHQYdyJ1OIULiofZixGUfDNOVtkOMAzqdW+IKas=; b=eTWqFqeF4gSA/knLw2fxIzkohsBPziQqo1NZDkVXB3x4LZ1JRDoqOy0bKI6NkAQmIQJSCSmsWwpQJzKqkJYftf73+FQWQuIGwXhHbdbVZdLOGZK9Y47oY4lEW4WgPVqiLeU8cEQpG7aTW0EJ9dwrqJDTiGa3Km3IBXp8DtiJB6o= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1573595127886504.6961822637011; Tue, 12 Nov 2019 13:45:27 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-376-nmv6FleeN0uhTTMq0iMvkw-1; Tue, 12 Nov 2019 16:45:24 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 779701852E23; Tue, 12 Nov 2019 21:45:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E1F554EE11; Tue, 12 Nov 2019 21:45:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 759574E566; Tue, 12 Nov 2019 21:45:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xACLitdW027037 for ; Tue, 12 Nov 2019 16:44:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id D441A10D16AC; Tue, 12 Nov 2019 21:44:55 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D013A10D16AE for ; Tue, 12 Nov 2019 21:44:54 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 774FF101A55E for ; Tue, 12 Nov 2019 21:44:54 +0000 (UTC) Received: from balrog.mythic-beasts.com (balrog.mythic-beasts.com [46.235.227.24]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-180-reVDepgpPoWDoSieUFYY7A-1; Tue, 12 Nov 2019 16:44:51 -0500 Received: from [199.195.250.187] (port=45790 helo=hermes.aosc.io) by balrog.mythic-beasts.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1iUdxx-0008Er-J1; Tue, 12 Nov 2019 21:44:49 +0000 Received: from liushuyu.lan (unknown [172.22.1.1]) by hermes.aosc.io (Postfix) with ESMTPS id BA5BA41B73; Tue, 12 Nov 2019 21:44:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573595126; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=GwpSCHQYdyJ1OIULiofZixGUfDNOVtkOMAzqdW+IKas=; b=GTXx/qMedWhnq8ltFeiNgcETqDrsc7v1ClzBUdoHqk5ArXtoZvDtJGFV+rX6Xxkzhzs8FM MXMIiIeVYC1Hf2VoNjs+QSTCqtJjfulqXFg+H80/ODp4kW+rinfR3ZRJkHFYc0/oLHNJKu UCcBnpMEcTrfqUqEXof9hZZCMySph/k= From: Zixing Liu To: libvir-list@redhat.com Date: Tue, 12 Nov 2019 14:44:42 -0700 Message-Id: <20191112214445.14541-2-liushuyu@aosc.io> In-Reply-To: <20191112214445.14541-1-liushuyu@aosc.io> References: <20191112214445.14541-1-liushuyu@aosc.io> MIME-Version: 1.0 X-Spamd-Result: default: False [2.90 / 15.00] R_MISSING_CHARSET(2.50)[] BROKEN_CONTENT_TYPE(1.50)[] REPLY(-2.00)[] MID_CONTAINS_FROM(1.00)[] TO_DN_ALL(0.00)[] FROM_EQ_ENVFROM(0.00)[] MAILCOW_MOO(0.00)[] FROM_HAS_DN(0.00)[] TO_MATCH_ENVRCPT_ALL(0.00)[] RCPT_COUNT_THREE(0.00)[3] RCVD_COUNT_TWO(0.00)[2] MIME_GOOD(-0.10)[text/plain] X-Rspamd-Server: rspamd X-Rspamd-Scan-Time: 0.01 X-Rspamd-Queue-ID: BA5BA41B73 X-BlackCat-Spam-Score: 50 X-Spam-Status: No, score=5.0 X-MC-Unique: reVDepgpPoWDoSieUFYY7A-1 X-MC-Unique: nmv6FleeN0uhTTMq0iMvkw-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id xACLitdW027037 X-loop: libvir-list@redhat.com Cc: Zixing Liu , sahid.ferdjaoui@canonical.com Subject: [libvirt] [PATCH Rust 1/4] libvirt-rust: stream: add more functions in stream X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" * added new functions: virStreamNew virStreamEventUpdateCallback virStreamEventRemoveCallback * added new constants: VIR_STREAM_NONBLOCK * added new types/aliases: StreamFlags * changed the previous `new` associate function to `from_ptr` to avoid naming conflicts * added basic tests to test the creation of Stream struct (can not test the correctness of virStreamEventRemoveCallback and virStreamEventUpdateCallback due to "unsupported by the connection driver") Signed-off-by: Zixing Liu --- src/stream.rs | 43 +++++++++++++++++++++++++++++++++++++++++-- tests/stream.rs | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 tests/stream.rs diff --git a/src/stream.rs b/src/stream.rs index 2ca5d0b..de272ab 100644 --- a/src/stream.rs +++ b/src/stream.rs @@ -18,8 +18,9 @@ =20 extern crate libc; =20 +use connect::Connect; +use connect::sys::virConnectPtr; use std::convert::TryFrom; -use std::str; =20 use error::Error; =20 @@ -32,6 +33,9 @@ pub mod sys { =20 #[link(name =3D "virt")] extern "C" { + fn virStreamNew(c: virConnectPtr, + flags: libc::c_uint) + -> sys::virStreamPtr; fn virStreamSend(c: sys::virStreamPtr, data: *const libc::c_char, nbytes: libc::size_t) @@ -43,6 +47,9 @@ extern "C" { fn virStreamFree(c: sys::virStreamPtr) -> libc::c_int; fn virStreamAbort(c: sys::virStreamPtr) -> libc::c_int; fn virStreamFinish(c: sys::virStreamPtr) -> libc::c_int; + fn virStreamEventUpdateCallback(c: sys::virStreamPtr, + events: libc::c_int) -> libc::c_int; + fn virStreamEventRemoveCallback(c: sys::virStreamPtr) -> libc::c_int; } =20 pub type StreamEventType =3D self::libc::c_uint; @@ -51,6 +58,9 @@ pub const VIR_STREAM_EVENT_WRITABLE: StreamEventType =3D = (1 << 1); pub const VIR_STREAM_EVENT_ERROR: StreamEventType =3D (1 << 2); pub const VIR_STREAM_EVENT_HANGUP: StreamEventType =3D (1 << 3); =20 +pub type StreamFlags =3D self::libc::c_uint; +pub const VIR_STREAM_NONBLOCK: StreamFlags =3D (1 << 0); + #[derive(Debug)] pub struct Stream { ptr: Option, @@ -69,7 +79,17 @@ impl Drop for Stream { } =20 impl Stream { - pub fn new(ptr: sys::virStreamPtr) -> Stream { + pub fn new(conn: &Connect, flags: StreamFlags) -> Result { + unsafe { + let ptr =3D virStreamNew(conn.as_ptr(), flags as libc::c_uint); + if ptr.is_null() { + return Err(Error::new()); + } + return Ok(Stream::from_ptr(ptr)); + } + } + + pub fn from_ptr(ptr: sys::virStreamPtr) -> Stream { Stream { ptr: Some(ptr) } } =20 @@ -126,4 +146,23 @@ impl Stream { }; usize::try_from(ret).map_err(|_| Error::new()) } + + pub fn event_update_callback(&self, events: StreamEventType) -> Result= <(), Error> { + let ret =3D unsafe { + virStreamEventUpdateCallback(self.as_ptr(), events as libc::c_= int) + }; + if ret =3D=3D -1 { + return Err(Error::new()); + } + return Ok(()); + } + + pub fn event_remove_callback(&self) -> Result<(), Error> { + unsafe { + if virStreamEventRemoveCallback(self.as_ptr()) =3D=3D -1 { + return Err(Error::new()); + } + return Ok(()); + } + } } diff --git a/tests/stream.rs b/tests/stream.rs new file mode 100644 index 0000000..16531b3 --- /dev/null +++ b/tests/stream.rs @@ -0,0 +1,40 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + * + * Sahid Orentino Ferdjaoui + */ + +extern crate virt; + +mod common; + +use virt::stream::Stream; +use virt::stream::VIR_STREAM_NONBLOCK; + +#[test] +fn test_create_blocking() { + let c =3D common::conn(); + let s =3D Stream::new(&c, 0).unwrap(); + drop(s); + common::close(c); +} + +#[test] +fn test_create_non_blocking() { + let c =3D common::conn(); + let s =3D Stream::new(&c, VIR_STREAM_NONBLOCK).unwrap(); + drop(s); + common::close(c); +} --=20 2.24.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list