Skip to content

Commit 79b7b8d

Browse files
choppsv1choppsv1
authored
Merge pull request #14815 from idryzhov/lib-mgmt-deps
Remove lib dependency on mgmtd
2 parents b84476e + 057f442 commit 79b7b8d

14 files changed

+15
-48
lines changed

‎lib/event.c

-6
Original file line numberDiff line numberDiff line change
@@ -1848,12 +1848,6 @@ struct event *event_fetch(struct event_loop *m, struct event *fetch)
18481848
return fetch;
18491849
}
18501850

1851-
static unsigned long timeval_elapsed(struct timeval a, struct timeval b)
1852-
{
1853-
return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO)
1854-
+ (a.tv_usec - b.tv_usec));
1855-
}
1856-
18571851
unsigned long event_consumed_time(RUSAGE_T *now, RUSAGE_T *start,
18581852
unsigned long *cputime)
18591853
{

‎lib/frrevent.h

+6
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,12 @@ struct cpu_event_history {
155155
/* Struct timeval's tv_usec one second value. */
156156
#define TIMER_SECOND_MICRO 1000000L
157157

158+
static inline unsigned long timeval_elapsed(struct timeval a, struct timeval b)
159+
{
160+
return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO)
161+
+ (a.tv_usec - b.tv_usec));
162+
}
163+
158164
/* Event yield time. */
159165
#define EVENT_YIELD_TIME_SLOT 10 * 1000L /* 10ms */
160166

‎lib/mgmt_be_client.c

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "debug.h"
1010
#include "compiler.h"
1111
#include "libfrr.h"
12-
#include "mgmtd/mgmt.h"
1312
#include "mgmt_be_client.h"
1413
#include "mgmt_msg.h"
1514
#include "mgmt_pb.h"

‎lib/mgmt_be_client.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extern "C" {
1414

1515
#include "northbound.h"
1616
#include "mgmt_pb.h"
17-
#include "mgmtd/mgmt_defines.h"
17+
#include "mgmt_defines.h"
1818

1919
/***************************************************************
2020
* Constants

‎mgmtd/mgmt_defines.h renamed to ‎lib/mgmt_defines.h

-23
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,4 @@ enum mgmt_result {
3232
MGMTD_UNKNOWN_FAILURE
3333
};
3434

35-
enum mgmt_fe_event {
36-
MGMTD_FE_SERVER = 1,
37-
MGMTD_FE_CONN_READ,
38-
MGMTD_FE_CONN_WRITE,
39-
MGMTD_FE_PROC_MSG
40-
};
41-
42-
enum mgmt_be_event {
43-
MGMTD_BE_SERVER = 1,
44-
MGMTD_BE_CONN_INIT,
45-
MGMTD_BE_CONN_READ,
46-
MGMTD_BE_CONN_WRITE,
47-
MGMTD_BE_PROC_MSG,
48-
MGMTD_BE_SCHED_CFG_PREPARE,
49-
MGMTD_BE_RESCHED_CFG_PREPARE,
50-
MGMTD_BE_SCHED_CFG_APPLY,
51-
MGMTD_BE_RESCHED_CFG_APPLY,
52-
};
53-
54-
#define MGMTD_TXN_ID_NONE 0
55-
56-
#define MGMTD_TXN_BATCH_ID_NONE 0
57-
5835
#endif /* _FRR_MGMTD_DEFINES_H */

‎lib/mgmt_fe_client.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extern "C" {
1414

1515
#include "mgmt_pb.h"
1616
#include "frrevent.h"
17-
#include "mgmtd/mgmt_defines.h"
17+
#include "mgmt_defines.h"
1818

1919
/***************************************************************
2020
* Macros

‎lib/subdir.am

+1
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ pkginclude_HEADERS += \
253253
lib/memory.h \
254254
lib/mgmt.pb-c.h \
255255
lib/mgmt_be_client.h \
256+
lib/mgmt_defines.h \
256257
lib/mgmt_fe_client.h \
257258
lib/mgmt_msg.h \
258259
lib/mgmt_pb.h \

‎mgmtd/mgmt.h

+1-6
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "vrf.h"
1414
#include "defaults.h"
1515
#include "stream.h"
16+
#include "mgmt_defines.h"
1617

1718
#include "mgmtd/mgmt_memory.h"
18-
#include "mgmtd/mgmt_defines.h"
1919
#include "mgmtd/mgmt_history.h"
2020
#include "mgmtd/mgmt_txn.h"
2121
#include "mgmtd/mgmt_ds.h"
@@ -70,11 +70,6 @@ struct mgmt_master {
7070
extern struct mgmt_master *mm;
7171

7272
/* Inline functions */
73-
static inline unsigned long timeval_elapsed(struct timeval a, struct timeval b)
74-
{
75-
return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO)
76-
+ (a.tv_usec - b.tv_usec));
77-
}
7873

7974
/*
8075
* Remove trailing separator from a string.

‎mgmtd/mgmt_be_adapter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "mgmt_be_client.h"
1414
#include "mgmt_msg.h"
15-
#include "mgmtd/mgmt_defines.h"
15+
#include "mgmt_defines.h"
1616
#include "mgmtd/mgmt_ds.h"
1717

1818
#define MGMTD_BE_CONN_INIT_DELAY_MSEC 50

‎mgmtd/mgmt_ds.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#include "mgmt_fe_client.h"
1313
#include "northbound.h"
14+
#include "mgmt_defines.h"
1415

15-
#include "mgmtd/mgmt_defines.h"
1616
#include "mgmtd/mgmt_be_adapter.h"
1717
#include "mgmtd/mgmt_fe_adapter.h"
1818

‎mgmtd/mgmt_fe_adapter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "mgmt_fe_client.h"
1414
#include "mgmt_msg.h"
15-
#include "mgmtd/mgmt_defines.h"
15+
#include "mgmt_defines.h"
1616

1717
struct mgmt_fe_client_adapter;
1818
struct mgmt_master;

‎mgmtd/mgmt_txn.h

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#define MGMTD_TXN_CLEANUP_DELAY_MSEC 100
2727
#define MGMTD_TXN_CLEANUP_DELAY_USEC 10
2828

29+
#define MGMTD_TXN_ID_NONE 0
30+
2931
/*
3032
* The following definition enables local validation of config
3133
* on the MGMTD process by loading client-defined NB callbacks

‎mgmtd/subdir.am

-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ mgmtd_libmgmtd_a_SOURCES = \
3333
mgmtd/mgmt_vty.c \
3434
# end
3535

36-
mgmtdheaderdir = $(pkgincludedir)/mgmtd
37-
mgmtdheader_HEADERS = \
38-
mgmtd/mgmt_defines.h \
39-
# end
40-
4136
noinst_HEADERS += \
4237
mgmtd/mgmt.h \
4338
mgmtd/mgmt_be_adapter.h \

‎redhat/frr.spec.in

-2
Original file line numberDiff line numberDiff line change
@@ -779,8 +779,6 @@ sed -i 's/ -M rpki//' %{_sysconfdir}/frr/daemons
779779
%{_libdir}/lib*.so
780780
%dir %{_includedir}/%{name}
781781
%{_includedir}/%{name}/*.h
782-
%dir %{_includedir}/%{name}/mgmtd
783-
%{_includedir}/%{name}/mgmtd/*.h
784782
%dir %{_includedir}/%{name}/ospfd
785783
%{_includedir}/%{name}/ospfd/*.h
786784
%if %{with_bfdd}

0 commit comments

Comments
 (0)