remove trailing lines

Author: matu3ba

cpuset/commands/proc.py

@@ -27,10 +27,10 @@
 from cpuset import cset
 from cpuset.util import *
 from cpuset.commands.common import *
-try: from cpuset.commands import set 
+try: from cpuset.commands import set
 except SyntaxError:
     raise
-except: 
+except:
     pass
 
 global log
@@ -57,7 +57,7 @@
 and specifying the cpuset that the process is to be created in.
 
 For example:
-    # cset proc --set=blazing_cpuset --exec /usr/bin/fast_code 
+    # cset proc --set=blazing_cpuset --exec /usr/bin/fast_code
         This command will execute the /usr/bin/fast_code program
         on the "blazing_cpuset" cpuset.
 
@@ -126,7 +126,7 @@
 kernel threads will be added to the move.  Unbound kernel threads
 are those that can run on any CPU.  If you also specify the
 --force switch, then all tasks, kernel or not, bound or not,
-will be moved.  
+will be moved.
 
 CAUTION: Please be cautious with the --force switch, since moving
 a kernel thread that is bound to a specific CPU to a cpuset that
@@ -207,14 +207,14 @@ def func(parser, options, args):
 
     cset.rescan()
 
-    tset = None 
+    tset = None
     if options.list or options.exc:
         if options.set:
             tset = cset.unique_set(options.set)
         elif options.toset:
             tset = cset.unique_set(options.toset)
         elif len(args) > 0:
-            if options.exc: 
+            if options.exc:
                 tset = cset.unique_set(args[0])
                 del args[0]
             else:
@@ -270,7 +270,7 @@ def func(parser, options, args):
         set.active(tset)
         # next, if there is a pidspec, move just that
         if options.pid:
-            if options.fromset and not options.force: 
+            if options.fromset and not options.force:
                 fset = cset.unique_set(options.fromset)
             elif options.toset and options.set:
                 fset = cset.unique_set(options.set)
@@ -295,15 +295,15 @@ def func(parser, options, args):
                 raise CpusetException("origination cpuset not specified")
             nt = len(fset.tasks)
             if nt == 0:
-                raise CpusetException('no tasks to move from cpuset "%s"' 
+                raise CpusetException('no tasks to move from cpuset "%s"'
                                       % fset.path)
             if options.move:
-                log.info('moving all tasks from %s to %s', 
+                log.info('moving all tasks from %s to %s',
                          fset.name, tset.path)
                 selective_move(fset, tset, None, options.kthread, options.force,
                                options.threads)
             else:
-                log.info('moving all kernel threads from %s to %s', 
+                log.info('moving all kernel threads from %s to %s',
                          fset.path, tset.path)
                 # this is a -k "move", so only move kernel threads
                 pids = []
@@ -321,12 +321,12 @@ def list_sets(args):
     log.debug("entering list_sets, args=%s", args)
     l = []
     if isinstance(args, list):
-        for s in args: 
+        for s in args:
             if isstr(s):
                 l.extend(cset.find_sets(s))
             elif not isinstance(s, cset.CpuSet):
                 raise CpusetException(
-                        'list_sets() args=%s, of which "%s" not a string or CpuSet' 
+                        'list_sets() args=%s, of which "%s" not a string or CpuSet'
                         % (args, s))
             else:
                 l.append(s)
@@ -350,7 +350,7 @@ def list_sets(args):
             log.info(cset.summary(s))
 
 def move(fromset, toset, plist=None, verb=None, force=None):
-    log.debug('entering move, fromset=%s toset=%s list=%s force=%s verb=%s', 
+    log.debug('entering move, fromset=%s toset=%s list=%s force=%s verb=%s',
               fromset, toset, plist, force, verb)
     if isstr(fromset):
         fset = cset.unique_set(fromset)
@@ -368,15 +368,15 @@ def move(fromset, toset, plist=None, verb=None, force=None):
         tset = toset
     if plist == None:
         log.debug('moving default of all processes')
-        if tset != fset and not force: 
+        if tset != fset and not force:
             plist = fset.tasks
         else:
             raise CpusetException(
                     "cannot move tasks into their origination cpuset")
     output = 0
-    if verb: 
+    if verb:
         output = verb
-    elif verbose: 
+    elif verbose:
         output = verbose
     if output:
         l = []
@@ -410,7 +410,7 @@ def selective_move(fset, tset, plist=None, kthread=None, force=None, threads=Non
     ktskb = 0
     sstsk = 0
     target = cset.unique_set(tset)
-    if fset: 
+    if fset:
         fset = cset.unique_set(fset)
         if fset == target and not force:
             raise CpusetException(
@@ -426,7 +426,7 @@ def selective_move(fset, tset, plist=None, kthread=None, force=None, threads=Non
             # kernel threads do not have an excutable image
             os.readlink('/proc/'+task+'/exe')
             autsk += 1
-            if fset and not force: 
+            if fset and not force:
                 try:
                     task_check.index(task)
                     tasks.append(task)
@@ -440,9 +440,9 @@ def selective_move(fset, tset, plist=None, kthread=None, force=None, threads=Non
                                 if thread != task:
                                     log.debug('  adding thread %s', thread)
                                     tasks.append(thread)
-                                    utsk += 1 
+                                    utsk += 1
                 except ValueError:
-                    log.debug(' task %s not running in %s, skipped', 
+                    log.debug(' task %s not running in %s, skipped',
                               task, fset.name)
                     utsknr += 1
             else:
@@ -459,11 +459,11 @@ def selective_move(fset, tset, plist=None, kthread=None, force=None, threads=Non
                 # this is in try because the task may not exist by the
                 # time we do this, in that case, just ignore it
                 if kthread:
-                    if force: 
+                    if force:
                         tasks.append(task)
                         ktsk += 1
                     else:
-                        if is_unbound(task): 
+                        if is_unbound(task):
                             tasks.append(task)
                             ktsk += 1
                         elif cset.lookup_task_from_cpusets(task) == target.path:
@@ -480,7 +480,7 @@ def selective_move(fset, tset, plist=None, kthread=None, force=None, threads=Non
                 ktsknr += 1
     # ok, move 'em
     log.debug('moving %d tasks to %s ...', len(tasks), tset.name)
-    if len(tasks) == 0: 
+    if len(tasks) == 0:
         log.info('**> no task matched move criteria')
         if sstsk > 0:
             raise CpusetException('same source/destination cpuset, use --force if ok')
@@ -535,8 +535,8 @@ def run(tset, args, usr_par=None, grp_par=None):
     log.debug('entering run, set=%s args=%s ', s.path, args)
     set.active(s)
     # check user
-    if usr_par: 
-        try: 
+    if usr_par:
+        try:
             user = pwd.getpwnam(usr_par)[2]
         except KeyError:
             try:
@@ -562,34 +562,34 @@ def run(tset, args, usr_par=None, grp_par=None):
                 pass # just forget it
     # move myself into target cpuset and exec child
     move_pidspec(str(os.getpid()), s)
-    log.info('--> last message, executed args into cpuset "%s", new pid is: %s', 
-             s.path, os.getpid()) 
+    log.info('--> last message, executed args into cpuset "%s", new pid is: %s',
+             s.path, os.getpid())
     # change user and group before exec
     if grp_par: os.setgid(group)
-    if usr_par: 
+    if usr_par:
         os.setuid(user)
         os.environ["LOGNAME"] = usr_par
         os.environ["USERNAME"] = usr_par
         os.environ["USER"] = usr_par
     os.execvp(args[0], args)
 
 def is_unbound(proc):
-    # FIXME: popen is slow... 
+    # FIXME: popen is slow...
     # --> use /proc/<pid>/status -> Cpus_allowed
     #     int(line.replace(',',''), 16)
     #     note: delete leading zeros to compare to allcpumask
     line = os.popen('/usr/bin/taskset -p ' + str(proc) +' 2>/dev/null', 'r').readline()
     aff = line.split()[-1]
-    log.debug('is_unbound, proc=%s aff=%s allcpumask=%s', 
+    log.debug('is_unbound, proc=%s aff=%s allcpumask=%s',
               proc, aff, cset.allcpumask)
     if aff == cset.allcpumask: return True
     return False
 
 def pidspec_to_list(pidspec, fset=None, threads=False):
     """create a list of process ids out of a pidspec"""
-    log.debug('entering pidspecToList, pidspec=%s fset=%s threads=%s', 
+    log.debug('entering pidspecToList, pidspec=%s fset=%s threads=%s',
               pidspec, fset, threads)
-    if fset: 
+    if fset:
         if isstr(fset): fset = cset.unique_set(fset)
         elif not isinstance(fset, cset.CpuSet):
             raise CpusetException("passed fset=%s, which is not a string or CpuSet" % fset)

cpuset/commands/set.py

@@ -30,7 +30,7 @@
 try: from cpuset.commands import proc
 except SyntaxError:
     raise
-except: 
+except:
     pass
 
 global log
@@ -151,7 +151,7 @@
                        help = 'do things recursively, use with --list and --destroy',
                        action = 'store_true'),
            make_option('--force',
-                       help = 'force recursive deletion even if processes are running ' 
+                       help = 'force recursive deletion even if processes are running '
                               'in those cpusets (they will be moved to parent cpusets)',
                        action = 'store_true'),
            make_option('-x', '--usehex',
@@ -254,7 +254,7 @@ def destroy_sets(sets, recurse=False, force=False):
         nl.append(sets)
     # check that sets passed are ok, will raise if one is bad
     sl2 = []
-    for s in nl: 
+    for s in nl:
         st = cset.unique_set(s)
         sl2.append(st)
         if len(st.subsets) > 0:
@@ -291,7 +291,7 @@ def destroy(name):
         set = cset.unique_set(name)
     elif not isinstance(name, cset.CpuSet):
         raise CpusetException(
-                "passed name=%s, which is not a string or CpuSet" % name) 
+                "passed name=%s, which is not a string or CpuSet" % name)
     else:
         set = name
     tsks = set.tasks
@@ -361,7 +361,7 @@ def create_from_options(options, args):
     mspec = None
     cx = None
     mx = None
-    if options.cpu: 
+    if options.cpu:
         cset.cpuspec_check(options.cpu)
         cspec = options.cpu
     if options.mem:
@@ -385,11 +385,11 @@ def create(name, cpuspec, memspec, cx, mx):
     try:
         cset.unique_set(name)
     except CpusetNotFound:
-       pass 
+       pass
     except:
         raise CpusetException('cpuset "%s" not unique, please specify by path' % name)
     else:
-        raise CpusetExists('attempt to create already existing set: "%s"' % name) 
+        raise CpusetExists('attempt to create already existing set: "%s"' % name)
     # FIXME: check if name is a path here
     os.mkdir(cset.CpuSet.basepath+'/'+name)
     # fixme: perhaps reparsing the all the sets is not so efficient...
@@ -405,7 +405,7 @@ def modify(name, cpuspec=None, memspec=None, cx=None, mx=None):
         nset = cset.unique_set(name)
     elif not isinstance(name, cset.CpuSet):
         raise CpusetException(
-                "passed name=%s, which is not a string or CpuSet" % name) 
+                "passed name=%s, which is not a string or CpuSet" % name)
     else:
         nset = name
     log.debug('modifying cpuset "%s"', nset.name)
@@ -472,7 +472,7 @@ def set_details(name, indent=None, width=None, usehex=False):
     if config.mread:
         l.append(set.path)
         l2 = []
-        for line in l: 
+        for line in l:
             l2.append(line.strip())
         return ';'.join(l2)
 

cpuset/commands/shield.py

@@ -30,7 +30,7 @@
 from cpuset.util import *
 from cpuset import config
 
-global log 
+global log
 log = logging.getLogger('shield')
 
 help = 'supercommand to set up and manage basic shielding'
@@ -143,14 +143,14 @@
 
 You can adjust which CPUs are in the shielded cpuset by issuing
 the --cpu subcommand again anytime after the shield has been
-initialized.  
+initialized.
 
 For example if the original shield contained CPU0 and CPU1 in the
 system set and CPU2 and CPU3 in the user set, if you then issue
 the following command:
-    
+
     # cset shield --cpu=1,2,3
-    
+
 then that command will move CPU1 into the shielded "user" cpuset.
 Any processes or threads that were running on CPU1 that belonged
 to the unshielded "system" cpuset are migrated to CPU0 by the
@@ -225,10 +225,10 @@ def func(parser, options, args):
     if options.verbose: verbose = options.verbose
     cset.rescan()
 
-    if options.sysset: 
+    if options.sysset:
         global SYS_SET
         SYS_SET = options.sysset
-    if options.userset: 
+    if options.userset:
         global USR_SET
         USR_SET = options.userset
 
@@ -254,24 +254,24 @@ def func(parser, options, args):
             options.shield = True
         else:
             return
-        
-    if options.reset: 
+
+    if options.reset:
         reset_shield()
         return
 
-    if options.cpu: 
+    if options.cpu:
         make_shield(options.cpu, options.kthread)
         return
 
-    if options.kthread: 
+    if options.kthread:
         make_kthread(options.kthread)
         return
 
     if options.exc:
         exec_args(args, options.user, options.group)
         # exec_args does not return...
 
-    if options.shield or options.unshield: 
+    if options.shield or options.unshield:
         shield_exists()
         if options.shield:
             smsg = 'shielding'
@@ -351,11 +351,11 @@ def reset_shield():
     log.info("--> deactivating/reseting shielding")
     shield_exists()
     tasks = cset.unique_set(USR_SET).tasks
-    log.info('moving %s tasks from "%s" user set to root set...', 
+    log.info('moving %s tasks from "%s" user set to root set...',
              len(tasks), USR_SET)
     proc.move(USR_SET, 'root', None, verbose)
     tasks = cset.unique_set(SYS_SET).tasks
-    log.info('moving %s tasks from "%s" system set to root set...', 
+    log.info('moving %s tasks from "%s" system set to root set...',
              len(tasks), SYS_SET)
     proc.move(SYS_SET, 'root', None, verbose)
     log.info('deleting "%s" and "%s" sets', USR_SET, SYS_SET)
@@ -434,7 +434,7 @@ def make_kthread(state):
     if state == 'on':
         log.info('--> activating kthread shielding')
         root_tasks = cset.unique_set('/').tasks
-        log.debug('root set has %d tasks, checking for unbound', 
+        log.debug('root set has %d tasks, checking for unbound',
                   len(root_tasks))
         tasks = []
         for task in root_tasks: