undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/index-pack-threaded-fixes'

Browse Source 
"index-pack --verify-stat" used a few counters outside protection
of mutex, possibly showing incorrect numbers.

* nd/index-pack-threaded-fixes:
  index-pack: guard nr_resolved_deltas reads by lock
  index-pack: protect deepest_delta in multithread code
This commit is contained in:
Junio C Hamano 2013-04-01 09:06:23 -07:00
commit 1d066c58ee
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
builtin/index-pack.c
View File

@ -78,6 +78,7 @@ static int nr_threads;
static int from_stdin; static int from_stdin;
static int strict; static int strict;
static int verbose; static int verbose;
static int show_stat;
static struct progress *progress; static struct progress *progress;
@ -108,6 +109,10 @@ static pthread_mutex_t work_mutex;
#define work_lock() lock_mutex(&work_mutex) #define work_lock() lock_mutex(&work_mutex)
#define work_unlock() unlock_mutex(&work_mutex) #define work_unlock() unlock_mutex(&work_mutex)
static pthread_mutex_t deepest_delta_mutex;
#define deepest_delta_lock() lock_mutex(&deepest_delta_mutex)
#define deepest_delta_unlock() unlock_mutex(&deepest_delta_mutex)
static pthread_key_t key; static pthread_key_t key;
static inline void lock_mutex(pthread_mutex_t *mutex) static inline void lock_mutex(pthread_mutex_t *mutex)
@ -130,6 +135,8 @@ static void init_thread(void)
init_recursive_mutex(&read_mutex); init_recursive_mutex(&read_mutex);
pthread_mutex_init(&counter_mutex, NULL); pthread_mutex_init(&counter_mutex, NULL);
pthread_mutex_init(&work_mutex, NULL); pthread_mutex_init(&work_mutex, NULL);
if (show_stat)
pthread_mutex_init(&deepest_delta_mutex, NULL);
pthread_key_create(&key, NULL); pthread_key_create(&key, NULL);
thread_data = xcalloc(nr_threads, sizeof(*thread_data)); thread_data = xcalloc(nr_threads, sizeof(*thread_data));
threads_active = 1; threads_active = 1;
@ -143,6 +150,8 @@ static void cleanup_thread(void)
pthread_mutex_destroy(&read_mutex); pthread_mutex_destroy(&read_mutex);
pthread_mutex_destroy(&counter_mutex); pthread_mutex_destroy(&counter_mutex);
pthread_mutex_destroy(&work_mutex); pthread_mutex_destroy(&work_mutex);
if (show_stat)
pthread_mutex_destroy(&deepest_delta_mutex);
pthread_key_delete(key); pthread_key_delete(key);
free(thread_data); free(thread_data);
} }
@ -158,6 +167,9 @@ static void cleanup_thread(void)
#define work_lock() #define work_lock()
#define work_unlock() #define work_unlock()
#define deepest_delta_lock()
#define deepest_delta_unlock()
#endif #endif
@ -833,9 +845,13 @@ static void resolve_delta(struct object_entry *delta_obj,
void *base_data, *delta_data; void *base_data, *delta_data;
delta_obj->real_type = base->obj->real_type; delta_obj->real_type = base->obj->real_type;
delta_obj->delta_depth = base->obj->delta_depth + 1; if (show_stat) {
if (deepest_delta < delta_obj->delta_depth) delta_obj->delta_depth = base->obj->delta_depth + 1;
deepest_delta = delta_obj->delta_depth; deepest_delta_lock();
if (deepest_delta < delta_obj->delta_depth)
deepest_delta = delta_obj->delta_depth;
deepest_delta_unlock();
}
delta_obj->base_object_no = base->obj - objects; delta_obj->base_object_no = base->obj - objects;
delta_data = get_data_from_pack(delta_obj); delta_data = get_data_from_pack(delta_obj);
base_data = get_base_data(base); base_data = get_base_data(base);
@ -951,8 +967,10 @@ static void *threaded_second_pass(void *data)
set_thread_data(data); set_thread_data(data);
for (;;) { for (;;) {
int i; int i;
work_lock(); counter_lock();
display_progress(progress, nr_resolved_deltas); display_progress(progress, nr_resolved_deltas);
counter_unlock();
work_lock();
while (nr_dispatched < nr_objects && while (nr_dispatched < nr_objects &&
is_delta_type(objects[nr_dispatched].type)) is_delta_type(objects[nr_dispatched].type))
nr_dispatched++; nr_dispatched++;
@ -1465,7 +1483,7 @@ static void show_pack_info(int stat_only)
int cmd_index_pack(int argc, const char **argv, const char *prefix) int cmd_index_pack(int argc, const char **argv, const char *prefix)
{ {
int i, fix_thin_pack = 0, verify = 0, stat_only = 0, stat = 0; int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
const char *curr_pack, *curr_index; const char *curr_pack, *curr_index;
const char *index_name = NULL, *pack_name = NULL; const char *index_name = NULL, *pack_name = NULL;
const char *keep_name = NULL, *keep_msg = NULL; const char *keep_name = NULL, *keep_msg = NULL;
@ -1498,10 +1516,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
verify = 1; verify = 1;
} else if (!strcmp(arg, "--verify-stat")) { } else if (!strcmp(arg, "--verify-stat")) {
verify = 1; verify = 1;
stat = 1; show_stat = 1;
} else if (!strcmp(arg, "--verify-stat-only")) { } else if (!strcmp(arg, "--verify-stat-only")) {
verify = 1; verify = 1;
stat = 1; show_stat = 1;
stat_only = 1; stat_only = 1;
} else if (!strcmp(arg, "--keep")) { } else if (!strcmp(arg, "--keep")) {
keep_msg = ""; keep_msg = "";
@ -1609,7 +1627,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
if (strict) if (strict)
check_objects(); check_objects();
if (stat) if (show_stat)
show_pack_info(stat_only); show_pack_info(stat_only);
idx_objects = xmalloc((nr_objects) * sizeof(struct pack_idx_entry *)); idx_objects = xmalloc((nr_objects) * sizeof(struct pack_idx_entry *));