"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/pmdas/linux_proc/pmda.c" between
pcp-6.0.2.tar.gz and pcp-6.0.3.tar.gz

About: PCP (Performance Co-Pilot) provides a framework and services to support system-level performance monitoring and management.

pmda.c  (pcp-6.0.2)	:	pmda.c  (pcp-6.0.3)
skipping to change at line 1141		skipping to change at line 1141
{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IO_PRESSURE, CG_PRESSURE_IO_FULL_AVG10SEC) , PM_TYPE_FLOAT,		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IO_PRESSURE, CG_PRESSURE_IO_FULL_AVG10SEC) , PM_TYPE_FLOAT,
CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,0,0,0,0,0) } },		CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,0,0,0,0,0) } },
/* cgroup.pressure.io.full.avg1min */		/* cgroup.pressure.io.full.avg1min */
{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IO_PRESSURE, CG_PRESSURE_IO_FULL_AVG1MIN), PM_TYPE_FLOAT,		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IO_PRESSURE, CG_PRESSURE_IO_FULL_AVG1MIN), PM_TYPE_FLOAT,
CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,0,0,0,0,0) } },		CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,0,0,0,0,0) } },
/* cgroup.pressure.io.full.avg5min */		/* cgroup.pressure.io.full.avg5min */
{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IO_PRESSURE, CG_PRESSURE_IO_FULL_AVG5MIN), PM_TYPE_FLOAT,		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IO_PRESSURE, CG_PRESSURE_IO_FULL_AVG5MIN), PM_TYPE_FLOAT,
CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,0,0,0,0,0) } },		CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,0,0,0,0,0) } },
/* cgroup.pressure.io.full.total */		/* cgroup.pressure.io.full.total */
{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IO_PRESSURE, CG_PRESSURE_IO_FULL_TOTAL), P M_TYPE_U64, CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,1,0,0,PM_TIME_USEC,0) } },		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IO_PRESSURE, CG_PRESSURE_IO_FULL_TOTAL), P M_TYPE_U64, CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,1,0,0,PM_TIME_USEC,0) } },
		/* cgroup.pressure.irq.full.avg10sec */
		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IRQ_PRESSURE, CG_PRESSURE_IRQ_FULL_AVG10SE
		C), PM_TYPE_FLOAT,
		CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,0,0,0,0,0) } },
		/* cgroup.pressure.irq.full.avg1min */
		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IRQ_PRESSURE, CG_PRESSURE_IRQ_FULL_AVG1MIN
		), PM_TYPE_FLOAT,
		CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,0,0,0,0,0) } },
		/* cgroup.pressure.irq.full.avg5min */
		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IRQ_PRESSURE, CG_PRESSURE_IRQ_FULL_AVG5MIN
		), PM_TYPE_FLOAT,
		CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,0,0,0,0,0) } },
		/* cgroup.pressure.irq.full.total */
		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_IRQ_PRESSURE, CG_PRESSURE_IRQ_FULL_TOTAL),
		PM_TYPE_U64, CGROUP2_INDOM, PM_SEM_INSTANT, PMDA_PMUNITS(0,1,0,0,PM_TIME_USEC,0
		) } },
/* cgroup.cpu.stat.user */		/* cgroup.cpu.stat.user */
{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_CPU_STAT, CG_CPU_STAT_USER), PM_TYPE_U64,		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_CPU_STAT, CG_CPU_STAT_USER), PM_TYPE_U64,
CGROUP2_INDOM, PM_SEM_COUNTER, PMDA_PMUNITS(0,1,0,0,PM_TIME_USEC,0) } },		CGROUP2_INDOM, PM_SEM_COUNTER, PMDA_PMUNITS(0,1,0,0,PM_TIME_USEC,0) } },
/* cgroup.cpu.stat.system */		/* cgroup.cpu.stat.system */
{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_CPU_STAT, CG_CPU_STAT_SYSTEM), PM_TYPE_U64 ,		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_CPU_STAT, CG_CPU_STAT_SYSTEM), PM_TYPE_U64 ,
CGROUP2_INDOM, PM_SEM_COUNTER, PMDA_PMUNITS(0,1,0,0,PM_TIME_USEC,0) } },		CGROUP2_INDOM, PM_SEM_COUNTER, PMDA_PMUNITS(0,1,0,0,PM_TIME_USEC,0) } },
/* cgroup.cpu.stat.usage */		/* cgroup.cpu.stat.usage */
{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_CPU_STAT, CG_CPU_STAT_USAGE), PM_TYPE_U64,		{ NULL, { PMDA_PMID(CLUSTER_CGROUP2_CPU_STAT, CG_CPU_STAT_USAGE), PM_TYPE_U64,
CGROUP2_INDOM, PM_SEM_COUNTER, PMDA_PMUNITS(0,1,0,0,PM_TIME_USEC,0) } },		CGROUP2_INDOM, PM_SEM_COUNTER, PMDA_PMUNITS(0,1,0,0,PM_TIME_USEC,0) } },
/* cgroup.io.stat.rbytes */		/* cgroup.io.stat.rbytes */
skipping to change at line 1395		skipping to change at line 1406
need_refresh[CLUSTER_CGROUP_MOUNTS] ||		need_refresh[CLUSTER_CGROUP_MOUNTS] ||
need_refresh[CLUSTER_CPUSET_GROUPS] ||		need_refresh[CLUSTER_CPUSET_GROUPS] ||
need_refresh[CLUSTER_CPUACCT_GROUPS] ||		need_refresh[CLUSTER_CPUACCT_GROUPS] ||
need_refresh[CLUSTER_CPUSCHED_GROUPS] ||		need_refresh[CLUSTER_CPUSCHED_GROUPS] ||
need_refresh[CLUSTER_MEMORY_GROUPS] ||		need_refresh[CLUSTER_MEMORY_GROUPS] ||
need_refresh[CLUSTER_NETCLS_GROUPS] ||		need_refresh[CLUSTER_NETCLS_GROUPS] ||
need_refresh[CLUSTER_BLKIO_GROUPS] ||		need_refresh[CLUSTER_BLKIO_GROUPS] ||
need_refresh[CLUSTER_BLKIO_GROUPS] ||		need_refresh[CLUSTER_BLKIO_GROUPS] ||
need_refresh[CLUSTER_CGROUP2_CPU_PRESSURE] ||		need_refresh[CLUSTER_CGROUP2_CPU_PRESSURE] ||
need_refresh[CLUSTER_CGROUP2_IO_PRESSURE] ||		need_refresh[CLUSTER_CGROUP2_IO_PRESSURE] ||
		need_refresh[CLUSTER_CGROUP2_IRQ_PRESSURE] ||
need_refresh[CLUSTER_CGROUP2_MEM_PRESSURE] ||		need_refresh[CLUSTER_CGROUP2_MEM_PRESSURE] ||
need_refresh[CLUSTER_CGROUP2_CPU_STAT] ||		need_refresh[CLUSTER_CGROUP2_CPU_STAT] ||
need_refresh[CLUSTER_CGROUP2_IO_STAT] ||		need_refresh[CLUSTER_CGROUP2_IO_STAT] ||
container) {		container) {
/* first-time initialisation + v1 updates */		/* first-time initialisation + v1 updates */
if (cgroup_version < 2) {		if (cgroup_version < 2) {
refresh_cgroup_subsys();		refresh_cgroup_subsys();
refresh_cgroup_filesys();		refresh_cgroup_filesys();
}		}
skipping to change at line 3198		skipping to change at line 3210
break;		break;
case CG_PRESSURE_IO_FULL_TOTAL:		case CG_PRESSURE_IO_FULL_TOTAL:
if (cgroup->io_pressures.full.updated == 0) return 0;		if (cgroup->io_pressures.full.updated == 0) return 0;
atom->ull = cgroup->io_pressures.full.total;		atom->ull = cgroup->io_pressures.full.total;
break;		break;
default:		default:
return PM_ERR_PMID;		return PM_ERR_PMID;
}		}
break;		break;
		case CLUSTER_CGROUP2_IRQ_PRESSURE:
		indom = INDOM(CGROUP2_INDOM);
		if ((sts = pmdaCacheLookup(indom, inst, NULL, (void **)&cgroup)) < 0)
		return sts;
		if (sts != PMDA_CACHE_ACTIVE)
		return 0;
		switch (item) {
		case CG_PRESSURE_IRQ_FULL_AVG10SEC:
		if (cgroup->irq_pressures.full.updated == 0) return 0;
		atom->ull = cgroup->irq_pressures.full.avg10sec;
		break;
		case CG_PRESSURE_IRQ_FULL_AVG1MIN:
		if (cgroup->irq_pressures.full.updated == 0) return 0;
		atom->ull = cgroup->irq_pressures.full.avg1min;
		break;
		case CG_PRESSURE_IRQ_FULL_AVG5MIN:
		if (cgroup->irq_pressures.full.updated == 0) return 0;
		atom->ull = cgroup->irq_pressures.full.avg5min;
		break;
		case CG_PRESSURE_IRQ_FULL_TOTAL:
		if (cgroup->irq_pressures.full.updated == 0) return 0;
		atom->ull = cgroup->irq_pressures.full.total;
		break;
		default:
		return PM_ERR_PMID;
		}
		break;
case CLUSTER_CGROUP2_IO_STAT: {		case CLUSTER_CGROUP2_IO_STAT: {
cgroup_perdev_iostat_t *iostat;		cgroup_perdev_iostat_t *iostat;
indom = INDOM(CGROUP2_PERDEV_INDOM);		indom = INDOM(CGROUP2_PERDEV_INDOM);
if ((sts = pmdaCacheLookup(indom, inst, NULL, (void **)&iostat)) < 0)		if ((sts = pmdaCacheLookup(indom, inst, NULL, (void **)&iostat)) < 0)
return sts;		return sts;
if (sts != PMDA_CACHE_ACTIVE)		if (sts != PMDA_CACHE_ACTIVE)
return 0;		return 0;
switch (item) {		switch (item) {
case CG_IO_STAT_RBYTES: /* cgroup.io.stat.rbytes */		case CG_IO_STAT_RBYTES: /* cgroup.io.stat.rbytes */
End of changes. 3 change blocks.
0 lines changed or deleted		45 lines changed or added

---