Print this page
NEX-2911 NDMP logging should use syslog and is too chatty
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/ndmpd/tlm/tlm_hardlink.c
+++ new/usr/src/cmd/ndmpd/tlm/tlm_hardlink.c
1 1 /*
2 2 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
3 3 * Use is subject to license terms.
4 4 */
5 5
6 6 /*
7 7 * BSD 3 Clause License
8 8 *
9 9 * Copyright (c) 2007, The Storage Networking Industry Association.
10 10 *
11 11 * Redistribution and use in source and binary forms, with or without
12 12 * modification, are permitted provided that the following conditions
13 13 * are met:
14 14 * - Redistributions of source code must retain the above copyright
15 15 * notice, this list of conditions and the following disclaimer.
16 16 *
17 17 * - Redistributions in binary form must reproduce the above copyright
18 18 * notice, this list of conditions and the following disclaimer in
19 19 * the documentation and/or other materials provided with the
20 20 * distribution.
21 21 *
22 22 * - Neither the name of The Storage Networking Industry Association (SNIA)
23 23 * nor the names of its contributors may be used to endorse or promote
24 24 * products derived from this software without specific prior written
25 25 * permission.
26 26 *
27 27 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
28 28 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
29 29 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
30 30 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
31 31 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
32 32 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
33 33 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
34 34 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
35 35 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
36 36 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
37 37 * POSSIBILITY OF SUCH DAMAGE.
38 38 */
39 39 #include <stdlib.h>
40 40 #include <stdio.h>
41 41 #include <string.h>
|
↓ open down ↓ |
41 lines elided |
↑ open up ↑ |
42 42 #include <sys/queue.h>
43 43 #include <sys/syslog.h>
44 44 #include "tlm.h"
45 45 #include "tlm_proto.h"
46 46
47 47 #define HL_DBG_INIT 0x0001
48 48 #define HL_DBG_CLEANUP 0x0002
49 49 #define HL_DBG_GET 0x0004
50 50 #define HL_DBG_ADD 0x0008
51 51
52 -static int hardlink_q_dbg = -1;
53 -
54 -
55 52 struct hardlink_q *
56 53 hardlink_q_init()
57 54 {
58 55 struct hardlink_q *qhead;
59 56
60 57 qhead = (struct hardlink_q *)malloc(sizeof (struct hardlink_q));
61 58 if (qhead) {
62 59 SLIST_INIT(qhead);
63 60 }
64 61
65 - if (hardlink_q_dbg & HL_DBG_INIT)
66 - NDMP_LOG(LOG_DEBUG, "qhead = %p", qhead);
67 -
68 62 return (qhead);
69 63 }
70 64
71 65 void
72 66 hardlink_q_cleanup(struct hardlink_q *hl_q)
73 67 {
74 68 struct hardlink_node *hl;
75 69
76 - if (hardlink_q_dbg & HL_DBG_CLEANUP)
77 - NDMP_LOG(LOG_DEBUG, "(1): qhead = %p", hl_q);
78 -
79 70 if (!hl_q)
80 71 return;
81 72
82 73 while (!SLIST_EMPTY(hl_q)) {
83 74 hl = SLIST_FIRST(hl_q);
84 75
85 - if (hardlink_q_dbg & HL_DBG_CLEANUP)
86 - NDMP_LOG(LOG_DEBUG, "(2): remove node, inode = %lu",
87 - hl->inode);
88 -
89 76 SLIST_REMOVE_HEAD(hl_q, next_hardlink);
90 77
91 78 /* remove the temporary file */
92 79 if (hl->is_tmp) {
93 80 if (hl->path) {
94 - NDMP_LOG(LOG_DEBUG, "(3): remove temp file %s",
95 - hl->path);
96 - if (remove(hl->path)) {
97 - NDMP_LOG(LOG_DEBUG,
98 - "error removing temp file");
99 - }
100 - } else {
101 - NDMP_LOG(LOG_DEBUG, "no link name, inode = %lu",
102 - hl->inode);
81 + (void) remove(hl->path);
103 82 }
104 83 }
105 84
106 85 if (hl->path)
107 86 free(hl->path);
108 87 free(hl);
109 88 }
110 89
111 90 free(hl_q);
112 91 }
113 92
114 93 /*
|
↓ open down ↓ |
2 lines elided |
↑ open up ↑ |
115 94 * Return 0 if a list node has the same inode, and initialize offset and path
116 95 * with the information in the list node.
117 96 * Return -1 if no matching node is found.
118 97 */
119 98 int
120 99 hardlink_q_get(struct hardlink_q *hl_q, unsigned long inode,
121 100 unsigned long long *offset, char **path)
122 101 {
123 102 struct hardlink_node *hl;
124 103
125 - if (hardlink_q_dbg & HL_DBG_GET)
126 - NDMP_LOG(LOG_DEBUG, "(1): qhead = %p, inode = %lu",
127 - hl_q, inode);
128 -
129 104 if (!hl_q)
130 105 return (-1);
131 106
132 107 SLIST_FOREACH(hl, hl_q, next_hardlink) {
133 - if (hardlink_q_dbg & HL_DBG_GET)
134 - NDMP_LOG(LOG_DEBUG, "(2): checking, inode = %lu",
135 - hl->inode);
136 108
137 109 if (hl->inode != inode)
138 110 continue;
139 111
140 112 if (offset)
141 113 *offset = hl->offset;
142 114
143 115 if (path)
144 116 *path = hl->path;
145 117
146 118 return (0);
147 119 }
148 120
149 121 return (-1);
150 122 }
151 123
152 124 /*
|
↓ open down ↓ |
7 lines elided |
↑ open up ↑ |
153 125 * Add a node to hardlink_q. Reject a duplicated entry.
154 126 *
155 127 * Return 0 if successful, and -1 if failed.
156 128 */
157 129 int
158 130 hardlink_q_add(struct hardlink_q *hl_q, unsigned long inode,
159 131 unsigned long long offset, char *path, int is_tmp_file)
160 132 {
161 133 struct hardlink_node *hl;
162 134
163 - if (hardlink_q_dbg & HL_DBG_ADD)
164 - NDMP_LOG(LOG_DEBUG,
165 - "(1): qhead = %p, inode = %lu, path = %p (%s)",
166 - hl_q, inode, path, path? path : "(--)");
167 -
168 135 if (!hl_q)
169 136 return (-1);
170 137
171 138 if (!hardlink_q_get(hl_q, inode, 0, 0)) {
172 - NDMP_LOG(LOG_DEBUG, "hardlink (inode = %lu) exists in queue %p",
173 - inode, hl_q);
174 139 return (-1);
175 140 }
176 141
177 142 hl = (struct hardlink_node *)malloc(sizeof (struct hardlink_node));
178 143 if (!hl)
179 144 return (-1);
180 145
181 146 hl->inode = inode;
182 147 hl->offset = offset;
183 148 hl->is_tmp = is_tmp_file;
184 149 if (path)
185 150 hl->path = strdup(path);
186 151 else
187 152 hl->path = NULL;
188 153
189 - if (hardlink_q_dbg & HL_DBG_ADD)
190 - NDMP_LOG(LOG_DEBUG,
191 - "(2): added node, inode = %lu, path = %p (%s)",
192 - hl->inode, hl->path, hl->path? hl->path : "(--)");
193 -
194 154 SLIST_INSERT_HEAD(hl_q, hl, next_hardlink);
195 155
196 156 return (0);
197 157 }
198 158
199 159 int
200 160 hardlink_q_dump(struct hardlink_q *hl_q)
201 161 {
202 162 struct hardlink_node *hl;
203 163
204 164 if (!hl_q)
205 165 return (0);
206 166
207 167 (void) printf("Dumping hardlink_q, head = %p:\n", (void *) hl_q);
208 168
209 169 SLIST_FOREACH(hl, hl_q, next_hardlink)
210 170 (void) printf(
211 171 "\t node = %lu, offset = %llu, path = %s, is_tmp = %d\n",
212 172 hl->inode, hl->offset, hl->path? hl->path : "--",
213 173 hl->is_tmp);
214 174
215 175 return (0);
216 176 }
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX