Attachment #2354 for ticket #2084





	switch (data_type) {
	case ENERGY_DATA_JOULES_TASK:
	case ENERGY_DATA_NODE_ENERGY_UP:
		if (local_energy->current_watts == NO_VAL)
			energy->consumed_energy = NO_VAL;
		else
			_get_joules_task(energy);
		break;
	case ENERGY_DATA_STRUCT:
	case ENERGY_DATA_NODE_ENERGY:
		memcpy(energy, local_energy, sizeof(acct_gather_energy_t));
		break;
	case ENERGY_DATA_LAST_POLL:
		*last_poll = local_energy->poll_time;
		break;
	case ENERGY_DATA_SENSOR_CNT:
		*sensor_cnt = 1;
		break;
	default:
		error("acct_gather_energy_p_get_data: unknown enum %d",
		      data_type);

Return to ticket 2084

Lines 275-291 extern int acct_gather_energy_p_get_data(enum acct_energy_type data_type, Link Here

(-)a/src/plugins/acct_gather_energy/cray/acct_gather_energy_cray.c (+5 lines)
275		275
276	switch (data_type) {	276	switch (data_type) {
277	case ENERGY_DATA_JOULES_TASK:	277	case ENERGY_DATA_JOULES_TASK:
		278	case ENERGY_DATA_NODE_ENERGY_UP:
278	if (local_energy->current_watts == NO_VAL)	279	if (local_energy->current_watts == NO_VAL)
279	energy->consumed_energy = NO_VAL;	280	energy->consumed_energy = NO_VAL;
280	else	281	else
281	_get_joules_task(energy);	282	_get_joules_task(energy);
282	break;	283	break;
283	case ENERGY_DATA_STRUCT:	284	case ENERGY_DATA_STRUCT:
		285	case ENERGY_DATA_NODE_ENERGY:
284	memcpy(energy, local_energy, sizeof(acct_gather_energy_t));	286	memcpy(energy, local_energy, sizeof(acct_gather_energy_t));
285	break;	287	break;
286	case ENERGY_DATA_LAST_POLL:	288	case ENERGY_DATA_LAST_POLL:
287	*last_poll = local_energy->poll_time;	289	*last_poll = local_energy->poll_time;
288	break;	290	break;
		291	case ENERGY_DATA_SENSOR_CNT:
		292	*sensor_cnt = 1;
		293	break;
289	default:	294	default:
290	error("acct_gather_energy_p_get_data: unknown enum %d",	295	error("acct_gather_energy_p_get_data: unknown enum %d",
291	data_type);	296	data_type);