Menu
▾
▴
[Pyscard-devel] SF.net SVN: pyscard:[210] trunk/pyscard
|
From: <jda...@us...> - 2008-08-14 15:10:41
|
Revision: 210
http://pyscard.svn.sourceforge.net/pyscard/?rev=210&view=rev
Author: jdaussel
Date: 2008-08-14 15:10:48 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
Updated ReaderMonitoring logics
Modified Paths:
--------------
trunk/pyscard/src/smartcard/ReaderMonitoring.py
trunk/pyscard/tools/vslick/pyscard.vpj
Modified: trunk/pyscard/src/smartcard/ReaderMonitoring.py
===================================================================
--- trunk/pyscard/src/smartcard/ReaderMonitoring.py 2008-08-14 15:08:16 UTC (rev 209)
+++ trunk/pyscard/src/smartcard/ReaderMonitoring.py 2008-08-14 15:10:48 UTC (rev 210)
@@ -1,210 +1,222 @@
-"""Smart card reader monitoring classes.
-
-ReaderObserver is a base class for objects that are to be notified
-upon smartcard reader insertion/removal.
-
-ReaderMonitor is a singleton object notifying registered ReaderObservers
-upon reader insertion/removal.
-
-__author__ = "http://www.gemalto.com"
-
-Copyright 2001-2008 gemalto
-Author: Jean-Daniel Aussel, mailto:jea...@ge...
-
-This file is part of pyscard.
-
-pyscard 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.
-
-pyscard 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 pyscard; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-"""
-
-from sys import exc_info
-from threading import Thread, Event, enumerate
-from time import sleep
-
-from smartcard.System import readers
-from smartcard.Exceptions import ListReadersException
-from smartcard.Observer import Observer
-from smartcard.Observer import Observable
-
-# ReaderObserver interface
-class ReaderObserver(Observer):
- """
- ReaderObserver is a base abstract class for objects that are to be notified
- upon smartcard reader insertion/removal.
- """
- def __init__(self):
- pass
- def update( self, observable, (addedreaders, removedreaders) ):
- """Called upon reader insertion/removal.
-
- observable:
- addedreaders: list of added readers causing notification
- removedreaders: list of removed readers causing notification
- """
- pass
-
-class ReaderMonitor( Observable ):
- """Class that monitors reader insertion/removal.
- and notify observers
-
- note: a reader monitoring thread will be running
- as long as the reader monitor has observers, or ReaderMonitor.stop()
- is called.
-
- It implements the shared state design pattern, where objects
- of the same type all share the same state, in our case essentially
- the ReaderMonitoring Thread.
- """
-
-
- __shared_state = {}
-
- def __init__( self, startOnDemand=True ):
- self.__dict__ = self.__shared_state
- Observable.__init__( self )
- self.startOnDemand = startOnDemand
- if self.startOnDemand:
- self.rmthread=None
- else:
- self.rmthread = ReaderMonitoringThread( self )
- self.rmthread.start()
-
- def addObserver( self, observer ):
- """Add an observer."""
- Observable.addObserver( self, observer )
-
- # If self.startOnDemand is True, the reader monitoring
- # thread only runs when there are observers.
- if self.startOnDemand:
- if 0<self.countObservers():
- if not self.rmthread:
- self.rmthread = ReaderMonitoringThread( self )
-
- # start reader monitoring thread in another thread to
- # avoid a deadlock; addObserver and notifyObservers called
- # in the ReaderMonitoringThread run() method are synchronized
- import thread
- thread.start_new_thread( self.rmthread.start, () )
- else:
- observer.update( self, (self.rmthread.readers, []) )
-
- def deleteObserver( self, observer ):
- """Remove an observer."""
- Observable.deleteObserver( self, observer )
- # If self.startOnDemand is True, the reader monitoring
- # thread is stopped when there are no more observers.
- if self.startOnDemand:
- if 0==self.countObservers():
- self.rmthread.stop()
- del self.rmthread
- self.rmthread = None
-
- def __str__(self):
- return self.__class__.__name__
-
-class ReaderMonitoringThread(Thread):
- """Reader insertion thread.
- This thread polls for pcsc reader insertion, since no
- reader insertion event is available in pcsc.
- """
-
-
- __shared_state = {}
- def __init__( self, observable ):
- self.__dict__ = self.__shared_state
- Thread.__init__( self )
- self.observable = observable
- self.stopEvent = Event()
- self.stopEvent.clear()
- self.readers = []
- self.setDaemon( True )
- self.setName( 'smartcard.ReaderMonitoringThread' )
-
- def run(self):
- """Runs until stopEvent is notified, and notify
- observers of all reader insertion/removal.
- """
- while not self.stopEvent.isSet():
- try:
- # no need to monitor if no observers
- if 0<self.observable.countObservers():
- currentReaders = readers()
- addedReaders = []
- removedReaders = []
-
- if currentReaders != self.readers:
- for reader in currentReaders:
- if not reader in self.readers:
- addedReaders.append(reader)
- for reader in self.readers:
- if not reader in currentReaders:
- removedReaders.append(reader)
-
- if addedReaders or removedReaders:
- # Notify observers
- self.readers = currentReaders
- self.observable.setChanged()
- self.observable.notifyObservers((addedReaders, removedReaders))
-
- # wait every second on stopEvent
- self.stopEvent.wait(1)
-
- except Exception, e:
- # Most likely raised during interpreter shutdown due
- # to unclean exit which failed to remove all observers.
- # To solve this, we set the stop event and pass the
- # exception to let the thread finish gracefully.
- self.stopEvent.set()
-
- def stop(self):
- self.stopEvent.set()
- self.join()
-
-
-
-if __name__ == "__main__":
- from smartcard.ReaderMonitoring import ReaderMonitor
- print 'insert or remove readers in the next 10 seconds'
-
- # a simple reader observer that prints added/removed readers
- class printobserver( ReaderObserver ):
- def __init__( self, obsindex ):
- self.obsindex=obsindex
-
- def update( self, observable, (addedreaders, removedreaders) ):
- print "%d - added: " % self.obsindex, addedreaders
- print "%d - removed: " % self.obsindex, removedreaders
-
- class testthread( Thread ):
- def __init__(self, obsindex ):
- Thread.__init__(self)
- self.readermonitor = ReaderMonitor()
- self.obsindex = obsindex
- self.observer=None
-
- def run(self):
- # create and register observer
- self.observer = printobserver( self.obsindex )
- self.readermonitor.addObserver(self.observer)
- sleep(10)
- self.readermonitor.deleteObserver(self.observer)
-
- t1 = testthread(1)
- t2 = testthread(2)
- t1.start()
- t2.start()
- t1.join()
- t2.join()
-
-
+"""Smart card reader monitoring classes.
+
+ReaderObserver is a base class for objects that are to be notified
+upon smartcard reader insertion/removal.
+
+ReaderMonitor is a singleton object notifying registered ReaderObservers
+upon reader insertion/removal.
+
+__author__ = "http://www.gemalto.com"
+
+Copyright 2001-2008 gemalto
+Author: Jean-Daniel Aussel, mailto:jea...@ge...
+
+This file is part of pyscard.
+
+pyscard 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.
+
+pyscard 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 pyscard; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+"""
+
+from sys import exc_info
+from threading import Thread, Event, enumerate
+from time import sleep
+
+import smartcard.System
+from smartcard.Exceptions import ListReadersException
+from smartcard.Observer import Observer
+from smartcard.Observer import Observable
+from smartcard.Synchronization import *
+
+
+# ReaderObserver interface
+class ReaderObserver(Observer):
+ """
+ ReaderObserver is a base abstract class for objects that are to be notified
+ upon smartcard reader insertion/removal.
+ """
+ def __init__(self):
+ pass
+ def update( self, observable, (addedreaders, removedreaders) ):
+ """Called upon reader insertion/removal.
+
+ observable:
+ addedreaders: list of added readers causing notification
+ removedreaders: list of removed readers causing notification
+ """
+ pass
+
+class ReaderMonitor( Observable ):
+ """Class that monitors reader insertion/removal.
+ and notify observers
+
+ note: a reader monitoring thread will be running
+ as long as the reader monitor has observers, or ReaderMonitor.stop()
+ is called.
+
+ It implements the shared state design pattern, where objects
+ of the same type all share the same state, in our case essentially
+ the ReaderMonitoring Thread. Thanks to Frank Aune for implementing
+ the shared state pattern logics.
+ """
+
+
+ __shared_state = {}
+
+ def __init__( self, startOnDemand=True, readerProc=smartcard.System.readers, period=1 ):
+ self.__dict__ = self.__shared_state
+ Observable.__init__( self )
+ self.startOnDemand = startOnDemand
+ self.readerProc = readerProc
+ self.period = period
+ if self.startOnDemand:
+ self.rmthread=None
+ else:
+ self.rmthread = ReaderMonitoringThread( self, self.readerProc, self.period )
+ self.rmthread.start()
+
+ def addObserver( self, observer ):
+ """Add an observer."""
+ Observable.addObserver( self, observer )
+
+ # If self.startOnDemand is True, the reader monitoring
+ # thread only runs when there are observers.
+ if self.startOnDemand:
+ if 0<self.countObservers():
+ if not self.rmthread:
+ self.rmthread = ReaderMonitoringThread( self, self.readerProc, self.period )
+
+ # start reader monitoring thread in another thread to
+ # avoid a deadlock; addObserver and notifyObservers called
+ # in the ReaderMonitoringThread run() method are synchronized
+ import thread
+ thread.start_new_thread( self.rmthread.start, () )
+ else:
+ observer.update( self, (self.rmthread.readers, []) )
+
+ def deleteObserver( self, observer ):
+ """Remove an observer."""
+ Observable.deleteObserver( self, observer )
+ # If self.startOnDemand is True, the reader monitoring
+ # thread is stopped when there are no more observers.
+ if self.startOnDemand:
+ if 0==self.countObservers():
+ self.rmthread.stop()
+ del self.rmthread
+ self.rmthread = None
+
+ def __str__(self):
+ return self.__class__.__name__
+
+synchronize( ReaderMonitor,
+ "addObserver deleteObserver deleteObservers " +
+ "setChanged clearChanged hasChanged " +
+ "countObservers")
+
+
+class ReaderMonitoringThread(Thread):
+ """Reader insertion thread.
+ This thread polls for pcsc reader insertion, since no
+ reader insertion event is available in pcsc.
+ """
+
+
+ __shared_state = {}
+ def __init__( self, observable, readerProc, period ):
+ self.__dict__ = self.__shared_state
+ Thread.__init__( self )
+ self.observable = observable
+ self.stopEvent = Event()
+ self.stopEvent.clear()
+ self.readers = []
+ self.setDaemon( True )
+ self.setName( 'smartcard.ReaderMonitoringThread' )
+ self.readerProc = readerProc
+ self.period = period
+
+ def run(self):
+ """Runs until stopEvent is notified, and notify
+ observers of all reader insertion/removal.
+ """
+ while not self.stopEvent.isSet():
+ try:
+ # no need to monitor if no observers
+ if 0<self.observable.countObservers():
+ currentReaders = self.readerProc()
+ addedReaders = []
+ removedReaders = []
+
+ if currentReaders!=self.readers:
+ for reader in currentReaders:
+ if not reader in self.readers:
+ addedReaders.append(reader)
+ for reader in self.readers:
+ if not reader in currentReaders:
+ removedReaders.append(reader)
+
+ if addedReaders or removedReaders:
+ # Notify observers
+ self.readers=[]
+ for r in currentReaders: self.readers.append(r)
+ self.observable.setChanged()
+ self.observable.notifyObservers((addedReaders, removedReaders))
+
+ # wait every second on stopEvent
+ self.stopEvent.wait(self.period)
+
+ except Exception, e:
+ # Most likely raised during interpreter shutdown due
+ # to unclean exit which failed to remove all observers.
+ # To solve this, we set the stop event and pass the
+ # exception to let the thread finish gracefully.
+ self.stopEvent.set()
+
+ def stop(self):
+ self.stopEvent.set()
+ self.join()
+
+if __name__ == "__main__":
+ from smartcard.ReaderMonitoring import ReaderMonitor
+ print 'insert or remove readers in the next 20 seconds'
+
+ # a simple reader observer that prints added/removed readers
+ class printobserver( ReaderObserver ):
+ def __init__( self, obsindex ):
+ self.obsindex=obsindex
+
+ def update( self, observable, (addedreaders, removedreaders) ):
+ print "%d - added: " % self.obsindex, addedreaders
+ print "%d - removed: " % self.obsindex, removedreaders
+
+ class testthread( Thread ):
+ def __init__(self, obsindex ):
+ Thread.__init__(self)
+ self.readermonitor = ReaderMonitor()
+ self.obsindex = obsindex
+ self.observer=None
+
+ def run(self):
+ # create and register observer
+ self.observer = printobserver( self.obsindex )
+ self.readermonitor.addObserver(self.observer)
+ sleep(20)
+ self.readermonitor.deleteObserver(self.observer)
+
+ t1 = testthread(1)
+ t2 = testthread(2)
+ t1.start()
+ t2.start()
+ t1.join()
+ t2.join()
+
+
Modified: trunk/pyscard/tools/vslick/pyscard.vpj
===================================================================
--- trunk/pyscard/tools/vslick/pyscard.vpj 2008-08-14 15:08:16 UTC (rev 209)
+++ trunk/pyscard/tools/vslick/pyscard.vpj 2008-08-14 15:10:48 UTC (rev 210)
@@ -211,6 +211,7 @@
<F N="../../src/smartcard/test/framework/testcase_ExclusiveCardConnection.py"/>
<F N="../../src/smartcard/test/framework/testcase_readergroups.py"/>
<F N="../../src/smartcard/test/framework/testcase_readermonitor.py"/>
+ <F N="../../src/smartcard/test/framework/testcase_readermonitorstress.py"/>
<F N="../../src/smartcard/test/framework/testcase_readers.py"/>
<F N="../../src/smartcard/test/framework/testcase_ulist.py"/>
<F N="../../src/smartcard/test/framework/testcase_utils.py"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
