Skip to content

Rejuvenate log levels #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master_01_17_2020
Choose a base branch
from
Open

Rejuvenate log levels #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...alvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/FlatInstantiator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ private Set<TypeReference> getTypes(final TypeReference T) {

/** Used internally to avoid endless recursion on getTypes(). */
private Set<TypeReference> getTypes(final TypeReference T, final Set<TypeReference> seen) {
logger.debug("getTypes({}, {})", T, seen);
logger.trace("getTypes({}, {})", T, seen);
final Set<TypeReference> ret = new HashSet<>();
ret.add(T);

Expand Down
2 changes: 1 addition & 1 deletion ...ik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ public int enter(ExecutionOrder section, int PC) {
if ((this.currentSection.compareTo(AndroidEntryPoint.ExecutionOrder.MIDDLE_OF_LOOP) <= 0)
&& (section.compareTo(AndroidEntryPoint.ExecutionOrder.MULTIPLE_TIMES_IN_LOOP) >= 0)) {
PC = enterMULTIPLE_TIMES_IN_LOOP(PC);
logger.info("ENTER: MULTIPLE_TIMES_IN_LOOP");
logger.debug("ENTER: MULTIPLE_TIMES_IN_LOOP");
this.currentSection = AndroidEntryPoint.ExecutionOrder.MULTIPLE_TIMES_IN_LOOP;
}

Expand Down
2 changes: 1 addition & 1 deletion ...dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopAndroidModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ protected int enterAFTER_LOOP(int PC) {
*/
@Override
protected int leaveAT_LAST(int PC) {
logger.info("Leaving Model with PC = {}", PC);
logger.trace("Leaving Model with PC = {}", PC);
return PC;
}
}
4 changes: 2 additions & 2 deletions ...a.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public Context getCalleeTarget(
} else if (param.getConcreteType().getName().equals(AndroidTypes.IntentName)) {
if (!intents.contains(param)) {
logger.error("Unable to resolve Intent called from {}", caller.getMethod());
logger.error("Search Key: {} hash: {}", param, param.hashCode());
logger.info("Search Key: {} hash: {}", param, param.hashCode());
break;
} else {
intent = intents.find(param);
Expand Down Expand Up @@ -310,7 +310,7 @@ public Intent.IntentType getType() {
final InstanceKey self = actualParameters[0];
final Intent intent = intents.find(self);

logger.warn("Re-Setting the target of Intent {} in {} by {}", intent, site, caller);
logger.info("Re-Setting the target of Intent {} in {} by {}", intent, site, caller);

intent.setExplicit();
intents.unbind(self);
Expand Down
6 changes: 3 additions & 3 deletions com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ public void registerIntentForce(Intent intent) {
throw new IllegalArgumentException("The given Intent is null");
}

logger.info("Register Intent {}", intent);
logger.trace("Register Intent {}", intent);
// Looks a bit weired but works as Intents are only matched based on their action and uri
overrideIntents.put(intent, intent);
}
Expand Down Expand Up @@ -610,7 +610,7 @@ public void setOverrideForce(Intent from, Intent to) {
throw new IllegalArgumentException("The Intent given as 'to' is null");
}

logger.info("Override Intent {} to {}", from, to);
logger.trace("Override Intent {} to {}", from, to);
overrideIntents.put(from, to);
}

Expand Down Expand Up @@ -646,7 +646,7 @@ public Intent getIntent(Intent intent) {
}
}
ret = overrideIntents.get(ret); // Once again to get Info set in register
logger.info("Resolved {} to {}", intent, ret);
logger.debug("Resolved {} to {}", intent, ret);
return ret;
} else {
logger.info("No information on {} hash: {}", intent, intent.hashCode());
Expand Down
8 changes: 4 additions & 4 deletions com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ public void enter(Attributes saxAttrs) {
}

attributesHistory.get(relevant).push(attr);
logger.debug("Pushing '{}' for {} in {}", attr, relevant, self);
logger.trace("Pushing '{}' for {} in {}", attr, relevant, self);
// if there is no such value in saxAttrs it returns null
}
}
Expand All @@ -459,7 +459,7 @@ public void enter(Attributes saxAttrs) {
public void popAttributes() {
for (Attr relevant : self.getRelevantAttributes()) {
try {
logger.debug(
logger.trace(
"Popping {} of value {} in {}",
relevant,
attributesHistory.get(relevant).peek(),
Expand Down Expand Up @@ -702,10 +702,10 @@ public void leave() {
}
final Intent intent = AndroidSettingFactory.intent(pack, name, null);

logger.info("\tRegister: {}", intent);
logger.trace("\tRegister: {}", intent);
AndroidEntryPointManager.MANAGER.registerIntent(intent);
for (Intent ovr : overrideTargets) {
logger.info("\tOverride: {} --> {}", ovr, intent);
logger.trace("\tOverride: {} --> {}", ovr, intent);
if (ovr.equals(intent)) {
AndroidEntryPointManager.MANAGER.registerIntent(intent);
} else {
Expand Down