diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2019-05-29 04:58:50 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2019-05-29 07:34:28 -0500 |
| commit | ff1417ff60baee231a28272f9a16ef2c9c8ea0a2 (patch) | |
| tree | d9ca6c5f9661a3ffd6263d1380812e2430d9b230 /misc/env | |
| parent | a47bd51641efcb84e19d68a6383f0947df826636 (diff) | |
Post Init Service Starter
minor fixes
Remove JU generated garbage files
Issue-ID: AAF-835
Change-Id: I476291f1f1140f0640ed49452f8a5dabb28d9c30
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'misc/env')
4 files changed, 22 insertions, 11 deletions
diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/TimeTaken.java b/misc/env/src/main/java/org/onap/aaf/misc/env/TimeTaken.java index a1a81b9d..58c588f6 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/TimeTaken.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/TimeTaken.java @@ -77,8 +77,8 @@ public abstract class TimeTaken { end = System.nanoTime();
}
-
- /**
+
+ /**
* For sizable contents, set the size. Implementations can simply write a no-op if they don't wish to
* store the size.
*
diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java index 83a049c1..5ba74369 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/AbsTrans.java @@ -112,7 +112,6 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore { public final void checkpoint(String name, int additionalFlag) {
TimeTaken tt = newTimeTaken(name,CHECKPOINT|additionalFlag);
trail.add(tt);
- tt.done();
}
@Override
@@ -130,8 +129,13 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore { // If first entry is sub, then it's actually the last "end" as well
// otherwise, check end
//long end = (first.flag&SUB)==SUB?first.end():trail.get(last).end();
- long end = trail.get(last).end();
+ long end = 0L;
+ for(int i=last;end==0L && i>=0;--i) {
+ end= trail.get(i).end();
+ }
metric.total = (end - first.start) / 1000000f;
+ } else {
+ metric.total=0L;
}
if (sb==null) {
@@ -165,6 +169,18 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore { for (int i=0;i<indent;++i) {
sb.append(" ");
}
+ if((tt.flag & CHECKPOINT)==CHECKPOINT) {
+ // Checkpoint
+ sb.append(" ");
+ } else {
+ float ms=tt.millis();
+ // Add time values to Metric
+ for (int i=0;i<flags.length;++i) {
+ if ((tt.flag & flags[i]) == flags[i]) {
+ metric.buckets[i]+=ms;
+ }
+ }
+ }
tt.output(sb);
sb.append('\n');
if ((tt.flag&SUB)==SUB) {
@@ -172,11 +188,6 @@ public abstract class AbsTrans<ENV extends Env> implements TransStore { ++indent;
}
- // Add time values to Metric
- float ms = tt.millis();
- for (int i=0;i<flags.length;++i) {
- if (tt.flag == flags[i]) metric.buckets[i]+=ms;
- }
}
}
return metric;
diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java index 35d0034d..e65f4e85 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/impl/BasicEnv.java @@ -164,7 +164,7 @@ public class BasicEnv extends StoreImpl implements EnvJAXB, TransCreate<TransJAX case Env.REMOTE: sb.append("REMOTE "); break;
}
sb.append(String.format(name, values));
- if (flag != Env.CHECKPOINT) {
+ if ((flag & Env.CHECKPOINT) != Env.CHECKPOINT) {
sb.append(' ');
sb.append((end-start)/1000000f);
sb.append("ms");
diff --git a/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java b/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java index 2067e2ab..6900d9ed 100644 --- a/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java +++ b/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java @@ -44,7 +44,7 @@ public class JU_Log4JLogTargetTest { public void setup() {
initMocks(this);
}
-
+
@Test
public void testLoggable() {
Log4JLogTarget logObj = null;
|