Merge branch 'jh-vfs-trace2-p1-vfs' into jh-221

Includes gvfs-specific commits from PR#115

Author: jeffhostetler

builtin/commit.c

@@ -146,6 +146,7 @@ static int opt_parse_porcelain(const struct option *opt, const char *arg, int un
 static int do_serialize = 0;
 static char *serialize_path = NULL;
 
+static int reject_implicit = 0;
 static int do_implicit_deserialize = 0;
 static int do_explicit_deserialize = 0;
 static char *deserialize_path = NULL;
@@ -208,7 +209,7 @@ static int opt_parse_deserialize(const struct option *opt, const char *arg, int
 			deserialize_path = xstrdup(arg);
 		}
 		if (deserialize_path && *deserialize_path
-		    && (access(deserialize_path, R_OK) != 0))
+		    && (wt_status_deserialize_access(deserialize_path, R_OK) != 0))
 			die("cannot find serialization file '%s'",
 			    deserialize_path);
 
@@ -1414,6 +1415,8 @@ static int git_status_config(const char *k, const char *v, void *cb)
 		if (v && *v && access(v, R_OK) == 0) {
 			do_implicit_deserialize = 1;
 			deserialize_path = xstrdup(v);
+		} else {
+			reject_implicit = 1;
 		}
 		return 0;
 	}
@@ -1570,6 +1573,17 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 			   (do_implicit_deserialize || do_explicit_deserialize));
 	if (try_deserialize)
 		goto skip_init;
+	/*
+	 * If we implicitly received a status cache pathname from the config
+	 * and the file does not exist, we silently reject it and do the normal
+	 * status "collect".  Fake up some trace2 messages to reflect this and
+	 * assist post-processors know this case is different.
+	 */
+	if (!do_serialize && reject_implicit) {
+		trace2_cmd_mode("implicit-deserialize");
+		trace2_data_string("status", the_repository, "deserialize/reject",
+				   "status-cache/access");
+	}
 
 	enable_fscache(0);
 	if (status_format != STATUS_FORMAT_PORCELAIN &&
@@ -1613,6 +1627,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 		if (s.relative_paths)
 			s.prefix = prefix;
 
+		trace2_cmd_mode("deserialize");
 		result = wt_status_deserialize(&s, deserialize_path, dw);
 		if (result == DESERIALIZE_OK)
 			return 0;
@@ -1630,6 +1645,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 			fd = -1;
 	}
 
+	trace2_cmd_mode("collect");
 	wt_status_collect(&s);
 
 	if (0 <= fd)
@@ -1644,6 +1660,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 		if (fd_serialize < 0)
 			die_errno(_("could not serialize to '%s'"),
 				  serialize_path);
+		trace2_cmd_mode("serialize");
 		wt_status_serialize_v1(fd_serialize, &s);
 		close(fd_serialize);
 	}

sha1-file.c

@@ -806,6 +806,8 @@ static int read_object_process(const struct object_id *oid)
 
 	start = getnanotime();
 
+	trace2_region_enter("subprocess", "read_object", the_repository);
+
 	if (!subprocess_map_initialized) {
 		subprocess_map_initialized = 1;
 		hashmap_init(&subprocess_map, (hashmap_cmp_fn)cmd2process_cmp,
@@ -822,13 +824,16 @@ static int read_object_process(const struct object_id *oid)
 		if (subprocess_start(&subprocess_map, &entry->subprocess, cmd,
 				     start_read_object_fn)) {
 			free(entry);
-			return -1;
+			err = -1;
+			goto leave_region;
 		}
 	}
 	process = &entry->subprocess.process;
 
-	if (!(CAP_GET & entry->supported_capabilities))
-		return -1;
+	if (!(CAP_GET & entry->supported_capabilities)) {
+		err = -1;
+		goto leave_region;
+	}
 
 	sigchain_push(SIGPIPE, SIG_IGN);
 
@@ -877,6 +882,10 @@ static int read_object_process(const struct object_id *oid)
 
 	trace_performance_since(start, "read_object_process");
 
+leave_region:
+	trace2_region_leave_printf("subprocess", "read_object", the_repository,
+				   "result %d", err);
+
 	return err;
 }
 

virtualfilesystem.c

@@ -250,6 +250,11 @@ void apply_virtualfilesystem(struct index_state *istate)
 {
 	char *buf, *entry;
 	int i;
+	int nr_unknown = 0;
+	int nr_vfs_dirs = 0;
+	int nr_vfs_rows = 0;
+	int nr_bulk_skip = 0;
+	int nr_explicit_skip = 0;
 
 	if (!git_config_get_virtualfilesystem())
 		return;
@@ -267,35 +272,63 @@ void apply_virtualfilesystem(struct index_state *istate)
 		if (buf[i] == '\0') {
 			int pos, len;
 
+			nr_vfs_rows++;
+
 			len = buf + i - entry;
 
 			/* look for a directory wild card (ie "dir1/") */
 			if (buf[i - 1] == '/') {
+				nr_vfs_dirs++;
 				if (ignore_case)
 					adjust_dirname_case(istate, entry);
 				pos = index_name_pos(istate, entry, len);
 				if (pos < 0) {
 					pos = -pos - 1;
 					while (pos < istate->cache_nr && !fspathncmp(istate->cache[pos]->name, entry, len)) {
+						if (istate->cache[pos]->ce_flags & CE_SKIP_WORKTREE)
+							nr_bulk_skip++;
 						istate->cache[pos]->ce_flags &= ~CE_SKIP_WORKTREE;
 						pos++;
 					}
 				}
 			} else {
 				if (ignore_case) {
 					struct cache_entry *ce = index_file_exists(istate, entry, len, ignore_case);
-					if (ce)
+					if (ce) {
+						if (ce->ce_flags & CE_SKIP_WORKTREE)
+							nr_explicit_skip++;
 						ce->ce_flags &= ~CE_SKIP_WORKTREE;
+					}
+					else {
+						nr_unknown++;
+					}
 				} else {
 					int pos = index_name_pos(istate, entry, len);
-					if (pos >= 0)
+					if (pos >= 0) {
+						if (istate->cache[pos]->ce_flags & CE_SKIP_WORKTREE)
+							nr_explicit_skip++;
 						istate->cache[pos]->ce_flags &= ~CE_SKIP_WORKTREE;
+					}
+					else {
+						nr_unknown++;
+					}
 				}
 			}
 
 			entry += len + 1;
 		}
 	}
+
+	if (nr_vfs_rows > 0) {
+		trace2_data_intmax("vfs", the_repository, "apply/tracked", nr_bulk_skip + nr_explicit_skip);
+
+		trace2_data_intmax("vfs", the_repository, "apply/vfs_rows", nr_vfs_rows);
+		trace2_data_intmax("vfs", the_repository, "apply/vfs_dirs", nr_vfs_dirs);
+
+		trace2_data_intmax("vfs", the_repository, "apply/nr_unknown", nr_unknown);
+		trace2_data_intmax("vfs", the_repository, "apply/nr_bulk_skip", nr_bulk_skip);
+		trace2_data_intmax("vfs", the_repository, "apply/nr_explicit_skip", nr_explicit_skip);
+	}
 }
 
 /*