Skip to content

Commit

Permalink
Move info messages to debug level
Browse files Browse the repository at this point in the history 
:Release Notes:
Info level is used for logging only metrics information.
Hence moving developer useful messages from notice and
info to debug level.

:Detailed Notes:

:Testing Performed:
Compiled and verified mainstream logs in /var/log/messages

:QA Notes:

:Issues Addressed:
[GF-41248] Activitymanager logging debug messages at info level

Open-webOS-DCO-1.0-Signed-off-by: Gayathri Srinivasan <gayathri.srinivasan@lge.com>

Change-Id: Ia2d709f7109cf34e8c2a19e17893b5df8382a496
Reviewed-on: https://g2g.palm.com/3616
Reviewed-by: Build Verification
Reviewed-by: Gayathri Srinivasan <gayathri.srinivasan@lge.com>
Tested-by: Gayathri Srinivasan <gayathri.srinivasan@lge.com>
Reviewed-by: Keith Derrick <keith.derrick@lge.com>
  • Loading branch information
@kdopen
Gayathri Srinivasan authored and kdopen committed Oct 10, 2013
1 parent 30ff1ef commit 440fdb3
Show file tree
Hide file tree
Showing 42 changed files with 374 additions and 374 deletions.
106 changes: 53 additions & 53 deletions src/Activity.cpp
View file

Large diffs are not rendered by default.

108 changes: 54 additions & 54 deletions src/ActivityCategory.cpp
View file

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions src/ActivityManager.cpp
View file
Expand Up @@ -60,7 +60,7 @@ ActivityManager::~ActivityManager()
void ActivityManager::RegisterActivityId(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Registering ID"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Registering ID"), act->GetId());

ActivityMap::const_iterator found = m_activities.find(act->GetId());
if (found != m_activities.end()) {
Expand All @@ -73,7 +73,7 @@ void ActivityManager::RegisterActivityId(boost::shared_ptr<Activity> act)
void ActivityManager::RegisterActivityName(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogNotice(s_log, _T("[Activity %llu] Registering as %s/\"%s\""),
MojLogDebug(s_log, _T("[Activity %llu] Registering as %s/\"%s\""),
act->GetId(), act->GetCreator().GetString().c_str(),
act->GetName().c_str());

Expand All @@ -86,7 +86,7 @@ void ActivityManager::RegisterActivityName(boost::shared_ptr<Activity> act)
void ActivityManager::UnregisterActivityName(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogNotice(s_log, _T("[Activity %llu] Unregistering from %s/\"%s\""),
MojLogDebug(s_log, _T("[Activity %llu] Unregistering from %s/\"%s\""),
act->GetId(), act->GetCreator().GetString().c_str(),
act->GetName().c_str());

Expand Down Expand Up @@ -167,14 +167,14 @@ boost::shared_ptr<Activity> ActivityManager::GetNewActivity()
}
#endif /* ACTIVITYMANAGER_RANDOM_IDS */

MojLogNotice(s_log, _T("[Activity %llu] Allocated"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Allocated"), act->GetId());

return act;
}

boost::shared_ptr<Activity> ActivityManager::GetNewActivity(activityId_t id)
{
MojLogNotice(s_log, _T("[Activity %llu] Forcing allocation"), id);
MojLogDebug(s_log, _T("[Activity %llu] Forcing allocation"), id);

ActivityMap::iterator iter = m_activities.find(id);
if (iter != m_activities.end()) {
Expand All @@ -192,7 +192,7 @@ boost::shared_ptr<Activity> ActivityManager::GetNewActivity(activityId_t id)
void ActivityManager::ReleaseActivity(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogNotice(s_log, _T("[Activity %llu] Releasing"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Releasing"), act->GetId());

EvictQueue(act);

Expand Down Expand Up @@ -226,7 +226,7 @@ ActivityManager::ActivityVec ActivityManager::GetActivities() const
MojErr ActivityManager::StartActivity(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Start"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Start"), act->GetId());

act->SendCommand(ActivityStartCommand);

Expand All @@ -236,7 +236,7 @@ MojErr ActivityManager::StartActivity(boost::shared_ptr<Activity> act)
MojErr ActivityManager::StopActivity(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Stop"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Stop"), act->GetId());

act->SendCommand(ActivityStopCommand);

Expand All @@ -246,7 +246,7 @@ MojErr ActivityManager::StopActivity(boost::shared_ptr<Activity> act)
MojErr ActivityManager::CancelActivity(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Cancel"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Cancel"), act->GetId());

act->SendCommand(ActivityCancelCommand);

Expand All @@ -256,7 +256,7 @@ MojErr ActivityManager::CancelActivity(boost::shared_ptr<Activity> act)
MojErr ActivityManager::PauseActivity(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Pause"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Pause"), act->GetId());

act->SendCommand(ActivityPauseCommand);

Expand All @@ -266,7 +266,7 @@ MojErr ActivityManager::PauseActivity(boost::shared_ptr<Activity> act)
MojErr ActivityManager::FocusActivity(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Focus [Activity %llu]"), act->GetId());
MojLogDebug(s_log, _T("Focus [Activity %llu]"), act->GetId());

if (act->IsFocused()) {
MojLogWarning(s_log, _T("[Activity %llu] is already focused"),
Expand All @@ -285,7 +285,7 @@ MojErr ActivityManager::FocusActivity(boost::shared_ptr<Activity> act)
/* Remove focus from all Activities that had focus before. */
while (!oldFocused.empty()) {
Activity& focusedActivity = oldFocused.front();
MojLogInfo(s_log, _T("Removing focus from previously focused "
MojLogDebug(s_log, _T("Removing focus from previously focused "
"[Activity %llu]"), focusedActivity.GetId());
focusedActivity.SetFocus(false);
m_resourceManager->UpdateAssociations(
Expand All @@ -299,7 +299,7 @@ MojErr ActivityManager::FocusActivity(boost::shared_ptr<Activity> act)
MojErr ActivityManager::UnfocusActivity(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Unfocus [Activity %llu]"), act->GetId());
MojLogDebug(s_log, _T("Unfocus [Activity %llu]"), act->GetId());

if (!act->IsFocused()) {
MojLogWarning(s_log, _T("Can't remove focus from [Activity %llu], "
Expand All @@ -324,7 +324,7 @@ MojErr ActivityManager::AddFocus(boost::shared_ptr<Activity> source,
boost::shared_ptr<Activity> target)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Add focus from [Activity %llu] to [Activity %llu]"),
MojLogDebug(s_log, _T("Add focus from [Activity %llu] to [Activity %llu]"),
source->GetId(), target->GetId());

if (!source->IsFocused()) {
Expand Down Expand Up @@ -353,11 +353,11 @@ void ActivityManager::Enable(unsigned mask)
MojLogTrace(s_log);

if (mask & EXTERNAL_ENABLE) {
MojLogNotice(s_log, _T("Enabling Activity Manager: External"));
MojLogDebug(s_log, _T("Enabling Activity Manager: External"));
}

if (mask & UI_ENABLE) {
MojLogNotice(s_log, _T("Enabling Activity Manager: Device UI enabled"));
MojLogDebug(s_log, _T("Enabling Activity Manager: Device UI enabled"));
}

if ((mask & ENABLE_MASK) != mask) {
Expand All @@ -377,11 +377,11 @@ void ActivityManager::Disable(unsigned mask)
MojLogTrace(s_log);

if (mask & EXTERNAL_ENABLE) {
MojLogNotice(s_log, _T("Disabling Activity Manager: External"));
MojLogDebug(s_log, _T("Disabling Activity Manager: External"));
}

if (mask & UI_ENABLE) {
MojLogNotice(s_log, _T("Disabling Activity Manager: Device UI "
MojLogDebug(s_log, _T("Disabling Activity Manager: Device UI "
"disabled"));
}

Expand All @@ -405,10 +405,10 @@ unsigned int ActivityManager::SetBackgroundConcurrencyLevel(unsigned int level)
{
MojLogTrace(s_log);
if (level != UnlimitedBackgroundConcurrency) {
MojLogNotice(s_log, _T("Background concurrency level set to %u"),
MojLogDebug(s_log, _T("Background concurrency level set to %u"),
level);
} else {
MojLogNotice(s_log, _T("Background concurrency level set to "
MojLogDebug(s_log, _T("Background concurrency level set to "
"Unlimited"));
}

Expand All @@ -425,7 +425,7 @@ void ActivityManager::EvictBackgroundActivity(
boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogNotice(s_log, _T("Attempting to evict [Activity %llu] from "
MojLogDebug(s_log, _T("Attempting to evict [Activity %llu] from "
"background queue"), act->GetId());

ActivityRunQueue::iterator iter;
Expand All @@ -452,7 +452,7 @@ void ActivityManager::EvictBackgroundActivity(
void ActivityManager::EvictAllBackgroundActivities()
{
MojLogTrace(s_log);
MojLogNotice(s_log, _T("Evicting all background Activities to the long "
MojLogDebug(s_log, _T("Evicting all background Activities to the long "
"running background Activity list"));

while (!m_runQueue[RunQueueBackground].empty()) {
Expand All @@ -468,7 +468,7 @@ void ActivityManager::RunReadyBackgroundActivity(
boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogNotice(s_log, _T("Attepting to run ready [Activity %llu]"),
MojLogDebug(s_log, _T("Attepting to run ready [Activity %llu]"),
act->GetId());

ActivityRunQueue::iterator iter;
Expand Down Expand Up @@ -504,7 +504,7 @@ void ActivityManager::RunReadyBackgroundActivity(
void ActivityManager::RunAllReadyActivities()
{
MojLogTrace(s_log);
MojLogNotice(s_log, _T("Running all Activities currently in the Ready "
MojLogDebug(s_log, _T("Running all Activities currently in the Ready "
"state"));

while (!m_runQueue[RunQueueReadyInteractive].empty()) {
Expand All @@ -523,7 +523,7 @@ void ActivityManager::InformActivityInitialized(
boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Initialized and ready to be "
MojLogDebug(s_log, _T("[Activity %llu] Initialized and ready to be "
"scheduled"), act->GetId());

/* If an Activity is restarting, it will be parked (temporarily) in
Expand All @@ -545,7 +545,7 @@ void ActivityManager::InformActivityInitialized(
void ActivityManager::InformActivityReady(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Now ready to run"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Now ready to run"), act->GetId());

if (act->m_runQueueItem.is_linked()) {
act->m_runQueueItem.unlink();
Expand All @@ -571,7 +571,7 @@ void ActivityManager::InformActivityReady(boost::shared_ptr<Activity> act)
void ActivityManager::InformActivityNotReady(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] No longer ready to run"),
MojLogDebug(s_log, _T("[Activity %llu] No longer ready to run"),
act->GetId());

if (act->m_runQueueItem.is_linked()) {
Expand All @@ -587,13 +587,13 @@ void ActivityManager::InformActivityNotReady(boost::shared_ptr<Activity> act)
void ActivityManager::InformActivityRunning(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Running"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Running"), act->GetId());
}

void ActivityManager::InformActivityEnding(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Ending"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Ending"), act->GetId());

/* Nothing to do here yet, it still has subscribers who may have processing
* to do. */
Expand All @@ -602,7 +602,7 @@ void ActivityManager::InformActivityEnding(boost::shared_ptr<Activity> act)
void ActivityManager::InformActivityEnd(boost::shared_ptr<Activity> act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Has ended"), act->GetId());
MojLogDebug(s_log, _T("[Activity %llu] Has ended"), act->GetId());

/* If Activity was never fully initialized, it's ok for it not to be on
* a queue here */
Expand All @@ -622,7 +622,7 @@ void ActivityManager::InformActivityGainedSubscriberId(
boost::shared_ptr<Activity> act, const BusId& id)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Gained subscriber [BusId %s]"),
MojLogDebug(s_log, _T("[Activity %llu] Gained subscriber [BusId %s]"),
act->GetId(), id.GetString().c_str());

m_resourceManager->Associate(act, id);
Expand All @@ -632,7 +632,7 @@ void ActivityManager::InformActivityLostSubscriberId(
boost::shared_ptr<Activity> act, const BusId& id)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("[Activity %llu] Lost subscriber [BusId %s]"),
MojLogDebug(s_log, _T("[Activity %llu] Lost subscriber [BusId %s]"),
act->GetId(), id.GetString().c_str());

m_resourceManager->Dissociate(act, id);
Expand All @@ -641,13 +641,13 @@ void ActivityManager::InformActivityLostSubscriberId(
void ActivityManager::ScheduleAllActivities()
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Scheduling all Activities"));
MojLogDebug(s_log, _T("Scheduling all Activities"));

while (!m_runQueue[RunQueueInitialized].empty()) {
Activity& act = m_runQueue[RunQueueInitialized].front();
act.m_runQueueItem.unlink();

MojLogInfo(s_log, _T("Granting [Activity %llu] permission to schedule"),
MojLogDebug(s_log, _T("Granting [Activity %llu] permission to schedule"),
act.GetId());

m_runQueue[RunQueueScheduled].push_back(act);
Expand All @@ -660,7 +660,7 @@ void ActivityManager::EvictQueue(boost::shared_ptr<Activity> act)
MojLogTrace(s_log);

if (act->m_runQueueItem.is_linked()) {
MojLogInfo(s_log, _T("[Activity %llu] evicted from run queue on "
MojLogDebug(s_log, _T("[Activity %llu] evicted from run queue on "
"release"), act->GetId());
act->m_runQueueItem.unlink();
}
Expand All @@ -669,7 +669,7 @@ void ActivityManager::EvictQueue(boost::shared_ptr<Activity> act)
void ActivityManager::RunActivity(Activity& act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Running [Activity %llu]"), act.GetId());
MojLogDebug(s_log, _T("Running [Activity %llu]"), act.GetId());

m_resourceManager->Associate(act.shared_from_this());
act.RunActivity();
Expand All @@ -678,7 +678,7 @@ void ActivityManager::RunActivity(Activity& act)
void ActivityManager::RunReadyBackgroundActivity(Activity& act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Running background [Activity %llu]"), act.GetId());
MojLogDebug(s_log, _T("Running background [Activity %llu]"), act.GetId());

if (act.m_runQueueItem.is_linked()) {
act.m_runQueueItem.unlink();
Expand All @@ -695,7 +695,7 @@ void ActivityManager::RunReadyBackgroundActivity(Activity& act)
void ActivityManager::RunReadyBackgroundInteractiveActivity(Activity& act)
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Running background interactive [Activity %llu]"),
MojLogDebug(s_log, _T("Running background interactive [Activity %llu]"),
act.GetId());

if (act.m_runQueueItem.is_linked()) {
Expand All @@ -719,7 +719,7 @@ unsigned ActivityManager::GetRunningBackgroundActivitiesCount() const
void ActivityManager::CheckReadyQueue()
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Checking to see if more background Activities can "
MojLogDebug(s_log, _T("Checking to see if more background Activities can "
"run"));

bool ranInteractive = false;
Expand Down Expand Up @@ -759,10 +759,10 @@ void ActivityManager::UpdateYieldTimeout()
MojLogTrace(s_log);

if (!m_interactiveYieldTimeout) {
MojLogInfo(s_log, _T("Arming background interactive yield timeout "
MojLogDebug(s_log, _T("Arming background interactive yield timeout "
"for %u seconds"), m_yieldTimeoutSeconds);
} else {
MojLogInfo(s_log, _T("Updating background interactive yield timeout "
MojLogDebug(s_log, _T("Updating background interactive yield timeout "
"for %u seconds"), m_yieldTimeoutSeconds);
}

Expand All @@ -775,18 +775,18 @@ void ActivityManager::UpdateYieldTimeout()
void ActivityManager::CancelYieldTimeout()
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Cancelling background interactive yield timeout"));
MojLogDebug(s_log, _T("Cancelling background interactive yield timeout"));

m_interactiveYieldTimeout.reset();
}

void ActivityManager::InteractiveYieldTimeout()
{
MojLogTrace(s_log);
MojLogInfo(s_log, _T("Background interactive yield timeout triggered"));
MojLogDebug(s_log, _T("Background interactive yield timeout triggered"));

if (m_runQueue[RunQueueReadyInteractive].empty()) {
MojLogInfo(s_log, _T("Ready interactive queue is empty, cancelling "
MojLogDebug(s_log, _T("Ready interactive queue is empty, cancelling "
"yield timeout"));
CancelYieldTimeout();
return;
Expand Down Expand Up @@ -817,15 +817,15 @@ void ActivityManager::InteractiveYieldTimeout()
/* If there aren't already too many yielding... */
if (iter == m_runQueue[RunQueueBackgroundInteractive].end()) {
if (victim) {
MojLogInfo(s_log, _T("Requesting that [Activity %llu] yield"),
MojLogDebug(s_log, _T("Requesting that [Activity %llu] yield"),
victim->GetId());
victim->YieldActivity();
} else {
MojLogInfo(s_log, _T("All running background interactive "
MojLogDebug(s_log, _T("All running background interactive "
"Activities are already yielding"));
}
} else {
MojLogInfo(s_log, _T("Number of yielding Activities is already equal "
MojLogDebug(s_log, _T("Number of yielding Activities is already equal "
"to the number of ready interactive Activities waiting in the "
"queue"));
}
Expand Down

0 comments on commit 440fdb3

Please sign in to comment.