search for: set_model

...; + } + } + else + { + if(name == "model name") model = value; + } + } + } + input.close(); + } // populate the managed object's values - management_object->set_model(libhal_device_get_property_string(context, processors[0], "info.product", &dbus_error)); - management_object->set_cores(num_results); + management_object->set_model(model); + management_object->set_cores(core_count); } void -- 1.6.6.1

...; - } - } - else - { - if(name == "model name") model = value; - } - } - } - input.close(); - } - - // populate the managed object's values - management_object->set_model(model); - management_object->set_cores(core_count); + management_object->set_model(platform->get_processor_model()); + management_object->set_cores(platform->get_number_of_cores()); } void @@ -121,12 +45,5 @@ ProcessorsAgent::update(void) const void ProcessorsAgent::update_l...

Refactoring the previous patch ended up creating two deltas. This patch pushes them both together into a single commit.

...char** processors = libhal_find_device_by_capability(context,"processor", &num_results, &dbus_error); + + if (!processors) + throw runtime_error("Error: could not query processors via HAL."); + + // populate the managed object's values + management_object->set_model(libhal_device_get_property_string(context, processors[0], "info.product", &dbus_error)); + management_object->set_cores(num_results); +} + +Manageable::status_t +ProcessorsAgent::ManagementMethod(uint32_t id, Args& args, string& text) +{ + switch(id) + { + case _qmf...

This patch includes one small change: the Processors::get_load_average() method is now const since it does not change the object's state.

After some feedback from Slow, mainly about the load_average API being a method rather than an ongoing statistic. So I've converted the code over to instead update the load average statistic on a regular basis.

...ncQMFObject(); -} - -void CPUWrapper::cleanupQMFObject(void) -{ - mgmt_object->resourceDestroy(); -} - -void CPUWrapper::syncQMFObject(void) -{ - mgmt_object->set_cpunum(cpunum); - mgmt_object->set_corenum(corenum); - mgmt_object->set_numcores(numcores); - mgmt_object->set_model(model); - mgmt_object->set_family(family); - mgmt_object->set_cpuid_lvl(cpuid_lvl); - mgmt_object->set_speed(speed); - mgmt_object->set_cache(cache); - mgmt_object->set_vendor(vendor); - mgmt_object->set_flags(flags); -} - -/** - * void fillCPUInfo(vector <CPU...

...ssors.addProcessorsListener(this); -} - -ProcessorsAgent::~ProcessorsAgent() -{ -} - -void -ProcessorsAgent::setup(ManagementAgent* agent, HostAgent* parent) -{ - _management_object = new _qmf::Processors(agent, this, parent); - agent->addObject(_management_object); - - _management_object->set_model(this->_processors.getModel()); - _management_object->set_cores(this->_processors.getNumberOfCores()); -} - -void -ProcessorsAgent::updated() -{ - _management_object->set_load_average(this->_processors.getLoadAverage()); -} diff --git a/src/qmf/processorsagent.h b/src/qmf/processors...

...rkDeviceAgent::setup(ManagementAgent* agent, Manageable* parent) +{ + management_object = new _qmf::NetworkDevice(agent, this, parent); + agent->addObject(management_object); + + management_object->set_interface(ifname); + management_object->set_vendor(vendor); + management_object->set_model(model); + management_object->set_mac_address(macaddr); +} + +void +NetworkDeviceAgent::update() const +{ +} diff --git a/src/networkdevice.h b/src/networkdevice.h new file mode 100644 index 0000000..3884b22 --- /dev/null +++ b/src/networkdevice.h @@ -0,0 +1,52 @@ +#ifndef __NETWORKDEVICE_H +#de...

In looking at the code I realized that the last of the HAL depenencies were removed with this patch. So, I'm pushing an updated patch that contains none of the HAL code in it.

Hi all, Initially I thought this was a bug in the built-in mocking framework(and it still may be), but I better hash it out on the mailing list before I file/reopen the ticket: http://rspec.lighthouseapp.com/projects/5645/tickets/478-mocks-on-constants#ticket-478-6 I thought my example illustrated my problem, but obviously I was passing the wrong arguments to the mock. I revised my example to