From nobody Tue Nov 26 13:53:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=KA449g0j22eumqfAtfZaa0uGO3q13bTt5WVprpiUgUVztVYUA+0KxV0GguRTfdClEPeOR0700D8sjeJO0o9rafCdQlGnhOLOsb/w2GUo6/wY3UeBwl9Dvguc865o9AzevLGq9mcIxuMNJIpwQOIfmtX5Ih0WFwi2KPby/qP+Uqo= 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=Mgnn1iZxNt/J+4e7qbj311T7vIOl+pNV4w4XxXsHV14=; b=eYuvIN66IZr0B5soErOMcJwNblZhlQ8wRoxBsfw4GaUK3bJB/AEFkYVQ/XO8Qup521D6tGqn3jr0whEUSGiO5HxzwtO91TeMwxBaHud8cPzMWRftOteFppRaRWDc2SuVuqGDQdDKTHQTCZxaNDowpjVfL6H1PM78FRvhwajJWLo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1573595127284859.6346076962651; 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-241-8AocmhrjM_uRGZrQ__Pd1Q-1; Tue, 12 Nov 2019 16:45:23 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2DEA8800A1E; 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 F39B34D713; 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 7C8BB4E567; 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 xACLitl5027036 for ; Tue, 12 Nov 2019 16:44:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id D208010D16B8; Tue, 12 Nov 2019 21:44:55 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CD4D210D16AD for ; Tue, 12 Nov 2019 21:44:53 +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 B2D528E3866 for ; Tue, 12 Nov 2019 21:44:53 +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-208-FDF5fMukM96yeThXQhwgvw-1; Tue, 12 Nov 2019 16:44:51 -0500 Received: from [199.195.250.187] (port=45797 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 1iUdxy-0008Ko-CR; Tue, 12 Nov 2019 21:44:50 +0000 Received: from liushuyu.lan (unknown [172.22.1.1]) by hermes.aosc.io (Postfix) with ESMTPS id E035241B78; Tue, 12 Nov 2019 21:44:48 +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=Mgnn1iZxNt/J+4e7qbj311T7vIOl+pNV4w4XxXsHV14=; b=ClAfMrz8neXuq5195Wn3mao2kgzlwwG7asFrmRd0z5pUdaQJGcsuR07B4Ywgifq1kYoUrU ixfhk4oUSE2LaswVeLyJl5okw8gocVQX1JHYe2xL3ma1Pc2Lrinh2J4sBv+Pylwouszr7f uHRMIra+pvkrnYI5Qj6iLu5t8NEcnFI= From: Zixing Liu To: libvir-list@redhat.com Date: Tue, 12 Nov 2019 14:44:43 -0700 Message-Id: <20191112214445.14541-3-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: E035241B78 X-BlackCat-Spam-Score: 50 X-Spam-Status: No, score=5.0 X-MC-Unique: FDF5fMukM96yeThXQhwgvw-1 X-MC-Unique: 8AocmhrjM_uRGZrQ__Pd1Q-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 xACLitl5027036 X-loop: libvir-list@redhat.com Cc: Zixing Liu , sahid.ferdjaoui@canonical.com Subject: [libvirt] [PATCH Rust 2/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.16 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 virStreamEventAddCallback function * added new types: StreamEventCallback and FreeCallback * added new field: callback for storing event callback * drop: will drop the Box if any * added wrapper event_callback for easier callback authoring for the user (so that closures with Fn or FnMut references could be used) * added padding function event_free to just makes it compile (Rust should not need this, because Rust sticks to RAII) Signed-off-by: Zixing Liu --- src/stream.rs | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/stream.rs b/src/stream.rs index de272ab..1ffd186 100644 --- a/src/stream.rs +++ b/src/stream.rs @@ -47,6 +47,12 @@ 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 virStreamEventAddCallback(c: sys::virStreamPtr, + event: libc::c_int, + callback: StreamEventCallback, + opaque: *const libc::c_void, + ff: FreeCallback) + -> libc::c_int; fn virStreamEventUpdateCallback(c: sys::virStreamPtr, events: libc::c_int) -> libc::c_int; fn virStreamEventRemoveCallback(c: sys::virStreamPtr) -> libc::c_int; @@ -61,9 +67,26 @@ pub const VIR_STREAM_EVENT_HANGUP: StreamEventType =3D (= 1 << 3); pub type StreamFlags =3D self::libc::c_uint; pub const VIR_STREAM_NONBLOCK: StreamFlags =3D (1 << 0); =20 -#[derive(Debug)] +pub type StreamEventCallback =3D extern "C" fn(sys::virStreamPtr, libc::c_= int, *const libc::c_void); +pub type FreeCallback =3D extern "C" fn(*mut libc::c_void); + +// wrapper for callbacks +extern "C" fn event_callback(c: sys::virStreamPtr, flags: libc::c_int, opa= que: *const libc::c_void) { + let flags =3D flags as StreamFlags; + let shadow_self =3D unsafe { + &mut*(opaque as *mut Stream) + }; + if let Some(callback) =3D &mut shadow_self.callback { + callback(&Stream::from_ptr(c), flags); + } +} + +extern "C" fn event_free(_opaque: *mut libc::c_void) {} + +// #[derive(Debug)] pub struct Stream { ptr: Option, + callback: Option>, } =20 impl Drop for Stream { @@ -75,6 +98,13 @@ impl Drop for Stream { e.message) } } + if self.callback.is_some() { + if let Err(e) =3D self.event_remove_callback() { + panic!("Unable to remove event callback for Stream, code {= }, message: {}", + e.code, + e.message) + } + } } } =20 @@ -90,7 +120,7 @@ impl Stream { } =20 pub fn from_ptr(ptr: sys::virStreamPtr) -> Stream { - Stream { ptr: Some(ptr) } + Stream { ptr: Some(ptr), callback: None } } =20 pub fn as_ptr(&self) -> sys::virStreamPtr { @@ -147,6 +177,18 @@ impl Stream { usize::try_from(ret).map_err(|_| Error::new()) } =20 + pub fn event_add_callback(&mut self, events: StreamEventType, cb: F) -> Result<(), Error> { + let ret =3D unsafe { + let ptr =3D &*self as *const _ as *const _; + virStreamEventAddCallback(self.as_ptr(), events as libc::c_int= , event_callback, ptr, event_free) + }; + if ret =3D=3D -1 { + return Err(Error::new()); + } + self.callback =3D Some(Box::new(cb)); + return Ok(()); + } + pub fn event_update_callback(&self, events: StreamEventType) -> Result= <(), Error> { let ret =3D unsafe { virStreamEventUpdateCallback(self.as_ptr(), events as libc::c_= int) --=20 2.24.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list