Attachment #111609 for bug #203232

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 203232
Collapse All | Expand All




 */
package org.netbeans.modules.dlight.perfan.spi;

import java.io.File;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.util.ArrayList;

import org.netbeans.modules.dlight.spi.SunStudioLocatorFactory;
import org.netbeans.modules.dlight.spi.collector.DataCollector;
import org.netbeans.modules.dlight.api.datafilter.DataFilter;
import org.netbeans.modules.dlight.libs.common.PathUtilities;
import org.netbeans.modules.dlight.perfan.impl.SunStudioDCConfigurationAccessor;
import org.netbeans.modules.dlight.perfan.spi.datafilter.SunStudioFiltersProvider;
import org.netbeans.modules.dlight.perfan.spi.datafilter.THAFilter;

                // Try to remove _collector_directory_lock as well...
                // To make things simple - just do not look at the result of
                // this operation (it will fail if lock file doesn't exist)
                String dirName = PathUtilities.getDirName(experimentDirectory);
                String lockFile = dirName + "/" + "_collector_directory_lock"; // NOI18N
                rmFuture = CommonTasksSupport.rmFile(execEnv, lockFile, null);
                rmResult = rmFuture.get();
            }
        } catch (Throwable th) {

        }

        if (!result) {
            log.log(Level.SEVERE, "Unable to prepare an experiment directory!{0} at {1}", new Object[]{experimentDirectory, execEnv.toString()}); // NOI18N
        }

        return result;




 */
package org.netbeans.modules.dlight.perfan.stack.impl;

import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;

import org.netbeans.modules.dlight.core.stack.api.FunctionCall;
import org.netbeans.modules.dlight.core.stack.api.FunctionCallWithMetric;
import org.netbeans.modules.dlight.core.stack.api.FunctionMetric;
import org.netbeans.modules.dlight.libs.common.PathUtilities;
import org.netbeans.modules.dlight.spi.SourceFileInfoProvider.SourceFileInfo;

/**

            int line = sourceInfo.getLine();

            sb.append("; "); // NOI18N
            sb.append(PathUtilities.getBaseName(file));

            if (line > 0) {
                sb.append(':').append(line);

Return to bug 203232

Lines 41-47 Link Here

(-)a/dlight.perfan/src/org/netbeans/modules/dlight/perfan/spi/SunStudioDataCollector.java (-4 / +5 lines)
41	*/	41	*/
42	package org.netbeans.modules.dlight.perfan.spi;	42	package org.netbeans.modules.dlight.perfan.spi;
43		43
44	import java.io.File;
45	import java.io.IOException;	44	import java.io.IOException;
46	import java.io.OutputStreamWriter;	45	import java.io.OutputStreamWriter;
47	import java.util.ArrayList;	46	import java.util.ArrayList;
Lines 76-81 Link Here
76	import org.netbeans.modules.dlight.spi.SunStudioLocatorFactory;	75	import org.netbeans.modules.dlight.spi.SunStudioLocatorFactory;
77	import org.netbeans.modules.dlight.spi.collector.DataCollector;	76	import org.netbeans.modules.dlight.spi.collector.DataCollector;
78	import org.netbeans.modules.dlight.api.datafilter.DataFilter;	77	import org.netbeans.modules.dlight.api.datafilter.DataFilter;
		78	import org.netbeans.modules.dlight.libs.common.PathUtilities;
79	import org.netbeans.modules.dlight.perfan.impl.SunStudioDCConfigurationAccessor;	79	import org.netbeans.modules.dlight.perfan.impl.SunStudioDCConfigurationAccessor;
80	import org.netbeans.modules.dlight.perfan.spi.datafilter.SunStudioFiltersProvider;	80	import org.netbeans.modules.dlight.perfan.spi.datafilter.SunStudioFiltersProvider;
81	import org.netbeans.modules.dlight.perfan.spi.datafilter.THAFilter;	81	import org.netbeans.modules.dlight.perfan.spi.datafilter.THAFilter;
Lines 636-643 Link Here
636	// Try to remove _collector_directory_lock as well...	636	// Try to remove _collector_directory_lock as well...
637	// To make things simple - just do not look at the result of	637	// To make things simple - just do not look at the result of
638	// this operation (it will fail if lock file doesn't exist)	638	// this operation (it will fail if lock file doesn't exist)
639	File lockFile = new File(new File(experimentDirectory).getParentFile(), "_collector_directory_lock"); // NOI18N	639	String dirName = PathUtilities.getDirName(experimentDirectory);
640	rmFuture = CommonTasksSupport.rmFile(execEnv, lockFile.getPath(), null);	640	String lockFile = dirName + "/" + "_collector_directory_lock"; // NOI18N
		641	rmFuture = CommonTasksSupport.rmFile(execEnv, lockFile, null);
641	rmResult = rmFuture.get();	642	rmResult = rmFuture.get();
642	}	643	}
643	} catch (Throwable th) {	644	} catch (Throwable th) {
Lines 645-651 Link Here
645	}	646	}
646		647
647	if (!result) {	648	if (!result) {
648	log.severe("Unable to prepare an experiment directory!"); // NOI18N	649	log.log(Level.SEVERE, "Unable to prepare an experiment directory!{0} at {1}", new Object[]{experimentDirectory, execEnv.toString()}); // NOI18N
649	}	650	}
650		651
651	return result;	652	return result;

Lines 41-47 Link Here

(-)a/dlight.perfan/src/org/netbeans/modules/dlight/perfan/stack/impl/FunctionCallImpl.java (-2 / +2 lines)
41	*/	41	*/
42	package org.netbeans.modules.dlight.perfan.stack.impl;	42	package org.netbeans.modules.dlight.perfan.stack.impl;
43		43
44	import java.io.File;
45	import java.util.ArrayList;	44	import java.util.ArrayList;
46	import java.util.Collections;	45	import java.util.Collections;
47	import java.util.HashMap;	46	import java.util.HashMap;
Lines 53-58 Link Here
53	import org.netbeans.modules.dlight.core.stack.api.FunctionCall;	52	import org.netbeans.modules.dlight.core.stack.api.FunctionCall;
54	import org.netbeans.modules.dlight.core.stack.api.FunctionCallWithMetric;	53	import org.netbeans.modules.dlight.core.stack.api.FunctionCallWithMetric;
55	import org.netbeans.modules.dlight.core.stack.api.FunctionMetric;	54	import org.netbeans.modules.dlight.core.stack.api.FunctionMetric;
		55	import org.netbeans.modules.dlight.libs.common.PathUtilities;
56	import org.netbeans.modules.dlight.spi.SourceFileInfoProvider.SourceFileInfo;	56	import org.netbeans.modules.dlight.spi.SourceFileInfoProvider.SourceFileInfo;
57		57
58	/**	58	/**
Lines 181-187 Link Here
181	int line = sourceInfo.getLine();	181	int line = sourceInfo.getLine();
182		182
183	sb.append("; "); // NOI18N	183	sb.append("; "); // NOI18N
184	sb.append(new File(file).getName());	184	sb.append(PathUtilities.getBaseName(file));
185		185
186	if (line > 0) {	186	if (line > 0) {
187	sb.append(':').append(line);	187	sb.append(':').append(line);