← Back to branch summary

~ubuntu-branches/ubuntu/utopic/sysstat/utopic

« back to all changes in this revision

Viewing changes to .pc/05-defaultfile_message.patch/sa_common.c

  • Committer: Package Import Robot
  • Author(s): Robert Luberda
  • Date: 2013-06-13 22:27:39 UTC
  • mfrom: (1.4.3)
  • Revision ID: package-import@ubuntu.com-20130613222739-k73hvrwurt5phlan
Tags: 10.1.6-1
New upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/05-defaultfile_message.patch/sa_common.c
1
1
/*
2
2
 * sar and sadf common routines.
3
 
 * (C) 1999-2012 by Sebastien GODARD (sysstat <at> orange.fr)
 
3
 * (C) 1999-2013 by Sebastien GODARD (sysstat <at> orange.fr)
4
4
 *
5
5
 ***************************************************************************
6
6
 * This program is free software; you can redistribute it and/or modify it *
1250
1250
                        select_all_activities(act);
1251
1251
 
1252
1252
                        /* Force '-P ALL -I XALL' */
1253
 
                        *flags |= S_F_PER_PROC;
1254
1253
 
1255
1254
                        p = get_activity_position(act, A_MEMORY);
1256
1255
                        act[p]->opt_flags |= AO_F_MEM_AMT + AO_F_MEM_DIA +
1282
1281
                        SELECT_ACTIVITY(A_DISK);
1283
1282
                        break;
1284
1283
 
 
1284
                case 'F':
 
1285
                        SELECT_ACTIVITY(A_FILESYSTEM);
 
1286
                        break;
 
1287
                        
1285
1288
                case 'H':
1286
1289
                        p = get_activity_position(act, A_HUGE);
1287
1290
                        act[p]->options   |= AO_SELECTED;
1342
1345
                        /*
1343
1346
                         * Check sar option -t here (as it can be combined
1344
1347
                         * with other ones, eg. "sar -rtu ..."
1345
 
                         * But sadf option -t is check in sadf.c as it won't
 
1348
                         * But sadf option -t is checked in sadf.c as it won't
1346
1349
                         * be entered as a sar option after "--".
1347
1350
                         */
1348
1351
                        if (caller == C_SAR) {
1632
1635
        p = get_activity_position(act, A_CPU);
1633
1636
 
1634
1637
        if (argv[++(*opt)]) {
1635
 
                *flags |= S_F_PER_PROC;
1636
1638
 
1637
1639
                for (t = strtok(argv[*opt], ","); t; t = strtok(NULL, ",")) {
1638
1640
                        if (!strcmp(t, K_ALL)) {