Changeset 049b332a85e8942742b92f21d6b7653574cfb54f
- Timestamp:
- 09/06/11 21:24:58
(2 years ago)
- Author:
- neophenix <neophenix@gmail.com>
- git-committer:
- neophenix <neophenix@gmail.com> 1315344298 -0400
- git-parent:
[576c59eb8d6e2ceec745959d2ccccb024d7f4324]
- git-author:
- neophenix <neophenix@gmail.com> 1315344298 -0400
- Message:
when one RTFMs one can see exactly what data types to support. Map, CompositeData? and MemoryUsage? are not needed. Have CompositeDataSupport? recurse regardless of the OpenType? as we will handle whatever it is in a subsequent call
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r576c59e |
r049b332 |
|
| 154 | 154 | rr.set(objectName + "`" + metricName, (Float)value); |
|---|
| 155 | 155 | } |
|---|
| 156 | | else if ( value instanceof CompositeData ) { |
|---|
| 157 | | CompositeType ct = ((CompositeData)value).getCompositeType(); |
|---|
| 158 | | Set<String> keys = ct.keySet(); |
|---|
| 159 | | for ( String key : keys ) { |
|---|
| 160 | | getMetric(objectName, metricName + "`" + key, ((CompositeData)value).get(key), rr); |
|---|
| 161 | | } |
|---|
| 162 | | } |
|---|
| 163 | | else if ( value instanceof MemoryUsage ) { |
|---|
| 164 | | rr.set(objectName + "`" + metricName + "`committed", ((MemoryUsage)value).getCommitted()); |
|---|
| 165 | | rr.set(objectName + "`" + metricName + "`init", ((MemoryUsage)value).getInit()); |
|---|
| 166 | | rr.set(objectName + "`" + metricName + "`max", ((MemoryUsage)value).getMax()); |
|---|
| 167 | | rr.set(objectName + "`" + metricName + "`used", ((MemoryUsage)value).getUsed()); |
|---|
| 168 | | } |
|---|
| 169 | 156 | else if ( value instanceof CompositeDataSupport ) { |
|---|
| 170 | 157 | CompositeDataSupport data = (CompositeDataSupport)value; |
|---|
| … | … | |
| 173 | 160 | for ( Iterator it = keys.iterator(); it.hasNext(); ) { |
|---|
| 174 | 161 | String key = (String)it.next(); |
|---|
| 175 | | Object v = data.get(key); |
|---|
| 176 | | OpenType ot = type.getType(key); |
|---|
| 177 | | if ( ot instanceof SimpleType ) { |
|---|
| 178 | | if ( data.containsKey("key") ) { |
|---|
| 179 | | getMetric(objectName, metricName + "`" + data.get("key"), data.get("value"), rr); |
|---|
| 180 | | } |
|---|
| 181 | | else { |
|---|
| 182 | | getMetric(objectName, metricName + "`" + key, data.get(key), rr); |
|---|
| 183 | | } |
|---|
| 184 | | } |
|---|
| | 162 | getMetric(objectName, metricName + "`" + key, data.get(key), rr); |
|---|
| 185 | 163 | } |
|---|
| 186 | 164 | } |
|---|
| … | … | |
| 193 | 171 | Object key2 = ki.next(); |
|---|
| 194 | 172 | CompositeData cd = data.get(new Object[] {key2}); |
|---|
| 195 | | Object v = cd.get("value"); |
|---|
| 196 | | OpenType ot = cd.getCompositeType().getType("value"); |
|---|
| 197 | | getMetric(objectName, metricName + "`" + key2, v, rr); |
|---|
| 198 | | } |
|---|
| 199 | | } |
|---|
| 200 | | } |
|---|
| 201 | | else if ( value instanceof Map ) { |
|---|
| 202 | | for ( Object entry : ((Map)value).entrySet() ) { |
|---|
| 203 | | Object key = ((Map.Entry<?,?>)entry).getKey(); |
|---|
| 204 | | Object v = ((Map.Entry<?,?>)entry).getValue(); |
|---|
| 205 | | getMetric(objectName, metricName, v, rr); |
|---|
| | 173 | getMetric(objectName, metricName + "`" + key2, cd.get("value"), rr); |
|---|
| | 174 | } |
|---|
| 206 | 175 | } |
|---|
| 207 | 176 | } |
|---|