Ramsay Jones | 2ad9d4c | 2011-04-07 19:23:40 +0100 | [diff] [blame] | 1 | #include "builtin.h" |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 2 | #include "delta.h" |
| 3 | #include "pack.h" |
| 4 | #include "csum-file.h" |
Peter Eriksen | 8e44025 | 2006-04-02 14:44:09 +0200 | [diff] [blame] | 5 | #include "blob.h" |
| 6 | #include "commit.h" |
| 7 | #include "tag.h" |
| 8 | #include "tree.h" |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 9 | #include "progress.h" |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 10 | #include "fsck.h" |
Steffen Prohaska | 2fb3f6d | 2009-01-18 13:00:12 +0100 | [diff] [blame] | 11 | #include "exec_cmd.h" |
Nguyễn Thái Ngọc Duy | 4614043 | 2012-05-24 20:55:44 +0700 | [diff] [blame] | 12 | #include "streaming.h" |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 13 | #include "thread-utils.h" |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 14 | |
| 15 | static const char index_pack_usage[] = |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 16 | "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 17 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 18 | struct object_entry { |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 19 | struct pack_idx_entry idx; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 20 | unsigned long size; |
| 21 | unsigned int hdr_size; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 22 | enum object_type type; |
| 23 | enum object_type real_type; |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 24 | unsigned delta_depth; |
| 25 | int base_object_no; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 26 | }; |
| 27 | |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 28 | union delta_base { |
| 29 | unsigned char sha1[20]; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 30 | off_t offset; |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 31 | }; |
| 32 | |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 33 | struct base_data { |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 34 | struct base_data *base; |
| 35 | struct base_data *child; |
Shawn O. Pearce | 03993e1 | 2008-07-13 22:07:46 -0400 | [diff] [blame] | 36 | struct object_entry *obj; |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 37 | void *data; |
| 38 | unsigned long size; |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 39 | int ref_first, ref_last; |
| 40 | int ofs_first, ofs_last; |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 41 | }; |
| 42 | |
Junio C Hamano | c0f8654 | 2012-06-26 19:19:32 +0100 | [diff] [blame] | 43 | #if !defined(NO_PTHREADS) && defined(NO_THREAD_SAFE_PREAD) |
| 44 | /* pread() emulation is not thread-safe. Disable threading. */ |
Nguyễn Thái Ngọc Duy | b038a61 | 2012-05-06 19:31:56 +0700 | [diff] [blame] | 45 | #define NO_PTHREADS |
| 46 | #endif |
| 47 | |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 48 | struct thread_local { |
| 49 | #ifndef NO_PTHREADS |
| 50 | pthread_t thread; |
| 51 | #endif |
| 52 | struct base_data *base_cache; |
| 53 | size_t base_cache_used; |
| 54 | }; |
| 55 | |
Nicolas Pitre | 3c55287 | 2006-10-17 16:23:26 -0400 | [diff] [blame] | 56 | /* |
| 57 | * Even if sizeof(union delta_base) == 24 on 64-bit archs, we really want |
| 58 | * to memcmp() only the first 20 bytes. |
| 59 | */ |
| 60 | #define UNION_BASE_SZ 20 |
| 61 | |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 62 | #define FLAG_LINK (1u<<20) |
| 63 | #define FLAG_CHECKED (1u<<21) |
| 64 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 65 | struct delta_entry { |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 66 | union delta_base base; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 67 | int obj_no; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 68 | }; |
| 69 | |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 70 | static struct object_entry *objects; |
| 71 | static struct delta_entry *deltas; |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 72 | static struct thread_local nothread_data; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 73 | static int nr_objects; |
| 74 | static int nr_deltas; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 75 | static int nr_resolved_deltas; |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 76 | static int nr_threads; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 77 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 78 | static int from_stdin; |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 79 | static int strict; |
Nicolas Pitre | 3c9af36 | 2006-10-25 23:32:59 -0400 | [diff] [blame] | 80 | static int verbose; |
| 81 | |
Nicolas Pitre | dc6a075 | 2007-10-30 14:57:32 -0400 | [diff] [blame] | 82 | static struct progress *progress; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 83 | |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 84 | /* We always read in 4kB chunks. */ |
| 85 | static unsigned char input_buffer[4096]; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 86 | static unsigned int input_offset, input_len; |
| 87 | static off_t consumed_bytes; |
Junio C Hamano | d1a0ed1 | 2011-06-03 15:32:16 -0700 | [diff] [blame] | 88 | static unsigned deepest_delta; |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 89 | static git_SHA_CTX input_ctx; |
Nicolas Pitre | ee5743c | 2007-04-09 01:06:32 -0400 | [diff] [blame] | 90 | static uint32_t input_crc32; |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 91 | static int input_fd, output_fd, pack_fd; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 92 | |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 93 | #ifndef NO_PTHREADS |
| 94 | |
| 95 | static struct thread_local *thread_data; |
| 96 | static int nr_dispatched; |
| 97 | static int threads_active; |
| 98 | |
| 99 | static pthread_mutex_t read_mutex; |
| 100 | #define read_lock() lock_mutex(&read_mutex) |
| 101 | #define read_unlock() unlock_mutex(&read_mutex) |
| 102 | |
| 103 | static pthread_mutex_t counter_mutex; |
| 104 | #define counter_lock() lock_mutex(&counter_mutex) |
| 105 | #define counter_unlock() unlock_mutex(&counter_mutex) |
| 106 | |
| 107 | static pthread_mutex_t work_mutex; |
| 108 | #define work_lock() lock_mutex(&work_mutex) |
| 109 | #define work_unlock() unlock_mutex(&work_mutex) |
| 110 | |
| 111 | static pthread_key_t key; |
| 112 | |
| 113 | static inline void lock_mutex(pthread_mutex_t *mutex) |
| 114 | { |
| 115 | if (threads_active) |
| 116 | pthread_mutex_lock(mutex); |
| 117 | } |
| 118 | |
| 119 | static inline void unlock_mutex(pthread_mutex_t *mutex) |
| 120 | { |
| 121 | if (threads_active) |
| 122 | pthread_mutex_unlock(mutex); |
| 123 | } |
| 124 | |
| 125 | /* |
| 126 | * Mutex and conditional variable can't be statically-initialized on Windows. |
| 127 | */ |
| 128 | static void init_thread(void) |
| 129 | { |
| 130 | init_recursive_mutex(&read_mutex); |
| 131 | pthread_mutex_init(&counter_mutex, NULL); |
| 132 | pthread_mutex_init(&work_mutex, NULL); |
| 133 | pthread_key_create(&key, NULL); |
| 134 | thread_data = xcalloc(nr_threads, sizeof(*thread_data)); |
| 135 | threads_active = 1; |
| 136 | } |
| 137 | |
| 138 | static void cleanup_thread(void) |
| 139 | { |
| 140 | if (!threads_active) |
| 141 | return; |
| 142 | threads_active = 0; |
| 143 | pthread_mutex_destroy(&read_mutex); |
| 144 | pthread_mutex_destroy(&counter_mutex); |
| 145 | pthread_mutex_destroy(&work_mutex); |
| 146 | pthread_key_delete(key); |
| 147 | free(thread_data); |
| 148 | } |
| 149 | |
| 150 | #else |
| 151 | |
| 152 | #define read_lock() |
| 153 | #define read_unlock() |
| 154 | |
| 155 | #define counter_lock() |
| 156 | #define counter_unlock() |
| 157 | |
| 158 | #define work_lock() |
| 159 | #define work_unlock() |
| 160 | |
| 161 | #endif |
| 162 | |
| 163 | |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 164 | static int mark_link(struct object *obj, int type, void *data) |
| 165 | { |
| 166 | if (!obj) |
| 167 | return -1; |
| 168 | |
| 169 | if (type != OBJ_ANY && obj->type != type) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 170 | die(_("object type mismatch at %s"), sha1_to_hex(obj->sha1)); |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 171 | |
| 172 | obj->flags |= FLAG_LINK; |
| 173 | return 0; |
| 174 | } |
| 175 | |
| 176 | /* The content of each linked object must have been checked |
| 177 | or it must be already present in the object database */ |
| 178 | static void check_object(struct object *obj) |
| 179 | { |
| 180 | if (!obj) |
| 181 | return; |
| 182 | |
| 183 | if (!(obj->flags & FLAG_LINK)) |
| 184 | return; |
| 185 | |
| 186 | if (!(obj->flags & FLAG_CHECKED)) { |
| 187 | unsigned long size; |
| 188 | int type = sha1_object_info(obj->sha1, &size); |
| 189 | if (type != obj->type || type <= 0) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 190 | die(_("object of unexpected type")); |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 191 | obj->flags |= FLAG_CHECKED; |
| 192 | return; |
| 193 | } |
| 194 | } |
| 195 | |
| 196 | static void check_objects(void) |
| 197 | { |
| 198 | unsigned i, max; |
| 199 | |
| 200 | max = get_max_object_index(); |
| 201 | for (i = 0; i < max; i++) |
| 202 | check_object(get_indexed_object(i)); |
| 203 | } |
| 204 | |
| 205 | |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 206 | /* Discard current buffer used content. */ |
Rene Scharfe | a6e8a76 | 2006-11-18 13:07:06 +0100 | [diff] [blame] | 207 | static void flush(void) |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 208 | { |
| 209 | if (input_offset) { |
| 210 | if (output_fd >= 0) |
| 211 | write_or_die(output_fd, input_buffer, input_offset); |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 212 | git_SHA1_Update(&input_ctx, input_buffer, input_offset); |
Jim Meyering | 554a263 | 2006-12-11 19:06:34 +0100 | [diff] [blame] | 213 | memmove(input_buffer, input_buffer + input_offset, input_len); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 214 | input_offset = 0; |
| 215 | } |
| 216 | } |
| 217 | |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 218 | /* |
| 219 | * Make sure at least "min" bytes are available in the buffer, and |
| 220 | * return the pointer to the buffer. |
| 221 | */ |
Nicolas Pitre | b89c4e9 | 2006-10-27 16:14:23 -0400 | [diff] [blame] | 222 | static void *fill(int min) |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 223 | { |
| 224 | if (min <= input_len) |
| 225 | return input_buffer + input_offset; |
| 226 | if (min > sizeof(input_buffer)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 227 | die(Q_("cannot fill %d byte", |
| 228 | "cannot fill %d bytes", |
| 229 | min), |
| 230 | min); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 231 | flush(); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 232 | do { |
Johan Herland | 8a912bc | 2007-05-15 14:49:22 +0200 | [diff] [blame] | 233 | ssize_t ret = xread(input_fd, input_buffer + input_len, |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 234 | sizeof(input_buffer) - input_len); |
| 235 | if (ret <= 0) { |
| 236 | if (!ret) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 237 | die(_("early EOF")); |
| 238 | die_errno(_("read error on input")); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 239 | } |
| 240 | input_len += ret; |
Nicolas Pitre | 218558a | 2007-11-04 22:15:41 -0500 | [diff] [blame] | 241 | if (from_stdin) |
| 242 | display_throughput(progress, consumed_bytes + input_len); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 243 | } while (input_len < min); |
| 244 | return input_buffer; |
| 245 | } |
| 246 | |
| 247 | static void use(int bytes) |
| 248 | { |
| 249 | if (bytes > input_len) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 250 | die(_("used more bytes than were available")); |
Nicolas Pitre | ee5743c | 2007-04-09 01:06:32 -0400 | [diff] [blame] | 251 | input_crc32 = crc32(input_crc32, input_buffer + input_offset, bytes); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 252 | input_len -= bytes; |
| 253 | input_offset += bytes; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 254 | |
| 255 | /* make sure off_t is sufficiently large not to wrap */ |
Erik Faye-Lund | c03c831 | 2010-10-05 09:24:10 +0200 | [diff] [blame] | 256 | if (signed_add_overflows(consumed_bytes, bytes)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 257 | die(_("pack too large for current definition of off_t")); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 258 | consumed_bytes += bytes; |
| 259 | } |
| 260 | |
Linus Torvalds | 3bb7256 | 2010-01-22 07:55:19 -0800 | [diff] [blame] | 261 | static const char *open_pack_file(const char *pack_name) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 262 | { |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 263 | if (from_stdin) { |
| 264 | input_fd = 0; |
| 265 | if (!pack_name) { |
Ævar Arnfjörð Bjarmason | ab1900a | 2011-12-21 01:18:21 +0000 | [diff] [blame] | 266 | static char tmp_file[PATH_MAX]; |
| 267 | output_fd = odb_mkstemp(tmp_file, sizeof(tmp_file), |
Junio C Hamano | 6e180cd | 2009-02-24 23:11:29 -0800 | [diff] [blame] | 268 | "pack/tmp_pack_XXXXXX"); |
Ævar Arnfjörð Bjarmason | ab1900a | 2011-12-21 01:18:21 +0000 | [diff] [blame] | 269 | pack_name = xstrdup(tmp_file); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 270 | } else |
| 271 | output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600); |
| 272 | if (output_fd < 0) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 273 | die_errno(_("unable to create '%s'"), pack_name); |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 274 | pack_fd = output_fd; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 275 | } else { |
| 276 | input_fd = open(pack_name, O_RDONLY); |
| 277 | if (input_fd < 0) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 278 | die_errno(_("cannot open packfile '%s'"), pack_name); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 279 | output_fd = -1; |
Nicolas Pitre | 6d2fa7f | 2006-12-19 10:53:08 -0500 | [diff] [blame] | 280 | pack_fd = input_fd; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 281 | } |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 282 | git_SHA1_Init(&input_ctx); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 283 | return pack_name; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 284 | } |
| 285 | |
| 286 | static void parse_pack_header(void) |
| 287 | { |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 288 | struct pack_header *hdr = fill(sizeof(struct pack_header)); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 289 | |
| 290 | /* Header consistency check */ |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 291 | if (hdr->hdr_signature != htonl(PACK_SIGNATURE)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 292 | die(_("pack signature mismatch")); |
Nicolas Pitre | d60fc1c | 2006-02-09 17:50:04 -0500 | [diff] [blame] | 293 | if (!pack_version_ok(hdr->hdr_version)) |
Ramsay Jones | 6e1c234 | 2008-07-03 16:52:09 +0100 | [diff] [blame] | 294 | die("pack version %"PRIu32" unsupported", |
| 295 | ntohl(hdr->hdr_version)); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 296 | |
| 297 | nr_objects = ntohl(hdr->hdr_entries); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 298 | use(sizeof(struct pack_header)); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 299 | } |
| 300 | |
Erik Faye-Lund | a4f3131 | 2009-09-30 18:05:49 +0000 | [diff] [blame] | 301 | static NORETURN void bad_object(unsigned long offset, const char *format, |
| 302 | ...) __attribute__((format (printf, 2, 3))); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 303 | |
Stephen Boyd | c2e86ad | 2011-03-22 00:51:05 -0700 | [diff] [blame] | 304 | static NORETURN void bad_object(unsigned long offset, const char *format, ...) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 305 | { |
| 306 | va_list params; |
| 307 | char buf[1024]; |
| 308 | |
| 309 | va_start(params, format); |
| 310 | vsnprintf(buf, sizeof(buf), format, params); |
| 311 | va_end(params); |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 312 | die(_("pack has bad object at offset %lu: %s"), offset, buf); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 313 | } |
| 314 | |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 315 | static inline struct thread_local *get_thread_data(void) |
| 316 | { |
| 317 | #ifndef NO_PTHREADS |
| 318 | if (threads_active) |
| 319 | return pthread_getspecific(key); |
| 320 | assert(!threads_active && |
| 321 | "This should only be reached when all threads are gone"); |
| 322 | #endif |
| 323 | return ¬hread_data; |
| 324 | } |
| 325 | |
| 326 | #ifndef NO_PTHREADS |
| 327 | static void set_thread_data(struct thread_local *data) |
| 328 | { |
| 329 | if (threads_active) |
| 330 | pthread_setspecific(key, data); |
| 331 | } |
| 332 | #endif |
| 333 | |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 334 | static struct base_data *alloc_base_data(void) |
| 335 | { |
| 336 | struct base_data *base = xmalloc(sizeof(struct base_data)); |
| 337 | memset(base, 0, sizeof(*base)); |
| 338 | base->ref_last = -1; |
| 339 | base->ofs_last = -1; |
| 340 | return base; |
| 341 | } |
| 342 | |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 343 | static void free_base_data(struct base_data *c) |
| 344 | { |
| 345 | if (c->data) { |
| 346 | free(c->data); |
| 347 | c->data = NULL; |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 348 | get_thread_data()->base_cache_used -= c->size; |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 349 | } |
| 350 | } |
| 351 | |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 352 | static void prune_base_data(struct base_data *retain) |
| 353 | { |
Benjamin Kramer | 8e24cba | 2009-03-15 22:01:20 +0100 | [diff] [blame] | 354 | struct base_data *b; |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 355 | struct thread_local *data = get_thread_data(); |
| 356 | for (b = data->base_cache; |
| 357 | data->base_cache_used > delta_base_cache_limit && b; |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 358 | b = b->child) { |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 359 | if (b->data && b != retain) |
| 360 | free_base_data(b); |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 361 | } |
| 362 | } |
| 363 | |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 364 | static void link_base_data(struct base_data *base, struct base_data *c) |
| 365 | { |
| 366 | if (base) |
| 367 | base->child = c; |
| 368 | else |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 369 | get_thread_data()->base_cache = c; |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 370 | |
| 371 | c->base = base; |
| 372 | c->child = NULL; |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 373 | if (c->data) |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 374 | get_thread_data()->base_cache_used += c->size; |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 375 | prune_base_data(c); |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 376 | } |
| 377 | |
| 378 | static void unlink_base_data(struct base_data *c) |
| 379 | { |
| 380 | struct base_data *base = c->base; |
| 381 | if (base) |
| 382 | base->child = NULL; |
| 383 | else |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 384 | get_thread_data()->base_cache = NULL; |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 385 | free_base_data(c); |
Shawn O. Pearce | 4a438ca | 2008-07-13 22:07:45 -0400 | [diff] [blame] | 386 | } |
| 387 | |
Nguyễn Thái Ngọc Duy | 681b07d | 2012-05-23 21:09:46 +0700 | [diff] [blame] | 388 | static int is_delta_type(enum object_type type) |
| 389 | { |
| 390 | return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA); |
| 391 | } |
| 392 | |
| 393 | static void *unpack_entry_data(unsigned long offset, unsigned long size, |
| 394 | enum object_type type, unsigned char *sha1) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 395 | { |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 396 | static char fixed_buf[8192]; |
Nicolas Pitre | 7ce4721 | 2010-04-12 12:12:06 -0400 | [diff] [blame] | 397 | int status; |
Junio C Hamano | ef49a7a | 2011-06-10 11:52:15 -0700 | [diff] [blame] | 398 | git_zstream stream; |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 399 | void *buf; |
Nguyễn Thái Ngọc Duy | 681b07d | 2012-05-23 21:09:46 +0700 | [diff] [blame] | 400 | git_SHA_CTX c; |
| 401 | char hdr[32]; |
| 402 | int hdrlen; |
| 403 | |
| 404 | if (!is_delta_type(type)) { |
| 405 | hdrlen = sprintf(hdr, "%s %lu", typename(type), size) + 1; |
| 406 | git_SHA1_Init(&c); |
| 407 | git_SHA1_Update(&c, hdr, hdrlen); |
| 408 | } else |
| 409 | sha1 = NULL; |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 410 | if (type == OBJ_BLOB && size > big_file_threshold) |
| 411 | buf = fixed_buf; |
| 412 | else |
| 413 | buf = xmalloc(size); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 414 | |
| 415 | memset(&stream, 0, sizeof(stream)); |
Nicolas Pitre | 7ce4721 | 2010-04-12 12:12:06 -0400 | [diff] [blame] | 416 | git_inflate_init(&stream); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 417 | stream.next_out = buf; |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 418 | stream.avail_out = buf == fixed_buf ? sizeof(fixed_buf) : size; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 419 | |
Nicolas Pitre | 7ce4721 | 2010-04-12 12:12:06 -0400 | [diff] [blame] | 420 | do { |
Nguyễn Thái Ngọc Duy | 681b07d | 2012-05-23 21:09:46 +0700 | [diff] [blame] | 421 | unsigned char *last_out = stream.next_out; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 422 | stream.next_in = fill(1); |
| 423 | stream.avail_in = input_len; |
Nicolas Pitre | 7ce4721 | 2010-04-12 12:12:06 -0400 | [diff] [blame] | 424 | status = git_inflate(&stream, 0); |
| 425 | use(input_len - stream.avail_in); |
Nguyễn Thái Ngọc Duy | 681b07d | 2012-05-23 21:09:46 +0700 | [diff] [blame] | 426 | if (sha1) |
| 427 | git_SHA1_Update(&c, last_out, stream.next_out - last_out); |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 428 | if (buf == fixed_buf) { |
| 429 | stream.next_out = buf; |
| 430 | stream.avail_out = sizeof(fixed_buf); |
| 431 | } |
Nicolas Pitre | 7ce4721 | 2010-04-12 12:12:06 -0400 | [diff] [blame] | 432 | } while (status == Z_OK); |
| 433 | if (stream.total_out != size || status != Z_STREAM_END) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 434 | bad_object(offset, _("inflate returned %d"), status); |
Linus Torvalds | 39c6854 | 2009-01-07 19:54:47 -0800 | [diff] [blame] | 435 | git_inflate_end(&stream); |
Nguyễn Thái Ngọc Duy | 681b07d | 2012-05-23 21:09:46 +0700 | [diff] [blame] | 436 | if (sha1) |
| 437 | git_SHA1_Final(sha1, &c); |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 438 | return buf == fixed_buf ? NULL : buf; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 439 | } |
| 440 | |
Nguyễn Thái Ngọc Duy | 681b07d | 2012-05-23 21:09:46 +0700 | [diff] [blame] | 441 | static void *unpack_raw_entry(struct object_entry *obj, |
| 442 | union delta_base *delta_base, |
| 443 | unsigned char *sha1) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 444 | { |
Linus Torvalds | 48fb7de | 2009-06-17 17:22:27 -0700 | [diff] [blame] | 445 | unsigned char *p; |
| 446 | unsigned long size, c; |
Nicolas Pitre | d7dd022 | 2007-04-09 01:06:30 -0400 | [diff] [blame] | 447 | off_t base_offset; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 448 | unsigned shift; |
Nicolas Pitre | ee5743c | 2007-04-09 01:06:32 -0400 | [diff] [blame] | 449 | void *data; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 450 | |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 451 | obj->idx.offset = consumed_bytes; |
Stephen Boyd | 1e4cd68 | 2011-04-03 00:06:54 -0700 | [diff] [blame] | 452 | input_crc32 = crc32(0, NULL, 0); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 453 | |
| 454 | p = fill(1); |
| 455 | c = *p; |
| 456 | use(1); |
| 457 | obj->type = (c >> 4) & 7; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 458 | size = (c & 15); |
| 459 | shift = 4; |
| 460 | while (c & 0x80) { |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 461 | p = fill(1); |
| 462 | c = *p; |
| 463 | use(1); |
Linus Torvalds | 48fb7de | 2009-06-17 17:22:27 -0700 | [diff] [blame] | 464 | size += (c & 0x7f) << shift; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 465 | shift += 7; |
| 466 | } |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 467 | obj->size = size; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 468 | |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 469 | switch (obj->type) { |
Nicolas Pitre | eb32d23 | 2006-09-21 00:06:49 -0400 | [diff] [blame] | 470 | case OBJ_REF_DELTA: |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 471 | hashcpy(delta_base->sha1, fill(20)); |
| 472 | use(20); |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 473 | break; |
| 474 | case OBJ_OFS_DELTA: |
| 475 | memset(delta_base, 0, sizeof(*delta_base)); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 476 | p = fill(1); |
| 477 | c = *p; |
| 478 | use(1); |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 479 | base_offset = c & 127; |
| 480 | while (c & 128) { |
| 481 | base_offset += 1; |
Nicolas Pitre | 8723f21 | 2007-04-09 01:06:29 -0400 | [diff] [blame] | 482 | if (!base_offset || MSB(base_offset, 7)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 483 | bad_object(obj->idx.offset, _("offset value overflow for delta base object")); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 484 | p = fill(1); |
| 485 | c = *p; |
| 486 | use(1); |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 487 | base_offset = (base_offset << 7) + (c & 127); |
| 488 | } |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 489 | delta_base->offset = obj->idx.offset - base_offset; |
Nicolas Pitre | d8f3255 | 2008-10-29 19:02:45 -0400 | [diff] [blame] | 490 | if (delta_base->offset <= 0 || delta_base->offset >= obj->idx.offset) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 491 | bad_object(obj->idx.offset, _("delta base offset is out of bound")); |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 492 | break; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 493 | case OBJ_COMMIT: |
| 494 | case OBJ_TREE: |
| 495 | case OBJ_BLOB: |
| 496 | case OBJ_TAG: |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 497 | break; |
| 498 | default: |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 499 | bad_object(obj->idx.offset, _("unknown object type %d"), obj->type); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 500 | } |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 501 | obj->hdr_size = consumed_bytes - obj->idx.offset; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 502 | |
Nguyễn Thái Ngọc Duy | 681b07d | 2012-05-23 21:09:46 +0700 | [diff] [blame] | 503 | data = unpack_entry_data(obj->idx.offset, obj->size, obj->type, sha1); |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 504 | obj->idx.crc32 = input_crc32; |
Nicolas Pitre | ee5743c | 2007-04-09 01:06:32 -0400 | [diff] [blame] | 505 | return data; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 506 | } |
| 507 | |
Nguyễn Thái Ngọc Duy | 8a2e163 | 2012-05-23 21:09:48 +0700 | [diff] [blame] | 508 | static void *unpack_data(struct object_entry *obj, |
| 509 | int (*consume)(const unsigned char *, unsigned long, void *), |
| 510 | void *cb_data) |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 511 | { |
Nicolas Pitre | a91ef6e | 2007-11-10 23:29:10 -0500 | [diff] [blame] | 512 | off_t from = obj[0].idx.offset + obj[0].hdr_size; |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 513 | unsigned long len = obj[1].idx.offset - from; |
Nicolas Pitre | 776ea37 | 2010-04-12 12:11:07 -0400 | [diff] [blame] | 514 | unsigned char *data, *inbuf; |
Junio C Hamano | ef49a7a | 2011-06-10 11:52:15 -0700 | [diff] [blame] | 515 | git_zstream stream; |
Nicolas Pitre | 776ea37 | 2010-04-12 12:11:07 -0400 | [diff] [blame] | 516 | int status; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 517 | |
Nguyễn Thái Ngọc Duy | 8a2e163 | 2012-05-23 21:09:48 +0700 | [diff] [blame] | 518 | data = xmalloc(consume ? 64*1024 : obj->size); |
Nicolas Pitre | 776ea37 | 2010-04-12 12:11:07 -0400 | [diff] [blame] | 519 | inbuf = xmalloc((len < 64*1024) ? len : 64*1024); |
| 520 | |
| 521 | memset(&stream, 0, sizeof(stream)); |
| 522 | git_inflate_init(&stream); |
| 523 | stream.next_out = data; |
Nguyễn Thái Ngọc Duy | 8a2e163 | 2012-05-23 21:09:48 +0700 | [diff] [blame] | 524 | stream.avail_out = consume ? 64*1024 : obj->size; |
Nicolas Pitre | 776ea37 | 2010-04-12 12:11:07 -0400 | [diff] [blame] | 525 | |
Shawn O. Pearce | a91d49c | 2007-02-27 23:47:19 -0500 | [diff] [blame] | 526 | do { |
Nicolas Pitre | 776ea37 | 2010-04-12 12:11:07 -0400 | [diff] [blame] | 527 | ssize_t n = (len < 64*1024) ? len : 64*1024; |
| 528 | n = pread(pack_fd, inbuf, n, from); |
Samuel Tardieu | fb74243 | 2008-10-06 19:28:41 +0200 | [diff] [blame] | 529 | if (n < 0) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 530 | die_errno(_("cannot pread pack file")); |
Samuel Tardieu | fb74243 | 2008-10-06 19:28:41 +0200 | [diff] [blame] | 531 | if (!n) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 532 | die(Q_("premature end of pack file, %lu byte missing", |
| 533 | "premature end of pack file, %lu bytes missing", |
| 534 | len), |
| 535 | len); |
Nicolas Pitre | 776ea37 | 2010-04-12 12:11:07 -0400 | [diff] [blame] | 536 | from += n; |
| 537 | len -= n; |
| 538 | stream.next_in = inbuf; |
| 539 | stream.avail_in = n; |
Jeff King | f8b0903 | 2012-07-04 03:12:14 -0400 | [diff] [blame] | 540 | if (!consume) |
| 541 | status = git_inflate(&stream, 0); |
| 542 | else { |
| 543 | do { |
| 544 | status = git_inflate(&stream, 0); |
| 545 | if (consume(data, stream.next_out - data, cb_data)) { |
| 546 | free(inbuf); |
| 547 | free(data); |
| 548 | return NULL; |
| 549 | } |
| 550 | stream.next_out = data; |
| 551 | stream.avail_out = 64*1024; |
| 552 | } while (status == Z_OK && stream.avail_in); |
Nguyễn Thái Ngọc Duy | 8a2e163 | 2012-05-23 21:09:48 +0700 | [diff] [blame] | 553 | } |
Nicolas Pitre | 776ea37 | 2010-04-12 12:11:07 -0400 | [diff] [blame] | 554 | } while (len && status == Z_OK && !stream.avail_in); |
| 555 | |
| 556 | /* This has been inflated OK when first encountered, so... */ |
| 557 | if (status != Z_STREAM_END || stream.total_out != obj->size) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 558 | die(_("serious inflate inconsistency")); |
Nicolas Pitre | 776ea37 | 2010-04-12 12:11:07 -0400 | [diff] [blame] | 559 | |
| 560 | git_inflate_end(&stream); |
| 561 | free(inbuf); |
Nguyễn Thái Ngọc Duy | 8a2e163 | 2012-05-23 21:09:48 +0700 | [diff] [blame] | 562 | if (consume) { |
| 563 | free(data); |
| 564 | data = NULL; |
| 565 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 566 | return data; |
| 567 | } |
| 568 | |
Nguyễn Thái Ngọc Duy | 8a2e163 | 2012-05-23 21:09:48 +0700 | [diff] [blame] | 569 | static void *get_data_from_pack(struct object_entry *obj) |
| 570 | { |
| 571 | return unpack_data(obj, NULL, NULL); |
| 572 | } |
| 573 | |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 574 | static int compare_delta_bases(const union delta_base *base1, |
| 575 | const union delta_base *base2, |
| 576 | enum object_type type1, |
| 577 | enum object_type type2) |
| 578 | { |
| 579 | int cmp = type1 - type2; |
| 580 | if (cmp) |
| 581 | return cmp; |
| 582 | return memcmp(base1, base2, UNION_BASE_SZ); |
| 583 | } |
| 584 | |
| 585 | static int find_delta(const union delta_base *base, enum object_type type) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 586 | { |
| 587 | int first = 0, last = nr_deltas; |
| 588 | |
| 589 | while (first < last) { |
| 590 | int next = (first + last) / 2; |
| 591 | struct delta_entry *delta = &deltas[next]; |
| 592 | int cmp; |
| 593 | |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 594 | cmp = compare_delta_bases(base, &delta->base, |
| 595 | type, objects[delta->obj_no].type); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 596 | if (!cmp) |
| 597 | return next; |
| 598 | if (cmp < 0) { |
| 599 | last = next; |
| 600 | continue; |
| 601 | } |
| 602 | first = next+1; |
| 603 | } |
| 604 | return -first-1; |
| 605 | } |
| 606 | |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 607 | static void find_delta_children(const union delta_base *base, |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 608 | int *first_index, int *last_index, |
| 609 | enum object_type type) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 610 | { |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 611 | int first = find_delta(base, type); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 612 | int last = first; |
| 613 | int end = nr_deltas - 1; |
| 614 | |
Nicolas Pitre | 6a87ed9 | 2008-10-17 15:57:58 -0400 | [diff] [blame] | 615 | if (first < 0) { |
| 616 | *first_index = 0; |
| 617 | *last_index = -1; |
| 618 | return; |
| 619 | } |
Nicolas Pitre | 3c55287 | 2006-10-17 16:23:26 -0400 | [diff] [blame] | 620 | while (first > 0 && !memcmp(&deltas[first - 1].base, base, UNION_BASE_SZ)) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 621 | --first; |
Nicolas Pitre | 3c55287 | 2006-10-17 16:23:26 -0400 | [diff] [blame] | 622 | while (last < end && !memcmp(&deltas[last + 1].base, base, UNION_BASE_SZ)) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 623 | ++last; |
| 624 | *first_index = first; |
| 625 | *last_index = last; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 626 | } |
| 627 | |
Nguyễn Thái Ngọc Duy | 4614043 | 2012-05-24 20:55:44 +0700 | [diff] [blame] | 628 | struct compare_data { |
| 629 | struct object_entry *entry; |
| 630 | struct git_istream *st; |
| 631 | unsigned char *buf; |
| 632 | unsigned long buf_size; |
| 633 | }; |
| 634 | |
| 635 | static int compare_objects(const unsigned char *buf, unsigned long size, |
| 636 | void *cb_data) |
| 637 | { |
| 638 | struct compare_data *data = cb_data; |
| 639 | |
| 640 | if (data->buf_size < size) { |
| 641 | free(data->buf); |
| 642 | data->buf = xmalloc(size); |
| 643 | data->buf_size = size; |
| 644 | } |
| 645 | |
| 646 | while (size) { |
| 647 | ssize_t len = read_istream(data->st, data->buf, size); |
| 648 | if (len == 0) |
| 649 | die(_("SHA1 COLLISION FOUND WITH %s !"), |
| 650 | sha1_to_hex(data->entry->idx.sha1)); |
| 651 | if (len < 0) |
| 652 | die(_("unable to read %s"), |
| 653 | sha1_to_hex(data->entry->idx.sha1)); |
| 654 | if (memcmp(buf, data->buf, len)) |
| 655 | die(_("SHA1 COLLISION FOUND WITH %s !"), |
| 656 | sha1_to_hex(data->entry->idx.sha1)); |
| 657 | size -= len; |
| 658 | buf += len; |
| 659 | } |
| 660 | return 0; |
| 661 | } |
| 662 | |
| 663 | static int check_collison(struct object_entry *entry) |
| 664 | { |
| 665 | struct compare_data data; |
| 666 | enum object_type type; |
| 667 | unsigned long size; |
| 668 | |
| 669 | if (entry->size <= big_file_threshold || entry->type != OBJ_BLOB) |
| 670 | return -1; |
| 671 | |
| 672 | memset(&data, 0, sizeof(data)); |
| 673 | data.entry = entry; |
| 674 | data.st = open_istream(entry->idx.sha1, &type, &size, NULL); |
| 675 | if (!data.st) |
| 676 | return -1; |
| 677 | if (size != entry->size || type != entry->type) |
| 678 | die(_("SHA1 COLLISION FOUND WITH %s !"), |
| 679 | sha1_to_hex(entry->idx.sha1)); |
| 680 | unpack_data(entry, compare_objects, &data); |
| 681 | close_istream(data.st); |
| 682 | free(data.buf); |
| 683 | return 0; |
| 684 | } |
| 685 | |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 686 | static void sha1_object(const void *data, struct object_entry *obj_entry, |
| 687 | unsigned long size, enum object_type type, |
| 688 | const unsigned char *sha1) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 689 | { |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 690 | void *new_data = NULL; |
Nguyễn Thái Ngọc Duy | 4614043 | 2012-05-24 20:55:44 +0700 | [diff] [blame] | 691 | int collision_test_needed; |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 692 | |
| 693 | assert(data || obj_entry); |
| 694 | |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 695 | read_lock(); |
Nguyễn Thái Ngọc Duy | 4614043 | 2012-05-24 20:55:44 +0700 | [diff] [blame] | 696 | collision_test_needed = has_sha1_file(sha1); |
| 697 | read_unlock(); |
| 698 | |
| 699 | if (collision_test_needed && !data) { |
| 700 | read_lock(); |
| 701 | if (!check_collison(obj_entry)) |
| 702 | collision_test_needed = 0; |
| 703 | read_unlock(); |
| 704 | } |
| 705 | if (collision_test_needed) { |
Nicolas Pitre | 8685da4 | 2007-03-20 15:32:35 -0400 | [diff] [blame] | 706 | void *has_data; |
| 707 | enum object_type has_type; |
| 708 | unsigned long has_size; |
Nguyễn Thái Ngọc Duy | 4614043 | 2012-05-24 20:55:44 +0700 | [diff] [blame] | 709 | read_lock(); |
| 710 | has_type = sha1_object_info(sha1, &has_size); |
| 711 | if (has_type != type || has_size != size) |
| 712 | die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1)); |
Nicolas Pitre | 8685da4 | 2007-03-20 15:32:35 -0400 | [diff] [blame] | 713 | has_data = read_sha1_file(sha1, &has_type, &has_size); |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 714 | read_unlock(); |
Nguyễn Thái Ngọc Duy | 4614043 | 2012-05-24 20:55:44 +0700 | [diff] [blame] | 715 | if (!data) |
| 716 | data = new_data = get_data_from_pack(obj_entry); |
Nicolas Pitre | 8685da4 | 2007-03-20 15:32:35 -0400 | [diff] [blame] | 717 | if (!has_data) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 718 | die(_("cannot read existing object %s"), sha1_to_hex(sha1)); |
Nicolas Pitre | 8685da4 | 2007-03-20 15:32:35 -0400 | [diff] [blame] | 719 | if (size != has_size || type != has_type || |
| 720 | memcmp(data, has_data, size) != 0) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 721 | die(_("SHA1 COLLISION FOUND WITH %s !"), sha1_to_hex(sha1)); |
Nicolas Pitre | bbf4b41 | 2007-04-03 12:33:46 -0400 | [diff] [blame] | 722 | free(has_data); |
Nguyễn Thái Ngọc Duy | 4614043 | 2012-05-24 20:55:44 +0700 | [diff] [blame] | 723 | } |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 724 | |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 725 | if (strict) { |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 726 | read_lock(); |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 727 | if (type == OBJ_BLOB) { |
| 728 | struct blob *blob = lookup_blob(sha1); |
| 729 | if (blob) |
| 730 | blob->object.flags |= FLAG_CHECKED; |
| 731 | else |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 732 | die(_("invalid blob object %s"), sha1_to_hex(sha1)); |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 733 | } else { |
| 734 | struct object *obj; |
| 735 | int eaten; |
| 736 | void *buf = (void *) data; |
| 737 | |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 738 | if (!buf) |
| 739 | buf = new_data = get_data_from_pack(obj_entry); |
| 740 | |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 741 | /* |
| 742 | * we do not need to free the memory here, as the |
| 743 | * buf is deleted by the caller. |
| 744 | */ |
| 745 | obj = parse_object_buffer(sha1, type, size, buf, &eaten); |
| 746 | if (!obj) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 747 | die(_("invalid %s"), typename(type)); |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 748 | if (fsck_object(obj, 1, fsck_error_function)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 749 | die(_("Error in object")); |
Linus Torvalds | 2af202b | 2009-06-18 10:28:43 -0700 | [diff] [blame] | 750 | if (fsck_walk(obj, mark_link, NULL)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 751 | die(_("Not all child objects of %s are reachable"), sha1_to_hex(obj->sha1)); |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 752 | |
| 753 | if (obj->type == OBJ_TREE) { |
| 754 | struct tree *item = (struct tree *) obj; |
| 755 | item->buffer = NULL; |
| 756 | } |
| 757 | if (obj->type == OBJ_COMMIT) { |
| 758 | struct commit *commit = (struct commit *) obj; |
| 759 | commit->buffer = NULL; |
| 760 | } |
| 761 | obj->flags |= FLAG_CHECKED; |
| 762 | } |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 763 | read_unlock(); |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 764 | } |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 765 | |
| 766 | free(new_data); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 767 | } |
| 768 | |
Nguyễn Thái Ngọc Duy | 20e95d0 | 2012-01-14 19:19:55 +0700 | [diff] [blame] | 769 | /* |
| 770 | * This function is part of find_unresolved_deltas(). There are two |
| 771 | * walkers going in the opposite ways. |
| 772 | * |
| 773 | * The first one in find_unresolved_deltas() traverses down from |
| 774 | * parent node to children, deflating nodes along the way. However, |
| 775 | * memory for deflated nodes is limited by delta_base_cache_limit, so |
| 776 | * at some point parent node's deflated content may be freed. |
| 777 | * |
| 778 | * The second walker is this function, which goes from current node up |
| 779 | * to top parent if necessary to deflate the node. In normal |
| 780 | * situation, its parent node would be already deflated, so it just |
| 781 | * needs to apply delta. |
| 782 | * |
| 783 | * In the worst case scenario, parent node is no longer deflated because |
| 784 | * we're running out of delta_base_cache_limit; we need to re-deflate |
| 785 | * parents, possibly up to the top base. |
| 786 | * |
| 787 | * All deflated objects here are subject to be freed if we exceed |
| 788 | * delta_base_cache_limit, just like in find_unresolved_deltas(), we |
| 789 | * just need to make sure the last node is not freed. |
| 790 | */ |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 791 | static void *get_base_data(struct base_data *c) |
| 792 | { |
| 793 | if (!c->data) { |
| 794 | struct object_entry *obj = c->obj; |
Nguyễn Thái Ngọc Duy | 20e95d0 | 2012-01-14 19:19:55 +0700 | [diff] [blame] | 795 | struct base_data **delta = NULL; |
| 796 | int delta_nr = 0, delta_alloc = 0; |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 797 | |
Nguyễn Thái Ngọc Duy | 20e95d0 | 2012-01-14 19:19:55 +0700 | [diff] [blame] | 798 | while (is_delta_type(c->obj->type) && !c->data) { |
| 799 | ALLOC_GROW(delta, delta_nr + 1, delta_alloc); |
| 800 | delta[delta_nr++] = c; |
| 801 | c = c->base; |
| 802 | } |
| 803 | if (!delta_nr) { |
| 804 | c->data = get_data_from_pack(obj); |
| 805 | c->size = obj->size; |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 806 | get_thread_data()->base_cache_used += c->size; |
Nguyễn Thái Ngọc Duy | 20e95d0 | 2012-01-14 19:19:55 +0700 | [diff] [blame] | 807 | prune_base_data(c); |
| 808 | } |
| 809 | for (; delta_nr > 0; delta_nr--) { |
| 810 | void *base, *raw; |
| 811 | c = delta[delta_nr - 1]; |
| 812 | obj = c->obj; |
| 813 | base = get_base_data(c->base); |
| 814 | raw = get_data_from_pack(obj); |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 815 | c->data = patch_delta( |
| 816 | base, c->base->size, |
| 817 | raw, obj->size, |
| 818 | &c->size); |
| 819 | free(raw); |
| 820 | if (!c->data) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 821 | bad_object(obj->idx.offset, _("failed to apply delta")); |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 822 | get_thread_data()->base_cache_used += c->size; |
Nguyễn Thái Ngọc Duy | 20e95d0 | 2012-01-14 19:19:55 +0700 | [diff] [blame] | 823 | prune_base_data(c); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 824 | } |
Nguyễn Thái Ngọc Duy | 20e95d0 | 2012-01-14 19:19:55 +0700 | [diff] [blame] | 825 | free(delta); |
Shawn O. Pearce | 92392b4 | 2008-07-15 04:45:34 +0000 | [diff] [blame] | 826 | } |
| 827 | return c->data; |
| 828 | } |
| 829 | |
Shawn O. Pearce | f41aebd | 2008-07-13 22:07:44 -0400 | [diff] [blame] | 830 | static void resolve_delta(struct object_entry *delta_obj, |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 831 | struct base_data *base, struct base_data *result) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 832 | { |
Nicolas Pitre | ce3f6dc | 2008-10-20 16:46:19 -0400 | [diff] [blame] | 833 | void *base_data, *delta_data; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 834 | |
Nicolas Pitre | ce3f6dc | 2008-10-20 16:46:19 -0400 | [diff] [blame] | 835 | delta_obj->real_type = base->obj->real_type; |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 836 | delta_obj->delta_depth = base->obj->delta_depth + 1; |
Junio C Hamano | d1a0ed1 | 2011-06-03 15:32:16 -0700 | [diff] [blame] | 837 | if (deepest_delta < delta_obj->delta_depth) |
| 838 | deepest_delta = delta_obj->delta_depth; |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 839 | delta_obj->base_object_no = base->obj - objects; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 840 | delta_data = get_data_from_pack(delta_obj); |
Nicolas Pitre | ce3f6dc | 2008-10-20 16:46:19 -0400 | [diff] [blame] | 841 | base_data = get_base_data(base); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 842 | result->obj = delta_obj; |
Nicolas Pitre | ce3f6dc | 2008-10-20 16:46:19 -0400 | [diff] [blame] | 843 | result->data = patch_delta(base_data, base->size, |
| 844 | delta_data, delta_obj->size, &result->size); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 845 | free(delta_data); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 846 | if (!result->data) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 847 | bad_object(delta_obj->idx.offset, _("failed to apply delta")); |
Nguyễn Thái Ngọc Duy | 681b07d | 2012-05-23 21:09:46 +0700 | [diff] [blame] | 848 | hash_sha1_file(result->data, result->size, |
| 849 | typename(delta_obj->real_type), delta_obj->idx.sha1); |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 850 | sha1_object(result->data, NULL, result->size, delta_obj->real_type, |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 851 | delta_obj->idx.sha1); |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 852 | counter_lock(); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 853 | nr_resolved_deltas++; |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 854 | counter_unlock(); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 855 | } |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 856 | |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 857 | static struct base_data *find_unresolved_deltas_1(struct base_data *base, |
| 858 | struct base_data *prev_base) |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 859 | { |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 860 | if (base->ref_last == -1 && base->ofs_last == -1) { |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 861 | union delta_base base_spec; |
| 862 | |
| 863 | hashcpy(base_spec.sha1, base->obj->idx.sha1); |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 864 | find_delta_children(&base_spec, |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 865 | &base->ref_first, &base->ref_last, OBJ_REF_DELTA); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 866 | |
| 867 | memset(&base_spec, 0, sizeof(base_spec)); |
| 868 | base_spec.offset = base->obj->idx.offset; |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 869 | find_delta_children(&base_spec, |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 870 | &base->ofs_first, &base->ofs_last, OBJ_OFS_DELTA); |
| 871 | |
| 872 | if (base->ref_last == -1 && base->ofs_last == -1) { |
| 873 | free(base->data); |
| 874 | return NULL; |
| 875 | } |
| 876 | |
| 877 | link_base_data(prev_base, base); |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 878 | } |
| 879 | |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 880 | if (base->ref_first <= base->ref_last) { |
| 881 | struct object_entry *child = objects + deltas[base->ref_first].obj_no; |
| 882 | struct base_data *result = alloc_base_data(); |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 883 | |
| 884 | assert(child->real_type == OBJ_REF_DELTA); |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 885 | resolve_delta(child, base, result); |
| 886 | if (base->ref_first == base->ref_last && base->ofs_last == -1) |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 887 | free_base_data(base); |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 888 | |
| 889 | base->ref_first++; |
| 890 | return result; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 891 | } |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 892 | |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 893 | if (base->ofs_first <= base->ofs_last) { |
| 894 | struct object_entry *child = objects + deltas[base->ofs_first].obj_no; |
| 895 | struct base_data *result = alloc_base_data(); |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 896 | |
| 897 | assert(child->real_type == OBJ_OFS_DELTA); |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 898 | resolve_delta(child, base, result); |
| 899 | if (base->ofs_first == base->ofs_last) |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 900 | free_base_data(base); |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 901 | |
| 902 | base->ofs_first++; |
| 903 | return result; |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 904 | } |
| 905 | |
Nicolas Pitre | 9441b61 | 2008-10-17 15:57:57 -0400 | [diff] [blame] | 906 | unlink_base_data(base); |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 907 | return NULL; |
| 908 | } |
| 909 | |
| 910 | static void find_unresolved_deltas(struct base_data *base) |
| 911 | { |
| 912 | struct base_data *new_base, *prev_base = NULL; |
| 913 | for (;;) { |
| 914 | new_base = find_unresolved_deltas_1(base, prev_base); |
| 915 | |
| 916 | if (new_base) { |
| 917 | prev_base = base; |
| 918 | base = new_base; |
| 919 | } else { |
| 920 | free(base); |
| 921 | base = prev_base; |
| 922 | if (!base) |
| 923 | return; |
| 924 | prev_base = base->base; |
| 925 | } |
| 926 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 927 | } |
| 928 | |
| 929 | static int compare_delta_entry(const void *a, const void *b) |
| 930 | { |
| 931 | const struct delta_entry *delta_a = a; |
| 932 | const struct delta_entry *delta_b = b; |
Junio C Hamano | 7218a21 | 2011-02-02 10:06:51 -0800 | [diff] [blame] | 933 | |
| 934 | /* group by type (ref vs ofs) and then by value (sha-1 or offset) */ |
| 935 | return compare_delta_bases(&delta_a->base, &delta_b->base, |
| 936 | objects[delta_a->obj_no].type, |
| 937 | objects[delta_b->obj_no].type); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 938 | } |
| 939 | |
Nguyễn Thái Ngọc Duy | 5272f75 | 2012-05-06 19:31:54 +0700 | [diff] [blame] | 940 | static void resolve_base(struct object_entry *obj) |
| 941 | { |
| 942 | struct base_data *base_obj = alloc_base_data(); |
| 943 | base_obj->obj = obj; |
| 944 | base_obj->data = NULL; |
| 945 | find_unresolved_deltas(base_obj); |
| 946 | } |
| 947 | |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 948 | #ifndef NO_PTHREADS |
| 949 | static void *threaded_second_pass(void *data) |
| 950 | { |
| 951 | set_thread_data(data); |
| 952 | for (;;) { |
| 953 | int i; |
| 954 | work_lock(); |
| 955 | display_progress(progress, nr_resolved_deltas); |
| 956 | while (nr_dispatched < nr_objects && |
| 957 | is_delta_type(objects[nr_dispatched].type)) |
| 958 | nr_dispatched++; |
| 959 | if (nr_dispatched >= nr_objects) { |
| 960 | work_unlock(); |
| 961 | break; |
| 962 | } |
| 963 | i = nr_dispatched++; |
| 964 | work_unlock(); |
| 965 | |
| 966 | resolve_base(&objects[i]); |
| 967 | } |
| 968 | return NULL; |
| 969 | } |
| 970 | #endif |
| 971 | |
Nguyễn Thái Ngọc Duy | 5272f75 | 2012-05-06 19:31:54 +0700 | [diff] [blame] | 972 | /* |
| 973 | * First pass: |
| 974 | * - find locations of all objects; |
| 975 | * - calculate SHA1 of all non-delta objects; |
| 976 | * - remember base (SHA1 or offset) for all deltas. |
| 977 | */ |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 978 | static void parse_pack_objects(unsigned char *sha1) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 979 | { |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 980 | int i, nr_delays = 0; |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 981 | struct delta_entry *delta = deltas; |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 982 | struct stat st; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 983 | |
Nicolas Pitre | 13aaf14 | 2007-04-20 14:10:07 -0400 | [diff] [blame] | 984 | if (verbose) |
Nicolas Pitre | 29e63ed | 2007-10-30 14:57:35 -0400 | [diff] [blame] | 985 | progress = start_progress( |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 986 | from_stdin ? _("Receiving objects") : _("Indexing objects"), |
Nicolas Pitre | 29e63ed | 2007-10-30 14:57:35 -0400 | [diff] [blame] | 987 | nr_objects); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 988 | for (i = 0; i < nr_objects; i++) { |
| 989 | struct object_entry *obj = &objects[i]; |
Nguyễn Thái Ngọc Duy | 681b07d | 2012-05-23 21:09:46 +0700 | [diff] [blame] | 990 | void *data = unpack_raw_entry(obj, &delta->base, obj->idx.sha1); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 991 | obj->real_type = obj->type; |
Junio C Hamano | 4f8ec74 | 2011-06-03 15:32:14 -0700 | [diff] [blame] | 992 | if (is_delta_type(obj->type)) { |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 993 | nr_deltas++; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 994 | delta->obj_no = i; |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 995 | delta++; |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 996 | } else if (!data) { |
| 997 | /* large blobs, check later */ |
| 998 | obj->real_type = OBJ_BAD; |
| 999 | nr_delays++; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1000 | } else |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 1001 | sha1_object(data, NULL, obj->size, obj->type, obj->idx.sha1); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1002 | free(data); |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 1003 | display_progress(progress, i+1); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1004 | } |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 1005 | objects[i].idx.offset = consumed_bytes; |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 1006 | stop_progress(&progress); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 1007 | |
| 1008 | /* Check pack integrity */ |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1009 | flush(); |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1010 | git_SHA1_Final(sha1, &input_ctx); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 1011 | if (hashcmp(fill(20), sha1)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1012 | die(_("pack is corrupted (SHA1 mismatch)")); |
Nicolas Pitre | 9bee247 | 2006-10-25 23:31:53 -0400 | [diff] [blame] | 1013 | use(20); |
Nicolas Pitre | 2d47705 | 2006-10-20 14:45:21 -0400 | [diff] [blame] | 1014 | |
| 1015 | /* If input_fd is a file, we should have reached its end now. */ |
| 1016 | if (fstat(input_fd, &st)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1017 | die_errno(_("cannot fstat packfile")); |
Johannes Schindelin | fa257b0 | 2007-02-22 19:14:14 +0100 | [diff] [blame] | 1018 | if (S_ISREG(st.st_mode) && |
| 1019 | lseek(input_fd, 0, SEEK_CUR) - input_len != st.st_size) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1020 | die(_("pack has junk at the end")); |
Nguyễn Thái Ngọc Duy | 9ec2dde | 2012-05-23 21:09:47 +0700 | [diff] [blame] | 1021 | |
| 1022 | for (i = 0; i < nr_objects; i++) { |
| 1023 | struct object_entry *obj = &objects[i]; |
| 1024 | if (obj->real_type != OBJ_BAD) |
| 1025 | continue; |
| 1026 | obj->real_type = obj->type; |
| 1027 | sha1_object(NULL, obj, obj->size, obj->type, obj->idx.sha1); |
| 1028 | nr_delays--; |
| 1029 | } |
| 1030 | if (nr_delays) |
| 1031 | die(_("confusion beyond insanity in parse_pack_objects()")); |
Nguyễn Thái Ngọc Duy | 5272f75 | 2012-05-06 19:31:54 +0700 | [diff] [blame] | 1032 | } |
| 1033 | |
| 1034 | /* |
| 1035 | * Second pass: |
| 1036 | * - for all non-delta objects, look if it is used as a base for |
| 1037 | * deltas; |
| 1038 | * - if used as a base, uncompress the object and apply all deltas, |
| 1039 | * recursively checking if the resulting object is used as a base |
| 1040 | * for some more deltas. |
| 1041 | */ |
| 1042 | static void resolve_deltas(void) |
| 1043 | { |
| 1044 | int i; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1045 | |
Nicolas Pitre | 3c9af36 | 2006-10-25 23:32:59 -0400 | [diff] [blame] | 1046 | if (!nr_deltas) |
| 1047 | return; |
| 1048 | |
Nicolas Pitre | 53dda6f | 2006-09-21 00:08:33 -0400 | [diff] [blame] | 1049 | /* Sort deltas by base SHA1/offset for fast searching */ |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1050 | qsort(deltas, nr_deltas, sizeof(struct delta_entry), |
| 1051 | compare_delta_entry); |
| 1052 | |
Nicolas Pitre | 13aaf14 | 2007-04-20 14:10:07 -0400 | [diff] [blame] | 1053 | if (verbose) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1054 | progress = start_progress(_("Resolving deltas"), nr_deltas); |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 1055 | |
| 1056 | #ifndef NO_PTHREADS |
| 1057 | nr_dispatched = 0; |
| 1058 | if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) { |
| 1059 | init_thread(); |
| 1060 | for (i = 0; i < nr_threads; i++) { |
| 1061 | int ret = pthread_create(&thread_data[i].thread, NULL, |
| 1062 | threaded_second_pass, thread_data + i); |
| 1063 | if (ret) |
| 1064 | die("unable to create thread: %s", strerror(ret)); |
| 1065 | } |
| 1066 | for (i = 0; i < nr_threads; i++) |
| 1067 | pthread_join(thread_data[i].thread, NULL); |
| 1068 | cleanup_thread(); |
| 1069 | return; |
| 1070 | } |
| 1071 | #endif |
| 1072 | |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1073 | for (i = 0; i < nr_objects; i++) { |
| 1074 | struct object_entry *obj = &objects[i]; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1075 | |
Junio C Hamano | 4f8ec74 | 2011-06-03 15:32:14 -0700 | [diff] [blame] | 1076 | if (is_delta_type(obj->type)) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1077 | continue; |
Nguyễn Thái Ngọc Duy | 5272f75 | 2012-05-06 19:31:54 +0700 | [diff] [blame] | 1078 | resolve_base(obj); |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 1079 | display_progress(progress, nr_resolved_deltas); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1080 | } |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1081 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1082 | |
Nguyễn Thái Ngọc Duy | 5272f75 | 2012-05-06 19:31:54 +0700 | [diff] [blame] | 1083 | /* |
| 1084 | * Third pass: |
| 1085 | * - append objects to convert thin pack to full pack if required |
| 1086 | * - write the final 20-byte SHA-1 |
| 1087 | */ |
| 1088 | static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved); |
| 1089 | static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned char *pack_sha1) |
| 1090 | { |
| 1091 | if (nr_deltas == nr_resolved_deltas) { |
| 1092 | stop_progress(&progress); |
| 1093 | /* Flush remaining pack final 20-byte SHA1. */ |
| 1094 | flush(); |
| 1095 | return; |
| 1096 | } |
| 1097 | |
| 1098 | if (fix_thin_pack) { |
| 1099 | struct sha1file *f; |
| 1100 | unsigned char read_sha1[20], tail_sha1[20]; |
| 1101 | char msg[48]; |
| 1102 | int nr_unresolved = nr_deltas - nr_resolved_deltas; |
| 1103 | int nr_objects_initial = nr_objects; |
| 1104 | if (nr_unresolved <= 0) |
Junio C Hamano | cc13431 | 2012-05-14 11:50:40 -0700 | [diff] [blame] | 1105 | die(_("confusion beyond insanity")); |
Nguyễn Thái Ngọc Duy | 5272f75 | 2012-05-06 19:31:54 +0700 | [diff] [blame] | 1106 | objects = xrealloc(objects, |
| 1107 | (nr_objects + nr_unresolved + 1) |
| 1108 | * sizeof(*objects)); |
Jeff King | 57165db | 2013-03-19 12:17:22 -0400 | [diff] [blame^] | 1109 | memset(objects + nr_objects + 1, 0, |
| 1110 | nr_unresolved * sizeof(*objects)); |
Nguyễn Thái Ngọc Duy | 5272f75 | 2012-05-06 19:31:54 +0700 | [diff] [blame] | 1111 | f = sha1fd(output_fd, curr_pack); |
| 1112 | fix_unresolved_deltas(f, nr_unresolved); |
| 1113 | sprintf(msg, "completed with %d local objects", |
| 1114 | nr_objects - nr_objects_initial); |
| 1115 | stop_progress_msg(&progress, msg); |
| 1116 | sha1close(f, tail_sha1, 0); |
| 1117 | hashcpy(read_sha1, pack_sha1); |
| 1118 | fixup_pack_header_footer(output_fd, pack_sha1, |
| 1119 | curr_pack, nr_objects, |
| 1120 | read_sha1, consumed_bytes-20); |
| 1121 | if (hashcmp(read_sha1, tail_sha1) != 0) |
| 1122 | die("Unexpected tail checksum for %s " |
| 1123 | "(disk corruption?)", curr_pack); |
| 1124 | } |
| 1125 | if (nr_deltas != nr_resolved_deltas) |
Junio C Hamano | cc13431 | 2012-05-14 11:50:40 -0700 | [diff] [blame] | 1126 | die(Q_("pack has %d unresolved delta", |
| 1127 | "pack has %d unresolved deltas", |
| 1128 | nr_deltas - nr_resolved_deltas), |
Nguyễn Thái Ngọc Duy | 5272f75 | 2012-05-06 19:31:54 +0700 | [diff] [blame] | 1129 | nr_deltas - nr_resolved_deltas); |
| 1130 | } |
| 1131 | |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1132 | static int write_compressed(struct sha1file *f, void *in, unsigned int size) |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1133 | { |
Junio C Hamano | ef49a7a | 2011-06-10 11:52:15 -0700 | [diff] [blame] | 1134 | git_zstream stream; |
Nicolas Pitre | 7734d7f | 2010-04-12 16:50:35 -0400 | [diff] [blame] | 1135 | int status; |
| 1136 | unsigned char outbuf[4096]; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1137 | |
| 1138 | memset(&stream, 0, sizeof(stream)); |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 1139 | git_deflate_init(&stream, zlib_compression_level); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1140 | stream.next_in = in; |
| 1141 | stream.avail_in = size; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1142 | |
Nicolas Pitre | 7734d7f | 2010-04-12 16:50:35 -0400 | [diff] [blame] | 1143 | do { |
| 1144 | stream.next_out = outbuf; |
| 1145 | stream.avail_out = sizeof(outbuf); |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 1146 | status = git_deflate(&stream, Z_FINISH); |
Nicolas Pitre | 7734d7f | 2010-04-12 16:50:35 -0400 | [diff] [blame] | 1147 | sha1write(f, outbuf, sizeof(outbuf) - stream.avail_out); |
| 1148 | } while (status == Z_OK); |
| 1149 | |
| 1150 | if (status != Z_STREAM_END) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1151 | die(_("unable to deflate appended object (%d)"), status); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1152 | size = stream.total_out; |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 1153 | git_deflate_end(&stream); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1154 | return size; |
| 1155 | } |
| 1156 | |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1157 | static struct object_entry *append_obj_to_pack(struct sha1file *f, |
Shawn O. Pearce | 03993e1 | 2008-07-13 22:07:46 -0400 | [diff] [blame] | 1158 | const unsigned char *sha1, void *buf, |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1159 | unsigned long size, enum object_type type) |
| 1160 | { |
| 1161 | struct object_entry *obj = &objects[nr_objects++]; |
| 1162 | unsigned char header[10]; |
| 1163 | unsigned long s = size; |
| 1164 | int n = 0; |
| 1165 | unsigned char c = (type << 4) | (s & 15); |
| 1166 | s >>= 4; |
| 1167 | while (s) { |
| 1168 | header[n++] = c | 0x80; |
| 1169 | c = s & 0x7f; |
| 1170 | s >>= 7; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1171 | } |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1172 | header[n++] = c; |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1173 | crc32_begin(f); |
| 1174 | sha1write(f, header, n); |
Björn Steinbrink | 72de288 | 2008-07-24 18:32:00 +0100 | [diff] [blame] | 1175 | obj[0].size = size; |
| 1176 | obj[0].hdr_size = n; |
| 1177 | obj[0].type = type; |
| 1178 | obj[0].real_type = type; |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 1179 | obj[1].idx.offset = obj[0].idx.offset + n; |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1180 | obj[1].idx.offset += write_compressed(f, buf, size); |
| 1181 | obj[0].idx.crc32 = crc32_end(f); |
Nicolas Pitre | 838cd34 | 2008-10-09 22:08:51 -0400 | [diff] [blame] | 1182 | sha1flush(f); |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 1183 | hashcpy(obj->idx.sha1, sha1); |
Shawn O. Pearce | 03993e1 | 2008-07-13 22:07:46 -0400 | [diff] [blame] | 1184 | return obj; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1185 | } |
| 1186 | |
| 1187 | static int delta_pos_compare(const void *_a, const void *_b) |
| 1188 | { |
| 1189 | struct delta_entry *a = *(struct delta_entry **)_a; |
| 1190 | struct delta_entry *b = *(struct delta_entry **)_b; |
| 1191 | return a->obj_no - b->obj_no; |
| 1192 | } |
| 1193 | |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1194 | static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved) |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1195 | { |
| 1196 | struct delta_entry **sorted_by_pos; |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 1197 | int i, n = 0; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1198 | |
| 1199 | /* |
| 1200 | * Since many unresolved deltas may well be themselves base objects |
| 1201 | * for more unresolved deltas, we really want to include the |
| 1202 | * smallest number of base objects that would cover as much delta |
| 1203 | * as possible by picking the |
| 1204 | * trunc deltas first, allowing for other deltas to resolve without |
| 1205 | * additional base objects. Since most base objects are to be found |
| 1206 | * before deltas depending on them, a good heuristic is to start |
| 1207 | * resolving deltas in the same order as their position in the pack. |
| 1208 | */ |
| 1209 | sorted_by_pos = xmalloc(nr_unresolved * sizeof(*sorted_by_pos)); |
| 1210 | for (i = 0; i < nr_deltas; i++) { |
| 1211 | if (objects[deltas[i].obj_no].real_type != OBJ_REF_DELTA) |
| 1212 | continue; |
| 1213 | sorted_by_pos[n++] = &deltas[i]; |
| 1214 | } |
| 1215 | qsort(sorted_by_pos, n, sizeof(*sorted_by_pos), delta_pos_compare); |
| 1216 | |
| 1217 | for (i = 0; i < n; i++) { |
| 1218 | struct delta_entry *d = sorted_by_pos[i]; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 1219 | enum object_type type; |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 1220 | struct base_data *base_obj = alloc_base_data(); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1221 | |
| 1222 | if (objects[d->obj_no].real_type != OBJ_REF_DELTA) |
| 1223 | continue; |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 1224 | base_obj->data = read_sha1_file(d->base.sha1, &type, &base_obj->size); |
| 1225 | if (!base_obj->data) |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1226 | continue; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1227 | |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 1228 | if (check_sha1_signature(d->base.sha1, base_obj->data, |
| 1229 | base_obj->size, typename(type))) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1230 | die(_("local object %s is corrupt"), sha1_to_hex(d->base.sha1)); |
Nguyễn Thái Ngọc Duy | 2baad22 | 2012-01-14 19:19:54 +0700 | [diff] [blame] | 1231 | base_obj->obj = append_obj_to_pack(f, d->base.sha1, |
| 1232 | base_obj->data, base_obj->size, type); |
| 1233 | find_unresolved_deltas(base_obj); |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 1234 | display_progress(progress, nr_resolved_deltas); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1235 | } |
| 1236 | free(sorted_by_pos); |
| 1237 | } |
| 1238 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1239 | static void final(const char *final_pack_name, const char *curr_pack_name, |
| 1240 | const char *final_index_name, const char *curr_index_name, |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1241 | const char *keep_name, const char *keep_msg, |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1242 | unsigned char *sha1) |
| 1243 | { |
Shawn O. Pearce | 3a55602 | 2007-03-06 20:44:17 -0500 | [diff] [blame] | 1244 | const char *report = "pack"; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1245 | char name[PATH_MAX]; |
| 1246 | int err; |
| 1247 | |
| 1248 | if (!from_stdin) { |
| 1249 | close(input_fd); |
| 1250 | } else { |
Linus Torvalds | 4c81b03 | 2008-05-30 08:42:16 -0700 | [diff] [blame] | 1251 | fsync_or_die(output_fd, curr_pack_name); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1252 | err = close(output_fd); |
| 1253 | if (err) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1254 | die_errno(_("error while closing pack file")); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1255 | } |
| 1256 | |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1257 | if (keep_msg) { |
| 1258 | int keep_fd, keep_msg_len = strlen(keep_msg); |
Junio C Hamano | 6e180cd | 2009-02-24 23:11:29 -0800 | [diff] [blame] | 1259 | |
| 1260 | if (!keep_name) |
| 1261 | keep_fd = odb_pack_keep(name, sizeof(name), sha1); |
| 1262 | else |
| 1263 | keep_fd = open(keep_name, O_RDWR|O_CREAT|O_EXCL, 0600); |
| 1264 | |
Nicolas Pitre | 9ca4a20 | 2006-11-01 17:06:24 -0500 | [diff] [blame] | 1265 | if (keep_fd < 0) { |
| 1266 | if (errno != EEXIST) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1267 | die_errno(_("cannot write keep file '%s'"), |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 1268 | keep_name); |
Nicolas Pitre | 9ca4a20 | 2006-11-01 17:06:24 -0500 | [diff] [blame] | 1269 | } else { |
| 1270 | if (keep_msg_len > 0) { |
| 1271 | write_or_die(keep_fd, keep_msg, keep_msg_len); |
| 1272 | write_or_die(keep_fd, "\n", 1); |
| 1273 | } |
Jim Meyering | 91c8d59 | 2007-06-24 21:20:41 +0200 | [diff] [blame] | 1274 | if (close(keep_fd) != 0) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1275 | die_errno(_("cannot close written keep file '%s'"), |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 1276 | keep_name); |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 1277 | report = "keep"; |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1278 | } |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1279 | } |
| 1280 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1281 | if (final_pack_name != curr_pack_name) { |
| 1282 | if (!final_pack_name) { |
| 1283 | snprintf(name, sizeof(name), "%s/pack/pack-%s.pack", |
| 1284 | get_object_directory(), sha1_to_hex(sha1)); |
| 1285 | final_pack_name = name; |
| 1286 | } |
| 1287 | if (move_temp_to_file(curr_pack_name, final_pack_name)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1288 | die(_("cannot store pack file")); |
Johan Herland | fb8b193 | 2009-03-26 16:16:47 +0100 | [diff] [blame] | 1289 | } else if (from_stdin) |
Petr Baudis | 33b6503 | 2008-10-03 12:20:43 +0200 | [diff] [blame] | 1290 | chmod(final_pack_name, 0444); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1291 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1292 | if (final_index_name != curr_index_name) { |
| 1293 | if (!final_index_name) { |
| 1294 | snprintf(name, sizeof(name), "%s/pack/pack-%s.idx", |
| 1295 | get_object_directory(), sha1_to_hex(sha1)); |
| 1296 | final_index_name = name; |
| 1297 | } |
| 1298 | if (move_temp_to_file(curr_index_name, final_index_name)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1299 | die(_("cannot store index file")); |
Johan Herland | fb8b193 | 2009-03-26 16:16:47 +0100 | [diff] [blame] | 1300 | } else |
| 1301 | chmod(final_index_name, 0444); |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 1302 | |
| 1303 | if (!from_stdin) { |
| 1304 | printf("%s\n", sha1_to_hex(sha1)); |
| 1305 | } else { |
| 1306 | char buf[48]; |
| 1307 | int len = snprintf(buf, sizeof(buf), "%s\t%s\n", |
| 1308 | report, sha1_to_hex(sha1)); |
Junio C Hamano | d1b2ddc | 2007-01-11 13:15:51 -0800 | [diff] [blame] | 1309 | write_or_die(1, buf, len); |
Nicolas Pitre | 576162a | 2006-11-01 17:06:25 -0500 | [diff] [blame] | 1310 | |
| 1311 | /* |
| 1312 | * Let's just mimic git-unpack-objects here and write |
| 1313 | * the last part of the input buffer to stdout. |
| 1314 | */ |
| 1315 | while (input_len) { |
| 1316 | err = xwrite(1, input_buffer + input_offset, input_len); |
| 1317 | if (err <= 0) |
| 1318 | break; |
| 1319 | input_len -= err; |
| 1320 | input_offset += err; |
| 1321 | } |
| 1322 | } |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1323 | } |
| 1324 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 1325 | static int git_index_pack_config(const char *k, const char *v, void *cb) |
Nicolas Pitre | 4d00bda | 2007-11-01 23:26:04 -0400 | [diff] [blame] | 1326 | { |
Junio C Hamano | ebcfb37 | 2011-02-25 15:43:25 -0800 | [diff] [blame] | 1327 | struct pack_idx_option *opts = cb; |
| 1328 | |
Nicolas Pitre | 4d00bda | 2007-11-01 23:26:04 -0400 | [diff] [blame] | 1329 | if (!strcmp(k, "pack.indexversion")) { |
Junio C Hamano | ebcfb37 | 2011-02-25 15:43:25 -0800 | [diff] [blame] | 1330 | opts->version = git_config_int(k, v); |
| 1331 | if (opts->version > 2) |
| 1332 | die("bad pack.indexversion=%"PRIu32, opts->version); |
Nicolas Pitre | 4d00bda | 2007-11-01 23:26:04 -0400 | [diff] [blame] | 1333 | return 0; |
| 1334 | } |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 1335 | if (!strcmp(k, "pack.threads")) { |
| 1336 | nr_threads = git_config_int(k, v); |
| 1337 | if (nr_threads < 0) |
| 1338 | die("invalid number of threads specified (%d)", |
| 1339 | nr_threads); |
| 1340 | #ifdef NO_PTHREADS |
| 1341 | if (nr_threads != 1) |
| 1342 | warning("no threads support, ignoring %s", k); |
| 1343 | nr_threads = 1; |
| 1344 | #endif |
| 1345 | return 0; |
| 1346 | } |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 1347 | return git_default_config(k, v, cb); |
Nicolas Pitre | 4d00bda | 2007-11-01 23:26:04 -0400 | [diff] [blame] | 1348 | } |
| 1349 | |
Junio C Hamano | 3c9fc07 | 2011-02-25 16:55:26 -0800 | [diff] [blame] | 1350 | static int cmp_uint32(const void *a_, const void *b_) |
| 1351 | { |
| 1352 | uint32_t a = *((uint32_t *)a_); |
| 1353 | uint32_t b = *((uint32_t *)b_); |
| 1354 | |
| 1355 | return (a < b) ? -1 : (a != b); |
| 1356 | } |
| 1357 | |
| 1358 | static void read_v2_anomalous_offsets(struct packed_git *p, |
| 1359 | struct pack_idx_option *opts) |
| 1360 | { |
| 1361 | const uint32_t *idx1, *idx2; |
| 1362 | uint32_t i; |
| 1363 | |
| 1364 | /* The address of the 4-byte offset table */ |
| 1365 | idx1 = (((const uint32_t *)p->index_data) |
| 1366 | + 2 /* 8-byte header */ |
| 1367 | + 256 /* fan out */ |
| 1368 | + 5 * p->num_objects /* 20-byte SHA-1 table */ |
| 1369 | + p->num_objects /* CRC32 table */ |
| 1370 | ); |
| 1371 | |
| 1372 | /* The address of the 8-byte offset table */ |
| 1373 | idx2 = idx1 + p->num_objects; |
| 1374 | |
| 1375 | for (i = 0; i < p->num_objects; i++) { |
| 1376 | uint32_t off = ntohl(idx1[i]); |
| 1377 | if (!(off & 0x80000000)) |
| 1378 | continue; |
| 1379 | off = off & 0x7fffffff; |
| 1380 | if (idx2[off * 2]) |
| 1381 | continue; |
| 1382 | /* |
| 1383 | * The real offset is ntohl(idx2[off * 2]) in high 4 |
| 1384 | * octets, and ntohl(idx2[off * 2 + 1]) in low 4 |
| 1385 | * octets. But idx2[off * 2] is Zero!!! |
| 1386 | */ |
| 1387 | ALLOC_GROW(opts->anomaly, opts->anomaly_nr + 1, opts->anomaly_alloc); |
| 1388 | opts->anomaly[opts->anomaly_nr++] = ntohl(idx2[off * 2 + 1]); |
| 1389 | } |
| 1390 | |
| 1391 | if (1 < opts->anomaly_nr) |
| 1392 | qsort(opts->anomaly, opts->anomaly_nr, sizeof(uint32_t), cmp_uint32); |
| 1393 | } |
| 1394 | |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 1395 | static void read_idx_option(struct pack_idx_option *opts, const char *pack_name) |
| 1396 | { |
| 1397 | struct packed_git *p = add_packed_git(pack_name, strlen(pack_name), 1); |
| 1398 | |
| 1399 | if (!p) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1400 | die(_("Cannot open existing pack file '%s'"), pack_name); |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 1401 | if (open_pack_index(p)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1402 | die(_("Cannot open existing pack idx file for '%s'"), pack_name); |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 1403 | |
| 1404 | /* Read the attributes from the existing idx file */ |
| 1405 | opts->version = p->index_version; |
| 1406 | |
Junio C Hamano | 3c9fc07 | 2011-02-25 16:55:26 -0800 | [diff] [blame] | 1407 | if (opts->version == 2) |
| 1408 | read_v2_anomalous_offsets(p, opts); |
| 1409 | |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 1410 | /* |
| 1411 | * Get rid of the idx file as we do not need it anymore. |
| 1412 | * NEEDSWORK: extract this bit from free_pack_by_name() in |
| 1413 | * sha1_file.c, perhaps? It shouldn't matter very much as we |
| 1414 | * know we haven't installed this pack (hence we never have |
| 1415 | * read anything from it). |
| 1416 | */ |
| 1417 | close_pack_index(p); |
| 1418 | free(p); |
| 1419 | } |
| 1420 | |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 1421 | static void show_pack_info(int stat_only) |
| 1422 | { |
Junio C Hamano | d1a0ed1 | 2011-06-03 15:32:16 -0700 | [diff] [blame] | 1423 | int i, baseobjects = nr_objects - nr_deltas; |
| 1424 | unsigned long *chain_histogram = NULL; |
| 1425 | |
| 1426 | if (deepest_delta) |
| 1427 | chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long)); |
| 1428 | |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 1429 | for (i = 0; i < nr_objects; i++) { |
| 1430 | struct object_entry *obj = &objects[i]; |
| 1431 | |
Junio C Hamano | d1a0ed1 | 2011-06-03 15:32:16 -0700 | [diff] [blame] | 1432 | if (is_delta_type(obj->type)) |
| 1433 | chain_histogram[obj->delta_depth - 1]++; |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 1434 | if (stat_only) |
| 1435 | continue; |
| 1436 | printf("%s %-6s %lu %lu %"PRIuMAX, |
| 1437 | sha1_to_hex(obj->idx.sha1), |
| 1438 | typename(obj->real_type), obj->size, |
| 1439 | (unsigned long)(obj[1].idx.offset - obj->idx.offset), |
| 1440 | (uintmax_t)obj->idx.offset); |
| 1441 | if (is_delta_type(obj->type)) { |
| 1442 | struct object_entry *bobj = &objects[obj->base_object_no]; |
| 1443 | printf(" %u %s", obj->delta_depth, sha1_to_hex(bobj->idx.sha1)); |
| 1444 | } |
| 1445 | putchar('\n'); |
| 1446 | } |
Junio C Hamano | d1a0ed1 | 2011-06-03 15:32:16 -0700 | [diff] [blame] | 1447 | |
| 1448 | if (baseobjects) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1449 | printf_ln(Q_("non delta: %d object", |
| 1450 | "non delta: %d objects", |
| 1451 | baseobjects), |
| 1452 | baseobjects); |
Junio C Hamano | d1a0ed1 | 2011-06-03 15:32:16 -0700 | [diff] [blame] | 1453 | for (i = 0; i < deepest_delta; i++) { |
| 1454 | if (!chain_histogram[i]) |
| 1455 | continue; |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1456 | printf_ln(Q_("chain length = %d: %lu object", |
| 1457 | "chain length = %d: %lu objects", |
| 1458 | chain_histogram[i]), |
| 1459 | i + 1, |
| 1460 | chain_histogram[i]); |
Junio C Hamano | d1a0ed1 | 2011-06-03 15:32:16 -0700 | [diff] [blame] | 1461 | } |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 1462 | } |
| 1463 | |
Linus Torvalds | 3bb7256 | 2010-01-22 07:55:19 -0800 | [diff] [blame] | 1464 | int cmd_index_pack(int argc, const char **argv, const char *prefix) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1465 | { |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 1466 | int i, fix_thin_pack = 0, verify = 0, stat_only = 0, stat = 0; |
Linus Torvalds | 3bb7256 | 2010-01-22 07:55:19 -0800 | [diff] [blame] | 1467 | const char *curr_pack, *curr_index; |
| 1468 | const char *index_name = NULL, *pack_name = NULL; |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1469 | const char *keep_name = NULL, *keep_msg = NULL; |
| 1470 | char *index_name_buf = NULL, *keep_name_buf = NULL; |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 1471 | struct pack_idx_entry **idx_objects; |
Junio C Hamano | ebcfb37 | 2011-02-25 15:43:25 -0800 | [diff] [blame] | 1472 | struct pack_idx_option opts; |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1473 | unsigned char pack_sha1[20]; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1474 | |
Jonathan Nieder | 99caeed | 2009-11-09 09:05:01 -0600 | [diff] [blame] | 1475 | if (argc == 2 && !strcmp(argv[1], "-h")) |
| 1476 | usage(index_pack_usage); |
| 1477 | |
Nelson Elhage | 6e2a09d | 2010-08-12 10:18:12 -0400 | [diff] [blame] | 1478 | read_replace_refs = 0; |
| 1479 | |
Junio C Hamano | ebcfb37 | 2011-02-25 15:43:25 -0800 | [diff] [blame] | 1480 | reset_pack_idx_option(&opts); |
| 1481 | git_config(git_index_pack_config, &opts); |
Nguyễn Thái Ngọc Duy | 3f8099f | 2010-07-24 06:30:49 -0500 | [diff] [blame] | 1482 | if (prefix && chdir(prefix)) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1483 | die(_("Cannot come back to cwd")); |
Nicolas Pitre | 4d00bda | 2007-11-01 23:26:04 -0400 | [diff] [blame] | 1484 | |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1485 | for (i = 1; i < argc; i++) { |
Linus Torvalds | 3bb7256 | 2010-01-22 07:55:19 -0800 | [diff] [blame] | 1486 | const char *arg = argv[i]; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1487 | |
| 1488 | if (*arg == '-') { |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1489 | if (!strcmp(arg, "--stdin")) { |
| 1490 | from_stdin = 1; |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1491 | } else if (!strcmp(arg, "--fix-thin")) { |
| 1492 | fix_thin_pack = 1; |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 1493 | } else if (!strcmp(arg, "--strict")) { |
| 1494 | strict = 1; |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 1495 | } else if (!strcmp(arg, "--verify")) { |
| 1496 | verify = 1; |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 1497 | } else if (!strcmp(arg, "--verify-stat")) { |
| 1498 | verify = 1; |
| 1499 | stat = 1; |
| 1500 | } else if (!strcmp(arg, "--verify-stat-only")) { |
| 1501 | verify = 1; |
| 1502 | stat = 1; |
| 1503 | stat_only = 1; |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1504 | } else if (!strcmp(arg, "--keep")) { |
| 1505 | keep_msg = ""; |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 1506 | } else if (!prefixcmp(arg, "--keep=")) { |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1507 | keep_msg = arg + 7; |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 1508 | } else if (!prefixcmp(arg, "--threads=")) { |
| 1509 | char *end; |
| 1510 | nr_threads = strtoul(arg+10, &end, 0); |
| 1511 | if (!arg[10] || *end || nr_threads < 0) |
| 1512 | usage(index_pack_usage); |
| 1513 | #ifdef NO_PTHREADS |
| 1514 | if (nr_threads != 1) |
| 1515 | warning("no threads support, " |
| 1516 | "ignoring %s", arg); |
| 1517 | nr_threads = 1; |
| 1518 | #endif |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 1519 | } else if (!prefixcmp(arg, "--pack_header=")) { |
Nicolas Pitre | bed006f | 2006-11-01 17:06:20 -0500 | [diff] [blame] | 1520 | struct pack_header *hdr; |
| 1521 | char *c; |
| 1522 | |
| 1523 | hdr = (struct pack_header *)input_buffer; |
| 1524 | hdr->hdr_signature = htonl(PACK_SIGNATURE); |
| 1525 | hdr->hdr_version = htonl(strtoul(arg + 14, &c, 10)); |
| 1526 | if (*c != ',') |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1527 | die(_("bad %s"), arg); |
Nicolas Pitre | bed006f | 2006-11-01 17:06:20 -0500 | [diff] [blame] | 1528 | hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10)); |
| 1529 | if (*c) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1530 | die(_("bad %s"), arg); |
Nicolas Pitre | bed006f | 2006-11-01 17:06:20 -0500 | [diff] [blame] | 1531 | input_len = sizeof(*hdr); |
Nicolas Pitre | 3c9af36 | 2006-10-25 23:32:59 -0400 | [diff] [blame] | 1532 | } else if (!strcmp(arg, "-v")) { |
| 1533 | verbose = 1; |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1534 | } else if (!strcmp(arg, "-o")) { |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1535 | if (index_name || (i+1) >= argc) |
| 1536 | usage(index_pack_usage); |
| 1537 | index_name = argv[++i]; |
Nicolas Pitre | 4ba7d71 | 2007-04-09 17:32:03 -0400 | [diff] [blame] | 1538 | } else if (!prefixcmp(arg, "--index-version=")) { |
| 1539 | char *c; |
Junio C Hamano | ebcfb37 | 2011-02-25 15:43:25 -0800 | [diff] [blame] | 1540 | opts.version = strtoul(arg + 16, &c, 10); |
| 1541 | if (opts.version > 2) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1542 | die(_("bad %s"), arg); |
Nicolas Pitre | 4ba7d71 | 2007-04-09 17:32:03 -0400 | [diff] [blame] | 1543 | if (*c == ',') |
Junio C Hamano | ebcfb37 | 2011-02-25 15:43:25 -0800 | [diff] [blame] | 1544 | opts.off32_limit = strtoul(c+1, &c, 0); |
| 1545 | if (*c || opts.off32_limit & 0x80000000) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1546 | die(_("bad %s"), arg); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1547 | } else |
| 1548 | usage(index_pack_usage); |
| 1549 | continue; |
| 1550 | } |
| 1551 | |
| 1552 | if (pack_name) |
| 1553 | usage(index_pack_usage); |
| 1554 | pack_name = arg; |
| 1555 | } |
| 1556 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1557 | if (!pack_name && !from_stdin) |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1558 | usage(index_pack_usage); |
Nicolas Pitre | 636171c | 2006-10-25 23:28:17 -0400 | [diff] [blame] | 1559 | if (fix_thin_pack && !from_stdin) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1560 | die(_("--fix-thin cannot be used without --stdin")); |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1561 | if (!index_name && pack_name) { |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1562 | int len = strlen(pack_name); |
Rene Scharfe | 5bb1cda | 2006-08-11 14:01:45 +0200 | [diff] [blame] | 1563 | if (!has_extension(pack_name, ".pack")) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1564 | die(_("packfile name '%s' does not end with '.pack'"), |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1565 | pack_name); |
Pavel Roskin | 6689f08 | 2005-12-21 15:35:48 -0500 | [diff] [blame] | 1566 | index_name_buf = xmalloc(len); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1567 | memcpy(index_name_buf, pack_name, len - 5); |
| 1568 | strcpy(index_name_buf + len - 5, ".idx"); |
| 1569 | index_name = index_name_buf; |
| 1570 | } |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1571 | if (keep_msg && !keep_name && pack_name) { |
| 1572 | int len = strlen(pack_name); |
| 1573 | if (!has_extension(pack_name, ".pack")) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1574 | die(_("packfile name '%s' does not end with '.pack'"), |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1575 | pack_name); |
| 1576 | keep_name_buf = xmalloc(len); |
| 1577 | memcpy(keep_name_buf, pack_name, len - 5); |
| 1578 | strcpy(keep_name_buf + len - 5, ".keep"); |
| 1579 | keep_name = keep_name_buf; |
| 1580 | } |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 1581 | if (verify) { |
| 1582 | if (!index_name) |
Nguyễn Thái Ngọc Duy | c2b97ec | 2012-04-23 19:30:29 +0700 | [diff] [blame] | 1583 | die(_("--verify with no packfile name given")); |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 1584 | read_idx_option(&opts, index_name); |
Junio C Hamano | 68be2fe | 2011-11-16 22:04:13 -0800 | [diff] [blame] | 1585 | opts.flags |= WRITE_IDX_VERIFY | WRITE_IDX_STRICT; |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 1586 | } |
Junio C Hamano | 68be2fe | 2011-11-16 22:04:13 -0800 | [diff] [blame] | 1587 | if (strict) |
| 1588 | opts.flags |= WRITE_IDX_STRICT; |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1589 | |
Nguyễn Thái Ngọc Duy | b8a2486 | 2012-05-06 19:31:55 +0700 | [diff] [blame] | 1590 | #ifndef NO_PTHREADS |
| 1591 | if (!nr_threads) { |
| 1592 | nr_threads = online_cpus(); |
| 1593 | /* An experiment showed that more threads does not mean faster */ |
| 1594 | if (nr_threads > 3) |
| 1595 | nr_threads = 3; |
| 1596 | } |
| 1597 | #endif |
| 1598 | |
Nicolas Pitre | e42797f | 2006-10-23 14:50:18 -0400 | [diff] [blame] | 1599 | curr_pack = open_pack_file(pack_name); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1600 | parse_pack_header(); |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 1601 | objects = xcalloc(nr_objects + 1, sizeof(struct object_entry)); |
| 1602 | deltas = xcalloc(nr_objects, sizeof(struct delta_entry)); |
Nicolas Pitre | 8522148 | 2008-08-29 16:08:01 -0400 | [diff] [blame] | 1603 | parse_pack_objects(pack_sha1); |
Nguyễn Thái Ngọc Duy | 5272f75 | 2012-05-06 19:31:54 +0700 | [diff] [blame] | 1604 | resolve_deltas(); |
| 1605 | conclude_pack(fix_thin_pack, curr_pack, pack_sha1); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1606 | free(deltas); |
Martin Koegler | 0153be0 | 2008-02-25 22:46:12 +0100 | [diff] [blame] | 1607 | if (strict) |
| 1608 | check_objects(); |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 1609 | |
Junio C Hamano | 38a4556 | 2011-06-03 15:32:15 -0700 | [diff] [blame] | 1610 | if (stat) |
| 1611 | show_pack_info(stat_only); |
| 1612 | |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 1613 | idx_objects = xmalloc((nr_objects) * sizeof(struct pack_idx_entry *)); |
| 1614 | for (i = 0; i < nr_objects; i++) |
| 1615 | idx_objects[i] = &objects[i].idx; |
Junio C Hamano | ebcfb37 | 2011-02-25 15:43:25 -0800 | [diff] [blame] | 1616 | curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_sha1); |
Geert Bosch | aa7e44b | 2007-06-01 15:18:05 -0400 | [diff] [blame] | 1617 | free(idx_objects); |
| 1618 | |
Junio C Hamano | e337a04 | 2011-02-02 17:29:01 -0800 | [diff] [blame] | 1619 | if (!verify) |
| 1620 | final(pack_name, curr_pack, |
| 1621 | index_name, curr_index, |
| 1622 | keep_name, keep_msg, |
| 1623 | pack_sha1); |
| 1624 | else |
| 1625 | close(input_fd); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1626 | free(objects); |
| 1627 | free(index_name_buf); |
Shawn Pearce | b807770 | 2006-10-29 04:41:59 -0500 | [diff] [blame] | 1628 | free(keep_name_buf); |
Nicolas Pitre | c85228e | 2007-10-16 21:55:50 -0400 | [diff] [blame] | 1629 | if (pack_name == NULL) |
Linus Torvalds | 3bb7256 | 2010-01-22 07:55:19 -0800 | [diff] [blame] | 1630 | free((void *) curr_pack); |
Nicolas Pitre | c85228e | 2007-10-16 21:55:50 -0400 | [diff] [blame] | 1631 | if (index_name == NULL) |
Linus Torvalds | 3bb7256 | 2010-01-22 07:55:19 -0800 | [diff] [blame] | 1632 | free((void *) curr_index); |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1633 | |
Sergey Vlasov | 9cf6d33 | 2005-10-12 12:01:31 -0700 | [diff] [blame] | 1634 | return 0; |
| 1635 | } |