Print this page
NEX-2911 NDMP logging should use syslog and is too chatty

*** 47,59 **** #define HL_DBG_INIT 0x0001 #define HL_DBG_CLEANUP 0x0002 #define HL_DBG_GET 0x0004 #define HL_DBG_ADD 0x0008 - static int hardlink_q_dbg = -1; - - struct hardlink_q * hardlink_q_init() { struct hardlink_q *qhead; --- 47,56 ----
*** 60,109 **** qhead = (struct hardlink_q *)malloc(sizeof (struct hardlink_q)); if (qhead) { SLIST_INIT(qhead); } - if (hardlink_q_dbg & HL_DBG_INIT) - NDMP_LOG(LOG_DEBUG, "qhead = %p", qhead); - return (qhead); } void hardlink_q_cleanup(struct hardlink_q *hl_q) { struct hardlink_node *hl; - if (hardlink_q_dbg & HL_DBG_CLEANUP) - NDMP_LOG(LOG_DEBUG, "(1): qhead = %p", hl_q); - if (!hl_q) return; while (!SLIST_EMPTY(hl_q)) { hl = SLIST_FIRST(hl_q); - if (hardlink_q_dbg & HL_DBG_CLEANUP) - NDMP_LOG(LOG_DEBUG, "(2): remove node, inode = %lu", - hl->inode); - SLIST_REMOVE_HEAD(hl_q, next_hardlink); /* remove the temporary file */ if (hl->is_tmp) { if (hl->path) { ! NDMP_LOG(LOG_DEBUG, "(3): remove temp file %s", ! hl->path); ! if (remove(hl->path)) { ! NDMP_LOG(LOG_DEBUG, ! "error removing temp file"); } - } else { - NDMP_LOG(LOG_DEBUG, "no link name, inode = %lu", - hl->inode); } - } if (hl->path) free(hl->path); free(hl); } --- 57,88 ---- qhead = (struct hardlink_q *)malloc(sizeof (struct hardlink_q)); if (qhead) { SLIST_INIT(qhead); } return (qhead); } void hardlink_q_cleanup(struct hardlink_q *hl_q) { struct hardlink_node *hl; if (!hl_q) return; while (!SLIST_EMPTY(hl_q)) { hl = SLIST_FIRST(hl_q); SLIST_REMOVE_HEAD(hl_q, next_hardlink); /* remove the temporary file */ if (hl->is_tmp) { if (hl->path) { ! (void) remove(hl->path); } } if (hl->path) free(hl->path); free(hl); }
*** 120,140 **** hardlink_q_get(struct hardlink_q *hl_q, unsigned long inode, unsigned long long *offset, char **path) { struct hardlink_node *hl; - if (hardlink_q_dbg & HL_DBG_GET) - NDMP_LOG(LOG_DEBUG, "(1): qhead = %p, inode = %lu", - hl_q, inode); - if (!hl_q) return (-1); SLIST_FOREACH(hl, hl_q, next_hardlink) { - if (hardlink_q_dbg & HL_DBG_GET) - NDMP_LOG(LOG_DEBUG, "(2): checking, inode = %lu", - hl->inode); if (hl->inode != inode) continue; if (offset) --- 99,112 ----
*** 158,178 **** hardlink_q_add(struct hardlink_q *hl_q, unsigned long inode, unsigned long long offset, char *path, int is_tmp_file) { struct hardlink_node *hl; - if (hardlink_q_dbg & HL_DBG_ADD) - NDMP_LOG(LOG_DEBUG, - "(1): qhead = %p, inode = %lu, path = %p (%s)", - hl_q, inode, path, path? path : "(--)"); - if (!hl_q) return (-1); if (!hardlink_q_get(hl_q, inode, 0, 0)) { - NDMP_LOG(LOG_DEBUG, "hardlink (inode = %lu) exists in queue %p", - inode, hl_q); return (-1); } hl = (struct hardlink_node *)malloc(sizeof (struct hardlink_node)); if (!hl) --- 130,143 ----
*** 184,198 **** if (path) hl->path = strdup(path); else hl->path = NULL; - if (hardlink_q_dbg & HL_DBG_ADD) - NDMP_LOG(LOG_DEBUG, - "(2): added node, inode = %lu, path = %p (%s)", - hl->inode, hl->path, hl->path? hl->path : "(--)"); - SLIST_INSERT_HEAD(hl_q, hl, next_hardlink); return (0); } --- 149,158 ----