mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

REORG: include: move lb_fwrr.h to haproxy/lb_fwrr{,-t}.h

Browse Source 
Nothing fancy, includes were already OK. The proto didn't reference the
type, this was fixed. Still references proxy.h and server.h from types/.
This commit is contained in:
Willy Tarreau 2020-06-04 14:45:03 +02:00
parent 0254941666
commit 546ba42c73
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/types/lb_fwrr.h → include/haproxy/lb_fwrr-t.h
View File

@ -1,5 +1,5 @@
/* /*
* include/types/lb_fwrr.h * include/haproxy/lb_fwrr-t.h
* Types for Fast Weighted Round Robin load balancing algorithm. * Types for Fast Weighted Round Robin load balancing algorithm.
* *
* Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu * Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _TYPES_LB_FWRR_H #ifndef _HAPROXY_LB_FWRR_T_H
#define _TYPES_LB_FWRR_H #define _HAPROXY_LB_FWRR_T_H
#include <haproxy/api-t.h>
#include <import/ebtree.h> #include <import/ebtree.h>
/* This structure is used to apply fast weighted round robin on a server group */ /* This structure is used to apply fast weighted round robin on a server group */
@ -41,7 +40,7 @@ struct lb_fwrr {
struct fwrr_group bck; /* weighted round robin on the backup servers */ struct fwrr_group bck; /* weighted round robin on the backup servers */
}; };
#endif /* _TYPES_LB_FWRR_H */ #endif /* _HAPROXY_LB_FWRR_T_H */
/* /*
* Local variables: * Local variables:

9
include/proto/lb_fwrr.h → include/haproxy/lb_fwrr.h
View File

@ -1,5 +1,5 @@
/* /*
* include/proto/lb_fwrr.h * include/haproxy/lb_fwrr.h
* Fast Weighted Round Robin load balancing algorithm. * Fast Weighted Round Robin load balancing algorithm.
* *
* Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu * Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
@ -19,17 +19,18 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _PROTO_LB_FWRR_H #ifndef _HAPROXY_LB_FWRR_H
#define _PROTO_LB_FWRR_H #define _HAPROXY_LB_FWRR_H
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/lb_fwrr-t.h>
#include <types/proxy.h> #include <types/proxy.h>
#include <types/server.h> #include <types/server.h>
void fwrr_init_server_groups(struct proxy *p); void fwrr_init_server_groups(struct proxy *p);
struct server *fwrr_get_next_server(struct proxy *p, struct server *srvtoavoid); struct server *fwrr_get_next_server(struct proxy *p, struct server *srvtoavoid);
#endif /* _PROTO_LB_FWRR_H */ #endif /* _HAPROXY_LB_FWRR_H */
/* /*
* Local variables: * Local variables:

2
include/types/backend.h
View File

@ -25,10 +25,10 @@
#include <haproxy/lb_chash-t.h> #include <haproxy/lb_chash-t.h>
#include <haproxy/lb_fas-t.h> #include <haproxy/lb_fas-t.h>
#include <haproxy/lb_fwlc-t.h> #include <haproxy/lb_fwlc-t.h>
#include <haproxy/lb_fwrr-t.h>
#include <haproxy/api-t.h> #include <haproxy/api-t.h>
#include <haproxy/thread.h> #include <haproxy/thread.h>
#include <types/lb_fwrr.h>
#include <types/lb_map.h> #include <types/lb_map.h>
#include <types/server.h> #include <types/server.h>

2
src/backend.c
View File

@ -28,6 +28,7 @@
#include <haproxy/lb_chash.h> #include <haproxy/lb_chash.h>
#include <haproxy/lb_fas.h> #include <haproxy/lb_fas.h>
#include <haproxy/lb_fwlc.h> #include <haproxy/lb_fwlc.h>
#include <haproxy/lb_fwrr.h>
#include <haproxy/obj_type.h> #include <haproxy/obj_type.h>
#include <haproxy/ticks.h> #include <haproxy/ticks.h>
#include <haproxy/time.h> #include <haproxy/time.h>
@ -40,7 +41,6 @@
#include <proto/backend.h> #include <proto/backend.h>
#include <proto/channel.h> #include <proto/channel.h>
#include <proto/checks.h> #include <proto/checks.h>
#include <proto/lb_fwrr.h>
#include <proto/lb_map.h> #include <proto/lb_map.h>
#include <proto/log.h> #include <proto/log.h>
#include <proto/payload.h> #include <proto/payload.h>

2
src/cfgparse.c
View File

@ -46,6 +46,7 @@
#include <haproxy/lb_chash.h> #include <haproxy/lb_chash.h>
#include <haproxy/lb_fas.h> #include <haproxy/lb_fas.h>
#include <haproxy/lb_fwlc.h> #include <haproxy/lb_fwlc.h>
#include <haproxy/lb_fwrr.h>
#include <haproxy/mailers-t.h> #include <haproxy/mailers-t.h>
#include <haproxy/obj_type-t.h> #include <haproxy/obj_type-t.h>
#include <haproxy/pool.h> #include <haproxy/pool.h>
@ -66,7 +67,6 @@
#include <proto/checks.h> #include <proto/checks.h>
#include <proto/stats.h> #include <proto/stats.h>
#include <proto/filters.h> #include <proto/filters.h>
#include <proto/lb_fwrr.h>
#include <proto/lb_map.h> #include <proto/lb_map.h>
#include <proto/listener.h> #include <proto/listener.h>
#include <proto/log.h> #include <proto/log.h>