RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-11 03:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG: include: move lb_fas.h to haproxy/lb_fas{,-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:37:38 +02:00
parent fbe8da3320
commit b5fc3bf6dc
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_fas.h → include/haproxy/lb_fas-t.h
View File

@ -1,5 +1,5 @@
/* /*
* include/types/lb_fash * include/types/lb_fas-t.h
* Types for First Available Server load balancing algorithm. * Types for First Available Server load balancing algorithm.
* *
* Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu * Copyright (C) 2000-2012 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_FAS_H #ifndef _HAPROXY_LB_FAS_T_H
#define _TYPES_LB_FAS_H #define _HAPROXY_LB_FAS_T_H
#include <haproxy/api-t.h>
#include <import/ebtree.h> #include <import/ebtree.h>
struct lb_fas { struct lb_fas {
@ -30,7 +29,7 @@ struct lb_fas {
struct eb_root bck; /* weighted least conns on the backup servers */ struct eb_root bck; /* weighted least conns on the backup servers */
}; };
#endif /* _TYPES_LB_FAS_H */ #endif /* _HAPROXY_LB_FAS_T_H */
/* /*
* Local variables: * Local variables:

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

@ -1,5 +1,5 @@
/* /*
* include/proto/lb_fas.h * include/haproxy/lb_fas.h
* First Available Server load balancing algorithm. * First Available Server 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_FAS_H #ifndef _HAPROXY_LB_FAS_H
#define _PROTO_LB_FAS_H #define _HAPROXY_LB_FAS_H
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/lb_fas-t.h>
#include <types/proxy.h> #include <types/proxy.h>
#include <types/server.h> #include <types/server.h>
struct server *fas_get_next_server(struct proxy *p, struct server *srvtoavoid); struct server *fas_get_next_server(struct proxy *p, struct server *srvtoavoid);
void fas_init_server_tree(struct proxy *p); void fas_init_server_tree(struct proxy *p);
#endif /* _PROTO_LB_FAS_H */ #endif /* _HAPROXY_LB_FAS_H */
/* /*
* Local variables: * Local variables:

2
include/types/backend.h
View File

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

2
src/backend.c
View File

@ -26,6 +26,7 @@
#include <haproxy/http_htx.h> #include <haproxy/http_htx.h>
#include <haproxy/htx.h> #include <haproxy/htx.h>
#include <haproxy/lb_chash.h> #include <haproxy/lb_chash.h>
#include <haproxy/lb_fas.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>
@ -38,7 +39,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_fas.h>
#include <proto/lb_fwlc.h> #include <proto/lb_fwlc.h>
#include <proto/lb_fwrr.h> #include <proto/lb_fwrr.h>
#include <proto/lb_map.h> #include <proto/lb_map.h>

2
src/cfgparse.c
View File

@ -44,6 +44,7 @@
#include <haproxy/frontend.h> #include <haproxy/frontend.h>
#include <haproxy/http_rules.h> #include <haproxy/http_rules.h>
#include <haproxy/lb_chash.h> #include <haproxy/lb_chash.h>
#include <haproxy/lb_fas.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>
@ -64,7 +65,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_fas.h>
#include <proto/lb_fwlc.h> #include <proto/lb_fwlc.h>
#include <proto/lb_fwrr.h> #include <proto/lb_fwrr.h>
#include <proto/lb_map.h> #include <proto/lb_map.h>