From patchwork Sun Feb 7 18:40:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 2643 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Sun, 07 Feb 2010 18:39:55 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Sun, 07 Feb 2010 20:37:39 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NeC31-0004eA-4L; Sun, 07 Feb 2010 18:39:55 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932818Ab0BGSjw (ORCPT + 1 other); Sun, 7 Feb 2010 13:39:52 -0500 Received: from smtp.nokia.com ([192.100.122.233]:52382 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932710Ab0BGSju (ORCPT ); Sun, 7 Feb 2010 13:39:50 -0500 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o17IdkDZ003134; Sun, 7 Feb 2010 20:39:47 +0200 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Sun, 7 Feb 2010 20:39:45 +0200 Received: from mgw-sa02.ext.nokia.com ([147.243.1.48]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Sun, 7 Feb 2010 20:39:46 +0200 Received: from maxwell.research.nokia.com (maxwell.research.nokia.com [172.21.50.162]) by mgw-sa02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o17Idix7032117 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 7 Feb 2010 20:39:44 +0200 Received: from lanttu (unknown [192.168.239.74]) by maxwell.research.nokia.com (Postfix) with ESMTPS id 525D470088; Sun, 7 Feb 2010 20:39:44 +0200 (EET) Received: from sakke by lanttu with local (Exim 4.69) (envelope-from ) id 1NeC3u-000863-52; Sun, 07 Feb 2010 20:40:50 +0200 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, iivanov@mm-sol.com, gururaj.nagendra@intel.com, david.cohen@nokia.com, Sakari Ailus Subject: [PATCH v2 6/7] V4L: Events: Sequence numbers Date: Sun, 7 Feb 2010 20:40:46 +0200 Message-Id: <1265568047-31073-6-git-send-email-sakari.ailus@maxwell.research.nokia.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <4B6F0922.9070206@maxwell.research.nokia.com> References: <4B6F0922.9070206@maxwell.research.nokia.com> X-OriginalArrivalTime: 07 Feb 2010 18:39:46.0191 (UTC) FILETIME=[EBCDE9F0:01CAA824] X-Nokia-AV: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add sequence numbers to events. Signed-off-by: Sakari Ailus --- drivers/media/video/v4l2-event.c | 15 ++++++++++++--- include/media/v4l2-event.h | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/v4l2-event.c b/drivers/media/video/v4l2-event.c index a95cde0..cd744d0 100644 --- a/drivers/media/video/v4l2-event.c +++ b/drivers/media/video/v4l2-event.c @@ -89,6 +89,7 @@ int v4l2_event_init(struct v4l2_fh *fh, unsigned int n) INIT_LIST_HEAD(&fh->events->subscribed); atomic_set(&fh->events->navailable, 0); + atomic_set(&fh->events->sequence, -1); ret = v4l2_event_alloc(fh, n); if (ret < 0) @@ -166,15 +167,23 @@ void v4l2_event_queue(struct video_device *vdev, struct v4l2_event *ev) list_for_each_entry(fh, &vdev->fhs.list, list) { struct v4l2_events *events = fh->events; struct v4l2_kevent *kev; + u32 sequence; - /* Do we have any free events and are we subscribed? */ - if (list_empty(&events->free) || - !__v4l2_event_subscribed(fh, ev->type)) + /* Are we subscribed? */ + if (!__v4l2_event_subscribed(fh, ev->type)) + continue; + + /* Increase event sequence number on fh. */ + sequence = atomic_inc_return(&events->sequence); + + /* Do we have any free events? */ + if (list_empty(&events->free)) continue; /* Take one and fill it. */ kev = list_first_entry(&events->free, struct v4l2_kevent, list); kev->event = *ev; + kev->event.sequence = sequence; list_move_tail(&kev->list, &events->available); atomic_inc(&events->navailable); diff --git a/include/media/v4l2-event.h b/include/media/v4l2-event.h index 282d215..3db0c3b 100644 --- a/include/media/v4l2-event.h +++ b/include/media/v4l2-event.h @@ -49,6 +49,7 @@ struct v4l2_events { struct list_head available; /* Dequeueable event */ atomic_t navailable; struct list_head free; /* Events ready for use */ + atomic_t sequence; }; int v4l2_event_alloc(struct v4l2_fh *fh, unsigned int n);