From 56ac812359d7dda201fa5a3399bb60bc4bfbbbc2 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sun, 20 Jul 2008 13:54:53 -0700 Subject: [PATCH] A few more HLINK debug messages. --- hlink.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/hlink.c b/hlink.c index 598743db..0fe6beda 100644 --- a/hlink.c +++ b/hlink.c @@ -70,7 +70,7 @@ struct ht_int64_node *idev_find(int64 dev, int64 ino) dev_node = hashtable_find(dev_tbl, dev, 1); if (!(tbl = dev_node->data)) { tbl = dev_node->data = hashtable_create(512, SIZEOF_INT64 == 8); - if (DEBUG_GTE(HLINK, 2)) { + if (DEBUG_GTE(HLINK, 3)) { rprintf(FINFO, "[%s] created hashtable for dev %s\n", who_am_i(), big_num(dev, 0)); @@ -309,6 +309,10 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname, if (!flist) { /* The previous file was skipped, so this one is * treated as if it were the first in its group. */ + if (DEBUG_GTE(HLINK, 2)) { + rprintf(FINFO, "hlink for %d (%s,%d): virtual first\n", + ndx, f_name(file, NULL), gnum); + } return 0; } @@ -325,8 +329,16 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname, F_HL_PREV(prev_file) = ndx; file->flags |= FLAG_FILE_SENT; cur_flist->in_progress++; + if (DEBUG_GTE(HLINK, 2)) { + rprintf(FINFO, "hlink for %d (%s,%d): waiting for %d\n", + ndx, f_name(file, NULL), gnum, F_HL_PREV(file)); + } return 1; } + if (DEBUG_GTE(HLINK, 2)) { + rprintf(FINFO, "hlink for %d (%s,%d): looking for a leader\n", + ndx, f_name(file, NULL), gnum); + } return 0; } @@ -334,7 +346,6 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname, if (!(prev_file->flags & FLAG_HLINK_FIRST)) { /* The previous previous is FIRST when prev is not. */ prev_name = realname = check_prior(prev_file, gnum, &prev_ndx, &flist); - assert(prev_name != NULL || flist != NULL); /* Update our previous pointer to point to the FIRST. */ F_HL_PREV(file) = prev_ndx; } @@ -342,9 +353,14 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname, if (!prev_name) { int alt_dest; + assert(flist != NULL); prev_file = flist->files[prev_ndx - flist->ndx_start]; /* F_HL_PREV() is alt_dest value when DONE && FIRST. */ alt_dest = F_HL_PREV(prev_file); + if (DEBUG_GTE(HLINK, 2)) { + rprintf(FINFO, "hlink for %d (%s,%d): found flist match (alt %d)\n", + ndx, f_name(file, NULL), gnum, alt_dest); + } if (alt_dest >= 0 && dry_run) { pathjoin(namebuf, MAXPATHLEN, basis_dir[alt_dest], @@ -358,6 +374,11 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname, } } + if (DEBUG_GTE(HLINK, 2)) { + rprintf(FINFO, "hlink for %d (%s,%d): leader is %d (%s)\n", + ndx, f_name(file, NULL), gnum, prev_ndx, prev_name); + } + if (link_stat(prev_name, &prev_st, 0) < 0) { rsyserr(FERROR_XFER, errno, "stat %s failed", full_fname(prev_name)); -- 2.34.1