Skip to content

Commit 72524dc

Browse files
robnrobn
committed
WIP lib dependency reorg
[signoff is a lie; I just want checkstyle to pass to checkabi will definitely run] Signed-off-by: Rob Norris <[email protected]>
1 parent 9befc34 commit 72524dc

File tree

14 files changed

+95
-86
lines changed

14 files changed

+95
-86
lines changed

‎cmd/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ mount_zfs_SOURCES = \
7373
%D%/mount_zfs.c
7474

7575
mount_zfs_LDADD = \
76+
libspl.la \
7677
libzfs.la \
7778
libzfs_core.la \
7879
libnvpair.la

‎cmd/zed/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ zed_SOURCES = \
3737
%D%/agents/zfs_retire.c
3838

3939
zed_LDADD = \
40+
libspl.la \
4041
libzfs.la \
4142
libzfs_core.la \
4243
libnvpair.la \

‎cmd/zfs/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ zfs_SOURCES = \
1010
%D%/zfs_util.h
1111

1212
zfs_LDADD = \
13+
libspl.la \
1314
libzfs.la \
1415
libzfs_core.la \
1516
libnvpair.la \

‎cmd/zinject/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ zinject_SOURCES = \
99
%D%/zinject.h
1010

1111
zinject_LDADD = \
12+
libspl.la \
1213
libzfs.la \
1314
libzfs_core.la \
1415
libnvpair.la

‎cmd/zpool/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ zpool_LDADD = \
2929
libzfs_core.la \
3030
libnvpair.la \
3131
libuutil.la \
32-
libzutil.la
32+
libzutil.la \
33+
libspl.la
3334

3435
zpool_LDADD += $(LTLIBINTL)
3536

‎include/libuutil.h‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525

2626
#ifndef _LIBUUTIL_H
27-
#define _LIBUUTIL_H
27+
#define _LIBUUTIL_H extern __attribute__((visibility("default")))
2828

2929
#include <sys/types.h>
3030
#include <stdarg.h>
@@ -66,7 +66,7 @@ extern "C" {
6666
/*
6767
* Error reporting functions.
6868
*/
69-
uint32_t uu_error(void);
69+
_LIBUUTIL_H uint32_t uu_error(void);
7070
const char *uu_strerror(uint32_t);
7171

7272
/*
@@ -169,11 +169,11 @@ typedef uintptr_t uu_list_index_t;
169169
* debugging? 0 : UU_AVL_POOL_DEBUG);
170170
* ...
171171
*/
172-
uu_list_pool_t *uu_list_pool_create(const char *, size_t, size_t,
172+
_LIBUUTIL_H uu_list_pool_t *uu_list_pool_create(const char *, size_t, size_t,
173173
uu_compare_fn_t *, uint32_t);
174174
#define UU_LIST_POOL_DEBUG 0x00000001
175175

176-
void uu_list_pool_destroy(uu_list_pool_t *);
176+
_LIBUUTIL_H void uu_list_pool_destroy(uu_list_pool_t *);
177177

178178
/*
179179
* usage:
@@ -185,44 +185,44 @@ void uu_list_pool_destroy(uu_list_pool_t *);
185185
* uu_list_node_fini(a, &a->foo_list, pool);
186186
* free(a);
187187
*/
188-
void uu_list_node_init(void *, uu_list_node_t *, uu_list_pool_t *);
189-
void uu_list_node_fini(void *, uu_list_node_t *, uu_list_pool_t *);
188+
_LIBUUTIL_H void uu_list_node_init(void *, uu_list_node_t *, uu_list_pool_t *);
189+
_LIBUUTIL_H void uu_list_node_fini(void *, uu_list_node_t *, uu_list_pool_t *);
190190

191-
uu_list_t *uu_list_create(uu_list_pool_t *, void *_parent, uint32_t);
191+
_LIBUUTIL_H uu_list_t *uu_list_create(uu_list_pool_t *, void *, uint32_t);
192192
#define UU_LIST_DEBUG 0x00000001
193193
#define UU_LIST_SORTED 0x00000002 /* list is sorted */
194194

195-
void uu_list_destroy(uu_list_t *); /* list must be empty */
195+
_LIBUUTIL_H void uu_list_destroy(uu_list_t *); /* list must be empty */
196196

197-
size_t uu_list_numnodes(uu_list_t *);
197+
_LIBUUTIL_H size_t uu_list_numnodes(uu_list_t *);
198198

199-
void *uu_list_first(uu_list_t *);
200-
void *uu_list_last(uu_list_t *);
199+
_LIBUUTIL_H void *uu_list_first(uu_list_t *);
200+
_LIBUUTIL_H void *uu_list_last(uu_list_t *);
201201

202-
void *uu_list_next(uu_list_t *, void *);
203-
void *uu_list_prev(uu_list_t *, void *);
202+
_LIBUUTIL_H void *uu_list_next(uu_list_t *, void *);
203+
_LIBUUTIL_H void *uu_list_prev(uu_list_t *, void *);
204204

205-
int uu_list_walk(uu_list_t *, uu_walk_fn_t *, void *, uint32_t);
205+
_LIBUUTIL_H int uu_list_walk(uu_list_t *, uu_walk_fn_t *, void *, uint32_t);
206206

207-
uu_list_walk_t *uu_list_walk_start(uu_list_t *, uint32_t);
208-
void *uu_list_walk_next(uu_list_walk_t *);
209-
void uu_list_walk_end(uu_list_walk_t *);
207+
_LIBUUTIL_H uu_list_walk_t *uu_list_walk_start(uu_list_t *, uint32_t);
208+
_LIBUUTIL_H void *uu_list_walk_next(uu_list_walk_t *);
209+
_LIBUUTIL_H void uu_list_walk_end(uu_list_walk_t *);
210210

211-
void *uu_list_find(uu_list_t *, void *, void *, uu_list_index_t *);
212-
void uu_list_insert(uu_list_t *, void *, uu_list_index_t);
211+
_LIBUUTIL_H void *uu_list_find(uu_list_t *, void *, void *, uu_list_index_t *);
212+
_LIBUUTIL_H void uu_list_insert(uu_list_t *, void *, uu_list_index_t);
213213

214-
void *uu_list_nearest_next(uu_list_t *, uu_list_index_t);
215-
void *uu_list_nearest_prev(uu_list_t *, uu_list_index_t);
214+
_LIBUUTIL_H void *uu_list_nearest_next(uu_list_t *, uu_list_index_t);
215+
_LIBUUTIL_H void *uu_list_nearest_prev(uu_list_t *, uu_list_index_t);
216216

217-
void *uu_list_teardown(uu_list_t *, void **);
217+
_LIBUUTIL_H void *uu_list_teardown(uu_list_t *, void **);
218218

219-
void uu_list_remove(uu_list_t *, void *);
219+
_LIBUUTIL_H void uu_list_remove(uu_list_t *, void *);
220220

221221
/*
222222
* lists: interfaces for non-sorted lists only
223223
*/
224-
int uu_list_insert_before(uu_list_t *, void *_target, void *_elem);
225-
int uu_list_insert_after(uu_list_t *, void *_target, void *_elem);
224+
_LIBUUTIL_H int uu_list_insert_before(uu_list_t *, void *_target, void *_elem);
225+
_LIBUUTIL_H int uu_list_insert_after(uu_list_t *, void *_target, void *_elem);
226226

227227
/*
228228
* avl trees: opaque structures
@@ -272,11 +272,11 @@ typedef uintptr_t uu_avl_index_t;
272272
* debugging? 0 : UU_AVL_POOL_DEBUG);
273273
* ...
274274
*/
275-
uu_avl_pool_t *uu_avl_pool_create(const char *, size_t, size_t,
275+
_LIBUUTIL_H uu_avl_pool_t *uu_avl_pool_create(const char *, size_t, size_t,
276276
uu_compare_fn_t *, uint32_t);
277277
#define UU_AVL_POOL_DEBUG 0x00000001
278278

279-
void uu_avl_pool_destroy(uu_avl_pool_t *);
279+
_LIBUUTIL_H void uu_avl_pool_destroy(uu_avl_pool_t *);
280280

281281
/*
282282
* usage:
@@ -288,37 +288,37 @@ void uu_avl_pool_destroy(uu_avl_pool_t *);
288288
* uu_avl_node_fini(a, &a->foo_avl, pool);
289289
* free(a);
290290
*/
291-
void uu_avl_node_init(void *, uu_avl_node_t *, uu_avl_pool_t *);
292-
void uu_avl_node_fini(void *, uu_avl_node_t *, uu_avl_pool_t *);
291+
_LIBUUTIL_H void uu_avl_node_init(void *, uu_avl_node_t *, uu_avl_pool_t *);
292+
_LIBUUTIL_H void uu_avl_node_fini(void *, uu_avl_node_t *, uu_avl_pool_t *);
293293

294-
uu_avl_t *uu_avl_create(uu_avl_pool_t *, void *_parent, uint32_t);
294+
_LIBUUTIL_H uu_avl_t *uu_avl_create(uu_avl_pool_t *, void *_parent, uint32_t);
295295
#define UU_AVL_DEBUG 0x00000001
296296

297-
void uu_avl_destroy(uu_avl_t *); /* list must be empty */
297+
_LIBUUTIL_H void uu_avl_destroy(uu_avl_t *); /* list must be empty */
298298

299-
size_t uu_avl_numnodes(uu_avl_t *);
299+
_LIBUUTIL_H size_t uu_avl_numnodes(uu_avl_t *);
300300

301-
void *uu_avl_first(uu_avl_t *);
302-
void *uu_avl_last(uu_avl_t *);
301+
_LIBUUTIL_H void *uu_avl_first(uu_avl_t *);
302+
_LIBUUTIL_H void *uu_avl_last(uu_avl_t *);
303303

304-
void *uu_avl_next(uu_avl_t *, void *);
305-
void *uu_avl_prev(uu_avl_t *, void *);
304+
_LIBUUTIL_H void *uu_avl_next(uu_avl_t *, void *);
305+
_LIBUUTIL_H void *uu_avl_prev(uu_avl_t *, void *);
306306

307-
int uu_avl_walk(uu_avl_t *, uu_walk_fn_t *, void *, uint32_t);
307+
_LIBUUTIL_H int uu_avl_walk(uu_avl_t *, uu_walk_fn_t *, void *, uint32_t);
308308

309-
uu_avl_walk_t *uu_avl_walk_start(uu_avl_t *, uint32_t);
310-
void *uu_avl_walk_next(uu_avl_walk_t *);
311-
void uu_avl_walk_end(uu_avl_walk_t *);
309+
_LIBUUTIL_H uu_avl_walk_t *uu_avl_walk_start(uu_avl_t *, uint32_t);
310+
_LIBUUTIL_H void *uu_avl_walk_next(uu_avl_walk_t *);
311+
_LIBUUTIL_H void uu_avl_walk_end(uu_avl_walk_t *);
312312

313-
void *uu_avl_find(uu_avl_t *, void *, void *, uu_avl_index_t *);
314-
void uu_avl_insert(uu_avl_t *, void *, uu_avl_index_t);
313+
_LIBUUTIL_H void *uu_avl_find(uu_avl_t *, void *, void *, uu_avl_index_t *);
314+
_LIBUUTIL_H void uu_avl_insert(uu_avl_t *, void *, uu_avl_index_t);
315315

316-
void *uu_avl_nearest_next(uu_avl_t *, uu_avl_index_t);
317-
void *uu_avl_nearest_prev(uu_avl_t *, uu_avl_index_t);
316+
_LIBUUTIL_H void *uu_avl_nearest_next(uu_avl_t *, uu_avl_index_t);
317+
_LIBUUTIL_H void *uu_avl_nearest_prev(uu_avl_t *, uu_avl_index_t);
318318

319-
void *uu_avl_teardown(uu_avl_t *, void **);
319+
_LIBUUTIL_H void *uu_avl_teardown(uu_avl_t *, void **);
320320

321-
void uu_avl_remove(uu_avl_t *, void *);
321+
_LIBUUTIL_H void uu_avl_remove(uu_avl_t *, void *);
322322

323323
#ifdef __cplusplus
324324
}

‎lib/libnvpair/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ nodist_libnvpair_la_SOURCES = \
2020
module/nvpair/fnvpair.c
2121

2222
libnvpair_la_LIBADD = \
23-
libspl_assert.la
23+
libspl.la
2424

2525
libnvpair_la_LIBADD += $(LIBTIRPC_LIBS) $(LTLIBINTL)
2626

‎lib/libspl/Makefile.am‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
include $(srcdir)/%D%/include/Makefile.am
22

3-
libspl_assert_la_CFLAGS = $(AM_CFLAGS) $(LIBRARY_CFLAGS) $(LIBUNWIND_CFLAGS)
4-
libspl_la_CFLAGS = $(libspl_assert_la_CFLAGS)
3+
libspl_CFLAGS = $(AM_CFLAGS) $(LIBRARY_CFLAGS) $(LIBUNWIND_CFLAGS)
54
if TARGET_CPU_I386
6-
libspl_la_CFLAGS += $(NO_ATOMIC_ALIGNMENT)
5+
libspl_CFLAGS += $(NO_ATOMIC_ALIGNMENT)
76
endif
87

9-
noinst_LTLIBRARIES += libspl_assert.la libspl.la
10-
CPPCHECKTARGETS += libspl_assert.la libspl.la
8+
libspl_la_CFLAGS = $(libspl_CFLAGS) -fvisibility=hidden
9+
libspl_visible_la_CFLAGS = $(libspl_CFLAGS)
1110

12-
libspl_assert_la_SOURCES = \
13-
%D%/assert.c \
14-
%D%/backtrace.c
11+
noinst_LTLIBRARIES += libspl.la libspl_visible.la
12+
CPPCHECKTARGETS += libspl.la
1513

1614
libspl_la_SOURCES = \
1715
%D%/libspl_impl.h \
16+
%D%/assert.c \
1817
%D%/atomic.c \
18+
%D%/backtrace.c \
1919
%D%/condvar.c \
2020
%D%/cred.c \
2121
%D%/getexecname.c \
@@ -56,13 +56,11 @@ libspl_la_SOURCES += \
5656
%D%/os/freebsd/zone.c
5757
endif
5858

59-
libspl_la_LIBADD = \
60-
libspl_assert.la
61-
62-
libspl_la_LIBADD += $(LIBATOMIC_LIBS) $(LIBCLOCK_GETTIME)
59+
libspl_la_LDFLAGS = -pthread
6360

64-
libspl_assert_la_LIBADD = $(BACKTRACE_LIBS) $(LIBUNWIND_LIBS)
61+
libspl_la_LIBADD = $(LIBATOMIC_LIBS) $(LIBCLOCK_GETTIME)
62+
libspl_la_LIBADD += $(BACKTRACE_LIBS) $(LIBUNWIND_LIBS)
6563

66-
if BUILD_FREEBSD
67-
libspl_assert_la_LIBADD += -lpthread
68-
endif
64+
libspl_visible_la_SOURCES = $(libspl_la_SOURCES)
65+
libspl_visible_la_LDFLAGS = $(libspl_la_LDFLAGS)
66+
libspl_visible_la_LIBADD = $(libspl_la_LIBADD)

‎lib/libspl/include/libspl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
*/
2525

2626
#ifndef _LIBSPL_H
27-
#define _LIBSPL_H extern __attribute__((visibility("default")))
27+
#define _LIBSPL_H
2828

2929
#ifdef __cplusplus
3030
extern "C" {
3131
#endif
3232

33-
_LIBSPL_H void libspl_init(void);
34-
_LIBSPL_H void libspl_fini(void);
33+
extern void libspl_init(void);
34+
extern void libspl_fini(void);
3535

3636
#ifdef __cplusplus
3737
};

‎lib/libuutil/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
libuutil_la_CFLAGS = $(AM_CFLAGS) $(LIBRARY_CFLAGS) $(LIBRARY_CFLAGS)
2+
libuutil_la_CFLAGS += -fvisibility=hidden
23

34
lib_LTLIBRARIES += libuutil.la
45
CPPCHECKTARGETS += libuutil.la

0 commit comments

Comments
 (0)