aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build
diff options
context:
space:
mode:
authorGravatar Han-Wen Nienhuys <hanwen@google.com>2015-03-12 15:09:42 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-03-13 14:37:48 +0000
commit14c542c770b8b3d2a07467ad86e021501c710c5a (patch)
tree3dc8c514846c94d9f19ea38474b36275c2dd268a /src/main/java/com/google/devtools/build
parent5290d995ffe0c6e942ad514857e05533994cadcd (diff)
Use VFS_READLINK rather than VFS_LINK, to avoid confusion with the
link system call. -- MOS_MIGRATED_REVID=88441395
Diffstat (limited to 'src/main/java/com/google/devtools/build')
-rw-r--r--src/main/java/com/google/devtools/build/lib/profiler/ProfilerTask.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/profiler/chart/AggregatingChartCreator.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/vfs/JavaIoFileSystem.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/vfs/UnixFileSystem.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/profiler/ProfilerTask.java b/src/main/java/com/google/devtools/build/lib/profiler/ProfilerTask.java
index d06626c204..407fd3c10f 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/ProfilerTask.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/ProfilerTask.java
@@ -52,7 +52,7 @@ public enum ProfilerTask {
FETCH("Remote execution file fetching", 50000000, 0xBB99CC, 0),
VFS_STAT("VFS stat", 10000000, 0x9999FF, 30),
VFS_DIR("VFS readdir", 10000000, 0x0066CC, 30),
- VFS_LINK("VFS readlink", 10000000, 0x99CCCC, 30),
+ VFS_READLINK("VFS readlink", 10000000, 0x99CCCC, 30),
VFS_MD5("VFS md5", 10000000, 0x999999, 30),
VFS_XATTR("VFS xattr", 10000000, 0x9999DD, 30),
VFS_DELETE("VFS delete", 10000000, 0xFFCC00, 0),
diff --git a/src/main/java/com/google/devtools/build/lib/profiler/chart/AggregatingChartCreator.java b/src/main/java/com/google/devtools/build/lib/profiler/chart/AggregatingChartCreator.java
index 469e605bc2..c0eb26dad1 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/chart/AggregatingChartCreator.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/chart/AggregatingChartCreator.java
@@ -56,7 +56,7 @@ public class AggregatingChartCreator implements ChartCreator {
/** The tasks in the 'VFS' category. */
private static Set<ProfilerTask> VFS_TASKS =
- EnumSet.of(ProfilerTask.VFS_STAT, ProfilerTask.VFS_DIR, ProfilerTask.VFS_LINK,
+ EnumSet.of(ProfilerTask.VFS_STAT, ProfilerTask.VFS_DIR, ProfilerTask.VFS_READLINK,
ProfilerTask.VFS_MD5, ProfilerTask.VFS_DELETE, ProfilerTask.VFS_OPEN,
ProfilerTask.VFS_READ, ProfilerTask.VFS_WRITE, ProfilerTask.VFS_GLOB,
ProfilerTask.VFS_XATTR);
diff --git a/src/main/java/com/google/devtools/build/lib/vfs/JavaIoFileSystem.java b/src/main/java/com/google/devtools/build/lib/vfs/JavaIoFileSystem.java
index 08e67f78e6..3dffb1a3d3 100644
--- a/src/main/java/com/google/devtools/build/lib/vfs/JavaIoFileSystem.java
+++ b/src/main/java/com/google/devtools/build/lib/vfs/JavaIoFileSystem.java
@@ -291,7 +291,7 @@ public class JavaIoFileSystem extends AbstractFileSystem {
} catch (java.nio.file.NoSuchFileException e) {
throw new FileNotFoundException(path + ERR_NO_SUCH_FILE_OR_DIR);
} finally {
- profiler.logSimpleTask(startTime, ProfilerTask.VFS_LINK, file.getPath());
+ profiler.logSimpleTask(startTime, ProfilerTask.VFS_READLINK, file.getPath());
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/vfs/UnixFileSystem.java b/src/main/java/com/google/devtools/build/lib/vfs/UnixFileSystem.java
index c7dd3a8224..3ceb491374 100644
--- a/src/main/java/com/google/devtools/build/lib/vfs/UnixFileSystem.java
+++ b/src/main/java/com/google/devtools/build/lib/vfs/UnixFileSystem.java
@@ -332,7 +332,7 @@ public class UnixFileSystem extends AbstractFileSystem {
// EINVAL => not a symbolic link. Anything else is a real error.
throw e.getMessage().endsWith("(Invalid argument)") ? new NotASymlinkException(path) : e;
} finally {
- profiler.logSimpleTask(startTime, ProfilerTask.VFS_LINK, name);
+ profiler.logSimpleTask(startTime, ProfilerTask.VFS_READLINK, name);
}
}