Attachment #106983 for bug #196680

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 196680
Collapse All | Expand All





    private final DataRow dataRow;
    private final List<CharSequence> callStack;
    private final long contextID;

    public DTraceEventData(final DataRow dataRow) {
        this(dataRow, null, -1);
    }

    public DTraceEventData(final DataRow dataRow, final List<CharSequence> callStack, long contextID) {
        assert dataRow != null;
        this.dataRow = dataRow;
        this.callStack = callStack;
        this.contextID = contextID;
    }

    public List<CharSequence> getEventCallStack() {
        return callStack == null ? null : Collections.unmodifiableList(callStack);
    }

    public long getContextID() {
        return contextID;
    }

    public DataRow getDataRow() {
        return dataRow;
    }

Lines 132-138 Link Here

(-)a/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DataAndStacksParser.java (-1 / +1 lines)
132		132
133	if (currData != null) {	133	if (currData != null) {
134	if (currStack != null && currStack.size() > 0) {	134	if (currStack != null && currStack.size() > 0) {
135	result = new DTraceEventData(new DataRow(colNames, currData), currStack);	135	result = new DTraceEventData(new DataRow(colNames, currData), currStack, -1);
136	currStack = null;	136	currStack = null;
137	} else {	137	} else {
138	// Empty line after data.. just return data	138	// Empty line after data.. just return data





                if (timestampColumnIdx == -1 || durationColumnIdx == -1) {
                    //TODO: define context
                    stackID = stackStorage.putStack(data.getContextID(), callStack);
                } else {
                    long time = DataUtil.toLong(dataRow.getData().get(timestampColumnIdx));
                    long duration = DataUtil.toLong(dataRow.getData().get(durationColumnIdx));
                    //TODO: define context
                    stackID = stackStorage.putSample(data.getContextID(), callStack, time, duration);
                }

                if (stackRefColumnIdx >= 0) {

Return to bug 196680

Lines 55-75 Link Here

(-)a/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/DTraceEventData.java (-2 / +8 lines)
55		55
56	private final DataRow dataRow;	56	private final DataRow dataRow;
57	private final List<CharSequence> callStack;	57	private final List<CharSequence> callStack;
		58	private final long contextID;
58		59
59	public DTraceEventData(final DataRow dataRow) {	60	public DTraceEventData(final DataRow dataRow) {
60	this(dataRow, null);	61	this(dataRow, null, -1);
61	}	62	}
62		63
63	public DTraceEventData(final DataRow dataRow, final List<CharSequence> callStack) {	64	public DTraceEventData(final DataRow dataRow, final List<CharSequence> callStack, long contextID) {
64	assert dataRow != null;	65	assert dataRow != null;
65	this.dataRow = dataRow;	66	this.dataRow = dataRow;
66	this.callStack = callStack;	67	this.callStack = callStack;
		68	this.contextID = contextID;
67	}	69	}
68		70
69	public List<CharSequence> getEventCallStack() {	71	public List<CharSequence> getEventCallStack() {
70	return callStack == null ? null : Collections.unmodifiableList(callStack);	72	return callStack == null ? null : Collections.unmodifiableList(callStack);
71	}	73	}
72		74
		75	public long getContextID() {
		76	return contextID;
		77	}
		78
73	public DataRow getDataRow() {	79	public DataRow getDataRow() {
74	return dataRow;	80	return dataRow;
75	}	81	}

Lines 111-122 Link Here

(-)a/dlight.dtrace/src/org/netbeans/modules/dlight/dtrace/collector/support/DefaultOutputProcessor.java (-2 / +2 lines)
111		111
112	if (timestampColumnIdx == -1 \|\| durationColumnIdx == -1) {	112	if (timestampColumnIdx == -1 \|\| durationColumnIdx == -1) {
113	//TODO: define context	113	//TODO: define context
114	stackID = stackStorage.putStack(-1, callStack);	114	stackID = stackStorage.putStack(data.getContextID(), callStack);
115	} else {	115	} else {
116	long time = DataUtil.toLong(dataRow.getData().get(timestampColumnIdx));	116	long time = DataUtil.toLong(dataRow.getData().get(timestampColumnIdx));
117	long duration = DataUtil.toLong(dataRow.getData().get(durationColumnIdx));	117	long duration = DataUtil.toLong(dataRow.getData().get(durationColumnIdx));
118	//TODO: define context	118	//TODO: define context
119	stackID = stackStorage.putSample(-1, callStack, time, duration);	119	stackID = stackStorage.putSample(data.getContextID(), callStack, time, duration);
120	}	120	}
121		121
122	if (stackRefColumnIdx >= 0) {	122	if (stackRefColumnIdx >= 0) {