← Back to branch summary

~ubuntu-branches/ubuntu/precise/net-snmp/precise

« back to all changes in this revision

Viewing changes to agent/mibgroup/ucd-snmp/vmstat.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-28 14:59:36 UTC
  • mfrom: (1.2.3 upstream) (1.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100628145936-cbiallic69pn044g
Tags: 5.4.3~dfsg-1ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/589056
https://launchpad.net/bugs/573391
https://launchpad.net/bugs/533603
* Merge from debian unstable.  Remaining changes:
  - Set Ubuntu maintainer address.
  - net-snmp-config: Use bash. (LP: #104738)
  - Removed multiuser option when calling update-rc.d. (LP: #254261)
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
    (LP: #250459)
  - debian/snmpd.postinst: source debconf before doing work, LP: #589056
  - debian/snmp.preinst, debian/snmp.prerm: kill any/all processes owned by
    snmp user before install/uninstall, LP: #573391
  - Add apport hook (LP: #533603):
  - debian/{snmp,snmpd}.apport: Added.
  - debian/control: Build-depends on dh-apport.
  - debian/rules: 
    + Add --with apport.
    + override_dh_apport to install hook on snmpd package only.
 * Dropped patches:
   - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/mibgroup/ucd-snmp/vmstat.c
73
73
         */
74
74
        case CPURAWUSER:
75
75
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
76
 
                                        info->user_ticks );
 
76
                                        info->user_ticks & 0xffffffff);
77
77
             break;
78
78
        case CPURAWNICE:
79
79
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
80
 
                                        info->nice_ticks );
 
80
                                        info->nice_ticks & 0xffffffff);
81
81
             break;
82
82
        case CPURAWSYSTEM:
83
83
             /*
88
88
              *   if it has a non-zero value.
89
89
              */
90
90
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
91
 
                                        info->sys2_ticks ?
 
91
                                       (info->sys2_ticks ?
92
92
                                        info->sys2_ticks :
93
 
                                        info->sys_ticks );
 
93
                                        info->sys_ticks ) & 0xffffffff);
94
94
             break;
95
95
        case CPURAWIDLE:
96
96
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
97
 
                                        info->idle_ticks );
 
97
                                        info->idle_ticks & 0xffffffff);
98
98
             break;
99
99
        case CPURAWWAIT:
100
100
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
101
 
                                        info->wait_ticks );
 
101
                                        info->wait_ticks & 0xffffffff);
102
102
             break;
103
103
        case CPURAWKERNEL:
104
104
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
105
 
                                        info->kern_ticks );
 
105
                                        info->kern_ticks & 0xffffffff);
106
106
             break;
107
107
        case CPURAWINTR:
108
108
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
109
 
                                        info->intrpt_ticks );
 
109
                                        info->intrpt_ticks & 0xffffffff);
110
110
             break;
111
111
        case CPURAWSOFTIRQ:
112
112
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
113
 
                                        info->sirq_ticks );
 
113
                                        info->sirq_ticks & 0xffffffff);
114
114
             break;
115
115
 
116
116
        /*
158
158
         */
159
159
        case SYSRAWINTERRUPTS:
160
160
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
161
 
                                        info->nInterrupts );
 
161
                                        info->nInterrupts & 0xffffffff);
162
162
             break;
163
163
        case SYSRAWCONTEXT:
164
164
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
165
 
                                        info->nCtxSwitches );
 
165
                                        info->nCtxSwitches & 0xffffffff);
166
166
             break;
167
167
        case SYSINTERRUPTS:
168
168
             if ( info->history && info->history[0].total_hist ) {
184
184
         */
185
185
        case RAWSWAPIN:
186
186
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
187
 
                                        info->swapIn );
 
187
                                        info->swapIn & 0xffffffff);
188
188
             break;
189
189
        case RAWSWAPOUT:
190
190
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
191
 
                                        info->swapOut );
 
191
                                        info->swapOut & 0xffffffff);
192
192
             break;
193
193
        case SWAPIN:
194
194
             if ( info->history && info->history[0].total_hist ) {
212
212
         */
213
213
        case IORAWSENT:
214
214
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
215
 
                                        info->pageOut );
 
215
                                        info->pageOut & 0xffffffff);
216
216
             break;
217
217
        case IORAWRECEIVE:
218
218
             snmp_set_var_typed_integer(requests->requestvb, ASN_COUNTER,
219
 
                                        info->pageIn );
 
219
                                        info->pageIn & 0xffffffff);
220
220
             break;
221
221
        case IOSENT:
222
222
             if ( info->history && info->history[0].total_hist ) {