inline lookup_replace_object() calls
In a repository without object replacement, lookup_replace_object() should be a no-op. Check the flag "read_replace_refs" on the side of the caller, and bypess a function call when we know we are not dealing with replacement. Also, even when we are set up to replace objects, if we do not find any replacement defined, flip that flag off to avoid function call overhead for all the later object accesses. As this change the semantics of the flag from "do we need read the replacement definition?" to "do we need to check with the lookup table?" the flag needs to be renamed later to something saner, e.g. "use_replace", when the codebase is calmer, but not now. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 15, 2011 at 12:54 UTC
e1111cef23cef1d48e9e7f222db87d58c1d51ece
3 files changed
+14
-4
cache.h
+10
-2
@@ -756,10 +756,18 @@ char *strip_path_suffix(const char *path, const char *suffix);
756
int daemon_avoid_alias(const char *path);
757
int offset_1st_component(const char *path);
758
759
+/* object replacement */
760
+extern void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size);
761
+extern const unsigned char *do_lookup_replace_object(const unsigned char *sha1);
762
+static inline const unsigned char *lookup_replace_object(const unsigned char *sha1)
763
+{
764
+ if (!read_replace_refs)
765
+ return sha1;
766
+ return do_lookup_replace_object(sha1);
767
+}
768
+
769
/* Read and unpack a sha1 file into memory, write memory to a sha1 file */
770
extern int sha1_object_info(const unsigned char *, unsigned long *);
761
-extern void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size);
762
-extern const unsigned char *lookup_replace_object(const unsigned char *sha1);
771
extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
772
extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
773
extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
environment.c
+1
-1
@@ -42,7 +42,7 @@ const char *editor_program;
42
const char *askpass_program;
43
const char *excludes_file;
44
enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
45
-int read_replace_refs = 1;
45
+int read_replace_refs = 1; /* NEEDSWORK: rename to use_replace_refs */
46
enum eol eol = EOL_UNSET;
47
enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
48
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
replace_object.c
+3
-1
@@ -85,12 +85,14 @@ static void prepare_replace_object(void)
85
86
for_each_replace_ref(register_replace_ref, NULL);
87
replace_object_prepared = 1;
88
+ if (!replace_object_nr)
89
+ read_replace_refs = 0;
90
}
91
92
/* We allow "recursive" replacement. Only within reason, though */
93
#define MAXREPLACEDEPTH 5
94
93
-const unsigned char *lookup_replace_object(const unsigned char *sha1)
95
+const unsigned char *do_lookup_replace_object(const unsigned char *sha1)
96
{
97
int pos, depth = MAXREPLACEDEPTH;
98
const unsigned char *cur = sha1;