char *sccsid(void) { return (SCCSID); }
#endif
-unsigned long long uptime0[2] = {0, 0};
+unsigned long long uptime_cs[2] = {0, 0};
struct cifs_stats *st_cifs[2];
struct io_hdr_stats *st_hdr_cifs;
*
* IN:
* @curr Index in array for current sample statistics.
- * @itv Interval of time.
+ * @itv Interval of time (in 1/100th of a second).
* @fctr Conversion factor.
* @shi Structures describing the CIFS filesystems.
* @ioi Current sample statistics.
}
/* Interval of time, reduced to one processor */
- itv = get_interval(uptime0[!curr], uptime0[curr]);
+ itv = get_interval(uptime_cs[!curr], uptime_cs[curr]);
shi = st_hdr_cifs;
setbuf(stdout, NULL);
do {
- /* Read system uptime (reduced to one processor) */
- read_uptime(&(uptime0[curr]));
- if (!uptime0[curr])
- /* Cannot read system uptime */
- exit(2);
+ /* Read system uptime in 1/100th of a second */
+ read_uptime(&(uptime_cs[curr]));
/* Read CIFS stats */
read_cifs_stat(curr);
* Compute time interval.
*
* IN:
- * @prev_uptime Previous uptime value in jiffies.
- * @curr_uptime Current uptime value in jiffies.
+ * @prev_uptime Previous uptime value (in jiffies or 1/100th of a second).
+ * @curr_uptime Current uptime value (in jiffies or 1/100th of a second).
*
* RETURNS:
- * Interval of time in jiffies.
+ * Interval of time in jiffies or 1/100th of a second.
***************************************************************************
*/
unsigned long long get_interval(unsigned long long prev_uptime,
* @scp Previous sample statistics for current CPU.
*
* RETURNS:
- * Interval of time based on current CPU.
+ * Interval of time based on current CPU, expressed in jiffies.
***************************************************************************
*/
unsigned long long get_per_cpu_interval(struct stats_cpu *scc,
* IN:
* @sdc Structure with current device statistics.
* @sdp Structure with previous device statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
*
* OUT:
* @xds Structure with extended statistics.
unsigned long long itv, struct ext_disk_stats *xds)
{
double tput
- = ((double) (sdc->nr_ios - sdp->nr_ios)) * HZ / itv;
+ = ((double) (sdc->nr_ios - sdp->nr_ios)) * 100 / itv;
xds->util = S_VALUE(sdp->tot_ticks, sdc->tot_ticks, itv);
xds->svctm = tput ? xds->util / tput : 0.0;
/*
* Macros used to display statistics values.
*
- * NB: Define SP_VALUE() to normalize to %;
- * HZ is 1024 on IA64 and % should be normalized to 100.
+ */
+/* With S_VALUE macro, the interval of time (@p) is given in 1/100th of a second */
+#define S_VALUE(m,n,p) (((double) ((n) - (m))) / (p) * 100)
+/* Define SP_VALUE() to normalize to % */
+#define SP_VALUE(m,n,p) (((double) ((n) - (m))) / (p) * 100)
+/*
* SP_VALUE_100() will not output value bigger than 100; this is needed for some
* corner cases, should be used with care.
*/
-#define S_VALUE(m,n,p) (((double) ((n) - (m))) / (p) * HZ)
-#define SP_VALUE(m,n,p) (((double) ((n) - (m))) / (p) * 100)
#define SP_VALUE_100(m,n,p) MINIMUM((((double) ((n) - (m))) / (p) * 100), 100.0)
/*
#endif
struct stats_cpu *st_cpu[2];
-unsigned long long uptime0[2] = {0, 0};
+unsigned long long uptime_cs[2] = {0, 0};
unsigned long long tot_jiffies[2] = {0, 0};
struct io_stats *st_iodev[2];
struct io_hdr_stats *st_hdr_iodev;
}
}
- /* Calculate time interval in jiffies */
- itv = get_interval(uptime0[!curr], uptime0[curr]);
+ /* Calculate time interval in 1/100th of a second */
+ itv = get_interval(uptime_cs[!curr], uptime_cs[curr]);
if (DISPLAY_DISK(flags)) {
struct io_stats *ioi, *ioj;
do {
/* Read system uptime (only for SMP machines) */
- read_uptime(&(uptime0[curr]));
+ read_uptime(&(uptime_cs[curr]));
/* Read stats for CPU "all" */
read_stat_cpu(st_cpu[curr], 1);
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies (independent of the number of
- * processors). Unused here.
+ * @itv Interval of time in 1/100th of a second (independent of the
+ * number of processors). Unused here.
***************************************************************************
*/
__print_funct_t json_print_cpu_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_pcsw_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_irq_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_swap_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_paging_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_io_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_memory_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_ktables_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_queue_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_serial_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_disk_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_dev_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_edev_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_nfs_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_nfsd_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_sock_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_ip_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_eip_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_icmp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_eicmp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_tcp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_etcp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_udp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_sock6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_ip6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_eip6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_icmp6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_eicmp6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_net_udp6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_pwr_cpufreq_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_pwr_fan_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_pwr_temp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_pwr_in_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_huge_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_pwr_wghfreq_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_pwr_usb_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_filesystem_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_fchost_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t json_print_softnet_stats(struct activity *a, int curr, int tab,
#endif
unsigned long long tot_jiffies[3] = {0, 0, 0};
-unsigned long long uptime0[3] = {0, 0, 0};
+unsigned long long uptime_cs[3] = {0, 0, 0};
/* NOTE: Use array of _char_ for bitmaps to avoid endianness problems...*/
unsigned char *cpu_bitmap; /* Bit 0: Global; Bit 1: 1st proc; etc. */
* @dis TRUE if a header line must be printed.
* @deltot_jiffies
* Number of jiffies spent on the interval by all processors.
- * @itv Interval value.
+ * @itv Interval value in 1/100th of a second.
* @prev Position in array where statistics used as reference are.
* Stats used as reference may be the previous ones read, or
* the very first ones when calculating the average.
0.0 :
ll_sp_value(snp->cpu_user - snp->cpu_guest,
snc->cpu_user - snc->cpu_guest,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
(snc->cpu_nice - snc->cpu_guest_nice) < (snp->cpu_nice - snp->cpu_guest_nice) ?
0.0 :
ll_sp_value(snp->cpu_nice - snp->cpu_guest_nice,
snc->cpu_nice - snc->cpu_guest_nice,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_sys,
snc->cpu_sys,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_iowait,
snc->cpu_iowait,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_hardirq,
snc->cpu_hardirq,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_softirq,
snc->cpu_softirq,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_steal,
snc->cpu_steal,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_guest,
snc->cpu_guest,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_guest_nice,
snc->cpu_guest_nice,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
(snc->cpu_idle < snp->cpu_idle) ?
0.0 :
ll_sp_value(snp->cpu_idle,
snc->cpu_idle,
- itv * cpu_per_node[node]));
+ itv * HZ / 100 * cpu_per_node[node]));
printf("\n");
}
}
0.0 :
ll_sp_value(snp->cpu_user - snp->cpu_guest,
snc->cpu_user - snc->cpu_guest,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
(snc->cpu_nice - snc->cpu_guest_nice) < (snp->cpu_nice - snp->cpu_guest_nice) ?
0.0 :
ll_sp_value(snp->cpu_nice - snp->cpu_guest_nice,
snc->cpu_nice - snc->cpu_guest_nice,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_sys,
snc->cpu_sys,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_iowait,
snc->cpu_iowait,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_hardirq,
snc->cpu_hardirq,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_softirq,
snc->cpu_softirq,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_steal,
snc->cpu_steal,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_guest,
snc->cpu_guest,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
ll_sp_value(snp->cpu_guest_nice,
snc->cpu_guest_nice,
- itv * cpu_per_node[node]),
+ itv * HZ / 100 * cpu_per_node[node]),
(snc->cpu_idle < snp->cpu_idle) ?
0.0 :
ll_sp_value(snp->cpu_idle,
snc->cpu_idle,
- itv * cpu_per_node[node]));
+ itv * HZ / 100 * cpu_per_node[node]));
}
printf("\n");
xprintf0(--tab, "]");
deltot_jiffies = get_interval(tot_jiffies[prev], tot_jiffies[curr]);
/* Get time interval */
- itv = get_interval(uptime0[prev], uptime0[curr]);
+ itv = get_interval(uptime_cs[prev], uptime_cs[curr]);
/* Print CPU stats */
if (DISPLAY_CPU(actflags)) {
setbuf(stdout, NULL);
/* Read system uptime and CPU stats */
- read_uptime(&(uptime0[0]));
+ read_uptime(&(uptime_cs[0]));
read_stat_cpu(st_cpu[0], cpu_nr + 1);
tot_jiffies[0] = st_cpu[0]->cpu_user + st_cpu[0]->cpu_nice +
st_cpu[0]->cpu_sys + st_cpu[0]->cpu_idle +
/* Save the first stats collected. Will be used to compute the average */
mp_tstamp[2] = mp_tstamp[0];
tot_jiffies[2] = tot_jiffies[0];
- uptime0[2] = uptime0[0];
+ uptime_cs[2] = uptime_cs[0];
memcpy(st_cpu[2], st_cpu[0], STATS_CPU_SIZE * (cpu_nr + 1));
memcpy(st_node[2], st_node[0], STATS_CPU_SIZE * (cpu_nr + 1));
memcpy(st_irq[2], st_irq[0], STATS_IRQ_SIZE * (cpu_nr + 1));
get_localtime(&(mp_tstamp[curr]), 0);
/* Read uptime and CPU stats */
- read_uptime(&(uptime0[curr]));
+ read_uptime(&(uptime_cs[curr]));
read_stat_cpu(st_cpu[curr], cpu_nr + 1);
if (DISPLAY_NODE(actflags)) {
set_node_cpu_stats(st_node[curr], st_cpu[curr]);
#endif
unsigned long long tot_jiffies[3] = {0, 0, 0};
-unsigned long long uptime0[3] = {0, 0, 0};
+unsigned long long uptime_cs[3] = {0, 0, 0};
struct pid_stats *st_pid_list[3] = {NULL, NULL, NULL};
unsigned int *pid_array = NULL;
struct pid_stats st_pid_null;
(pstc->utime - pstc->gtime) < (pstp->utime - pstp->gtime) ?
0.0 :
SP_VALUE_100(pstp->utime - pstp->gtime,
- pstc->utime - pstc->gtime, itv),
- SP_VALUE_100(pstp->stime, pstc->stime, itv),
- SP_VALUE_100(pstp->gtime, pstc->gtime, itv),
- SP_VALUE_100(pstp->wtime, pstc->wtime, itv),
+ pstc->utime - pstc->gtime, itv * HZ / 100),
+ SP_VALUE_100(pstp->stime, pstc->stime, itv * HZ / 100),
+ SP_VALUE_100(pstp->gtime, pstc->gtime, itv * HZ / 100),
+ SP_VALUE_100(pstp->wtime, pstc->wtime, itv * HZ / 100),
/* User time already includes guest time */
IRIX_MODE_OFF(pidflag) ?
SP_VALUE_100(pstp->utime + pstp->stime,
pstc->utime + pstc->stime, deltot_jiffies) :
SP_VALUE_100(pstp->utime + pstp->stime,
- pstc->utime + pstc->stime, itv));
+ pstc->utime + pstc->stime, itv * HZ / 100));
cprintf_in(IS_INT, " %3d", "", pstc->processor);
}
* the timestamp of the previous sample.
* @curr_string String displayed at the beginning of current sample stats.
* This is the timestamp of the current sample.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time.
*
* RETURNS:
* 0 if all the processes to display have terminated.
* @curr_string String displayed at the beginning of current sample stats.
* This is the timestamp of the current sample, or "Average"
* when displaying average stats.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
* @deltot_jiffies
* Number of jiffies spent on the interval by all processors.
*
(pstc->utime - pstc->gtime) < (pstp->utime - pstp->gtime) ?
0.0 :
SP_VALUE_100(pstp->utime - pstp->gtime,
- pstc->utime - pstc->gtime, itv),
- SP_VALUE_100(pstp->stime, pstc->stime, itv),
- SP_VALUE_100(pstp->gtime, pstc->gtime, itv),
- SP_VALUE_100(pstp->wtime, pstc->wtime, itv),
+ pstc->utime - pstc->gtime, itv * HZ / 100),
+ SP_VALUE_100(pstp->stime, pstc->stime, itv * HZ / 100),
+ SP_VALUE_100(pstp->gtime, pstc->gtime, itv * HZ / 100),
+ SP_VALUE_100(pstp->wtime, pstc->wtime, itv * HZ / 100),
/* User time already includes guest time */
IRIX_MODE_OFF(pidflag) ?
SP_VALUE_100(pstp->utime + pstp->stime,
pstc->utime + pstc->stime, deltot_jiffies) :
SP_VALUE_100(pstp->utime + pstp->stime,
- pstc->utime + pstc->stime, itv));
+ pstc->utime + pstc->stime, itv * HZ / 100));
if (!disp_avg) {
cprintf_in(IS_INT, " %3d", "", pstc->processor);
* @curr_string String displayed at the beginning of current sample stats.
* This is the timestamp of the current sample, or "Average"
* when displaying average stats.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
*
* RETURNS:
* 0 if all the processes to display have terminated.
* @curr_string String displayed at the beginning of current sample stats.
* This is the timestamp of the current sample, or "Average"
* when displaying average stats.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time.
*
* RETURNS:
* 0 if all the processes to display have terminated.
* @curr_string String displayed at the beginning of current sample stats.
* This is the timestamp of the current sample, or "Average"
* when displaying average stats.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
*
* RETURNS:
* 0 if all the processes to display have terminated.
* @curr_string String displayed at the beginning of current sample stats.
* This is the timestamp of the current sample, or "Average"
* when displaying average stats.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
*
* RETURNS:
* 0 if all the processes to display have terminated.
* @curr_string String displayed at the beginning of current sample stats.
* This is the timestamp of the current sample, or "Average"
* when displaying average stats.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time.
*
* RETURNS:
* 0 if all the processes to display have terminated.
* @curr_string String displayed at the beginning of current sample stats.
* This is the timestamp of the current sample, or "Average"
* when displaying average stats.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time.
*
* RETURNS:
* 0 if all the processes to display have terminated.
/* Total number of jiffies spent on the interval */
deltot_jiffies = get_interval(tot_jiffies[prev], tot_jiffies[curr]);
- itv = get_interval(uptime0[prev], uptime0[curr]);
+ itv = get_interval(uptime_cs[prev], uptime_cs[curr]);
if (PROCESS_STRING(pidflag)) {
/* Reset "show threads" flag */
setbuf(stdout, NULL);
/* Read system uptime */
- read_uptime(&uptime0[0]);
+ read_uptime(&uptime_cs[0]);
read_stats(0);
if (DISPLAY_MEM(actflag)) {
/* Save the first stats collected. Will be used to compute the average */
ps_tstamp[2] = ps_tstamp[0];
tot_jiffies[2] = tot_jiffies[0];
- uptime0[2] = uptime0[0];
+ uptime_cs[2] = uptime_cs[0];
memcpy(st_pid_list[2], st_pid_list[0], PID_STATS_SIZE * pid_nr);
/* Set a handler for SIGINT */
/* Get time */
get_localtime(&ps_tstamp[curr], 0);
- /* Read system uptime */
- read_uptime(&(uptime0[curr]));
+ /* Read system uptime (in 1/100th of a second) */
+ read_uptime(&(uptime_cs[curr]));
/* Read stats */
read_stats(curr);
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies (independent of the number of
- * processors). Unused here.
+ * @itv Interval of time in 1/100th of a second (independent of the
+ * number of processors). Unused here.
***************************************************************************
*/
__print_funct_t print_cpu_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_pcsw_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_irq_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_swap_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_paging_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_io_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
* @dispavg TRUE if displaying average statistics.
***************************************************************************
*/
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_memory_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_memory_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_ktables_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_ktables_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_queue_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_queue_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_serial_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_disk_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_dev_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_edev_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_nfs_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_nfsd_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_sock_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_net_sock_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_ip_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_eip_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_icmp_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_eicmp_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_tcp_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_etcp_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_udp_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_sock6_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_net_sock6_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_ip6_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_eip6_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_icmp6_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_eicmp6_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_net_udp6_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_pwr_cpufreq_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_pwr_cpufreq_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_pwr_fan_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_pwr_fan_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_pwr_temp_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_pwr_temp_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_pwr_in_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_pwr_in_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_huge_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_huge_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
void print_pwr_wghfreq_stats(struct activity *a, int prev, int curr,
* IN:
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
* @dispavg TRUE if displaying average statistics.
***************************************************************************
*/
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_pwr_usb_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_pwr_usb_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_filesystem_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_avg_filesystem_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_fchost_stats(struct activity *a, int prev, int curr,
* @a Activity structure with statistics.
* @prev Index in array where stats used as reference are.
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t print_softnet_stats(struct activity *a, int prev, int curr,
* Read machine uptime, independently of the number of processors.
*
* OUT:
- * @uptime Uptime value in jiffies.
+ * @uptime Uptime value in hundredths of a second.
***************************************************************************
*/
void read_uptime(unsigned long long *uptime)
{
- FILE *fp;
+ FILE *fp = NULL;
char line[128];
unsigned long up_sec, up_cent;
+ int err = FALSE;
if ((fp = fopen(UPTIME, "r")) == NULL) {
- fprintf(stderr, _("Cannot open %s: %s\n"), UPTIME, strerror(errno));
- exit(2);
- return;
+ err = TRUE;
}
-
- if (fgets(line, sizeof(line), fp) != NULL) {
- sscanf(line, "%lu.%lu", &up_sec, &up_cent);
- *uptime = (unsigned long long) up_sec * HZ +
- (unsigned long long) up_cent * HZ / 100;
+ else if (fgets(line, sizeof(line), fp) == NULL) {
+ err = TRUE;
+ }
+ else if (sscanf(line, "%lu.%lu", &up_sec, &up_cent) == 2) {
+ *uptime = (unsigned long long) up_sec * 100 +
+ (unsigned long long) up_cent;
}
else {
- /* Couldn't read system uptime */
- *uptime = 0;
+ err = TRUE;
}
- fclose(fp);
+ if (fp != NULL) {
+ fclose(fp);
+ }
+ if (err) {
+ fprintf(stderr, _("Cannot read %s\n"), UPTIME);
+ exit(2);
+ }
}
#ifdef SOURCE_SADC
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies (independent of the number of
- * processors). Unused here.
+ * @itv Interval of time in 1/100th of a second (independent of the
+ * number of processors). Unused here.
***************************************************************************
*/
__print_funct_t render_cpu_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_pcsw_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_irq_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_swap_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_paging_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_io_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_memory_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_ktables_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_queue_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_serial_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_disk_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_dev_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_edev_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_nfs_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_nfsd_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_sock_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_ip_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_eip_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_icmp_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_eicmp_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_tcp_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_etcp_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_udp_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_sock6_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_ip6_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_eip6_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_icmp6_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_eicmp6_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_net_udp6_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_pwr_cpufreq_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_pwr_fan_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_pwr_temp_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_pwr_in_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_huge_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_pwr_wghfreq_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_pwr_usb_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_filesystem_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_fchost_stats(struct activity *a, int isdb, char *pre,
* @isdb Flag, true if db printing, false if ppc printing.
* @pre Prefix string for output entries
* @curr Index in array for current sample statistics.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t render_softnet_stats(struct activity *a, int isdb, char *pre,
/* Header structure for every record */
struct record_header {
/*
- * Machine uptime in jiffies (independent of the number of processors).
+ * Machine uptime in 1/100th of a second.
*/
- unsigned long long uptime0;
+ unsigned long long uptime_cs;
/*
* Timestamp (number of seconds since the epoch).
*/
* IN:
* @uptime_ref Uptime used as reference. This is the system uptime for the
* first sample statistics, or the first system uptime after a
- * LINUX RESTART.
- * @uptime Current system uptime.
+ * LINUX RESTART (in 1/100th of a second).
+ * @uptime Current system uptime (in 1/100th of a second).
* @reset TRUE if @last_uptime should be reset with @uptime_ref.
* @interval Interval of time.
*
int min, max, pt1, pt2;
double f;
- /* uptime is expressed in jiffies (basis of 1 processor) */
+ /* uptime is expressed in 1/100th of a second */
if (!last_uptime || reset) {
last_uptime = uptime_ref;
}
/* Interval cannot be greater than 0xffffffff here */
- f = ((double) ((uptime - last_uptime) & 0xffffffff)) / HZ;
+ f = ((double) ((uptime - last_uptime) & 0xffffffff)) / 100;
file_interval = (unsigned long) f;
if ((f * 10) - (file_interval * 10) >= 5) {
file_interval++; /* Rounding to correct value */
* (Pn * Iu) or (P'n * Iu) belongs to In
* with Pn = En / Iu and P'n = En / Iu + 1
*/
- f = ((double) ((uptime - uptime_ref) & 0xffffffff)) / HZ;
+ f = ((double) ((uptime - uptime_ref) & 0xffffffff)) / 100;
entry = (unsigned long) f;
if ((f * 10) - (entry * 10) >= 5) {
entry++;
* @nr_proc Number of CPU, including CPU "all".
*
* OUT:
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
void get_itv_value(struct record_header *record_hdr_curr,
unsigned int nr_proc, unsigned long long *itv)
{
/* Interval value in jiffies */
- *itv = get_interval(record_hdr_prev->uptime0,
- record_hdr_curr->uptime0);
+ *itv = get_interval(record_hdr_prev->uptime_cs,
+ record_hdr_curr->uptime_cs);
}
/*
{
int i;
- /* Read system uptime in jiffies */
- read_uptime(&(record_hdr.uptime0));
+ /* Read system uptime in 1/100th of a second */
+ read_uptime(&(record_hdr.uptime_cs));
for (i = 0; i < NR_ACT; i++) {
if (IS_COLLECTED(act[i]->options)) {
* selects records at seconds as close as possible to the number
* specified by the interval parameter.
*/
- if (!next_slice(record_hdr[2].uptime0, record_hdr[curr].uptime0,
+ if (!next_slice(record_hdr[2].uptime_cs, record_hdr[curr].uptime_cs,
reset, interval))
/* Not close enough to desired interval */
return 0;
/* it's too soon... */
return 0;
- /* Get interval values */
+ /* Get interval values in 1/100th of a second */
get_itv_value(&record_hdr[curr], &record_hdr[!curr],
cpu_nr, &itv);
return 0;
}
- dt = itv / HZ;
+ dt = itv / 100;
/* Correct rounding error for dt */
- if ((itv % HZ) >= (HZ / 2)) {
+ if ((itv % 100) >= 50) {
dt++;
}
if (cpu_nr < 0)
cpu_nr = act[get_activity_position(act, A_CPU, EXIT_IF_NOT_FOUND)]->nr;
- /* Interval value in jiffies */
- itv = get_interval(record_hdr[2].uptime0, record_hdr[curr].uptime0);
+ /* Interval value in 1/100th of a second */
+ itv = get_interval(record_hdr[2].uptime_cs, record_hdr[curr].uptime_cs);
strncpy(timestamp[curr], _("Average:"), TIMESTAMP_LEN);
timestamp[curr][TIMESTAMP_LEN - 1] = '\0';
/* Check time (1) */
if (read_from_file) {
- if (!next_slice(record_hdr[2].uptime0, record_hdr[curr].uptime0,
+ if (!next_slice(record_hdr[2].uptime_cs, record_hdr[curr].uptime_cs,
reset, interval))
/* Not close enough to desired interval */
return 0;
/* it's too soon... */
return 0;
- /* Get interval values */
+ /* Get interval value in 1/100th of a second */
get_itv_value(&record_hdr[curr], &record_hdr[!curr],
cpu_nr, &itv);
* composing the structure.
* @cs Pointer on current sample statistics structure.
* @ps Pointer on previous sample statistics structure (may be NULL).
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
* @spmin Array containing min values already found for this activity.
* @spmax Array containing max values already found for this activity.
* @g_fields Index in spmin/spmax arrays where extrema values for each
* flag indicating that a restart record has been previously
* found (.@restart), and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* Unused here.
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (unused here).
+ * @itv Interval of time in 1/100th of a second (unused here).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (unused here).
+ * @itv Interval of time in 1/100th of a second (unused here).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (unused here).
+ * @itv Interval of time in 1/100th of a second (unused here).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (unused here).
+ * @itv Interval of time in 1/100th of a second (unused here).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* flag indicating that a restart record has been previously
* found (.@restart) and time used for the X axis origin
* (@ust_time_ref).
- * @itv Interval of time in jiffies (only with F_MAIN action).
+ * @itv Interval of time in 1/100th of a second (only with F_MAIN action).
* @record_hdr Pointer on record header of current stats sample.
***************************************************************************
*/
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies (independent of the number of
- * processors). Unused here.
+ * @itv Interval of time in 1/100th of a second (independent of the
+ * number of processors). Unused here.
***************************************************************************
*/
__print_funct_t xml_print_cpu_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_pcsw_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_irq_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_swap_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_paging_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_io_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_memory_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_ktables_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_queue_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_serial_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_disk_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_dev_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_edev_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_nfs_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_nfsd_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_sock_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_ip_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_eip_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_icmp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_eicmp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_tcp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_etcp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_udp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_sock6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_ip6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_eip6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_icmp6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_eicmp6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_net_udp6_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_pwr_cpufreq_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_pwr_fan_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_pwr_temp_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_pwr_in_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_huge_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_pwr_wghfreq_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_pwr_usb_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_filesystem_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_fchost_stats(struct activity *a, int curr, int tab,
* @a Activity structure with statistics.
* @curr Index in array for current sample statistics.
* @tab Indentation in XML output.
- * @itv Interval of time in jiffies.
+ * @itv Interval of time in 1/100th of a second.
***************************************************************************
*/
__print_funct_t xml_print_softnet_stats(struct activity *a, int curr, int tab,
projects / sysstat / commitdiff