konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Nothing was changed.
This commit is contained in:
Willy Tarreau 2020-06-04 20:22:59 +02:00
parent 83487a833c
commit 2867159d63
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/types/lb_map.h → include/haproxy/lb_map-t.h
View File

@ -1,5 +1,5 @@
/*
* include/types/lb_map.h
* include/haproxy/lb_map-t.h
* Types for map-based load-balancing (RR and HASH)
*
* Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _TYPES_LB_MAP_H
#define _TYPES_LB_MAP_H
#ifndef _HAPROXY_LB_MAP_T_H
#define _HAPROXY_LB_MAP_T_H
#include <haproxy/api-t.h>
#include <types/server.h>
@ -30,7 +30,7 @@ struct lb_map {
int rr_idx; /* next server to be elected in round robin mode */
};
#endif /* _TYPES_LB_MAP_H */
#endif /* _HAPROXY_LB_MAP_T_H */
/*
* Local variables:

8
include/proto/lb_map.h → include/haproxy/lb_map.h
View File

@ -1,5 +1,5 @@
/*
* include/proto/lb_map.h
* include/haproxy/lb_map.h
* Map-based load-balancing (RR and HASH)
*
* Copyright (C) 2000-2009 Willy Tarreau - w@1wt.eu
@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_LB_MAP_H
#define _PROTO_LB_MAP_H
#ifndef _HAPROXY_LB_MAP_H
#define _HAPROXY_LB_MAP_H
#include <haproxy/api.h>
#include <types/proxy.h>
@ -31,7 +31,7 @@ void init_server_map(struct proxy *p);
struct server *map_get_server_rr(struct proxy *px, struct server *srvtoavoid);
struct server *map_get_server_hash(struct proxy *px, unsigned int hash);
#endif /* _PROTO_LB_MAP_H */
#endif /* _HAPROXY_LB_MAP_H */
/*
* Local variables:

2
include/types/backend.h
View File

@ -26,10 +26,10 @@
#include <haproxy/lb_fas-t.h>
#include <haproxy/lb_fwlc-t.h>
#include <haproxy/lb_fwrr-t.h>
#include <haproxy/lb_map-t.h>
#include <haproxy/api-t.h>
#include <haproxy/thread.h>
#include <types/lb_map.h>
#include <types/server.h>
/* Parameters for lbprm.algo */

2
src/backend.c
View File

@ -31,6 +31,7 @@
#include <haproxy/lb_fas.h>
#include <haproxy/lb_fwlc.h>
#include <haproxy/lb_fwrr.h>
#include <haproxy/lb_map.h>
#include <haproxy/obj_type.h>
#include <haproxy/payload.h>
#include <haproxy/session.h>
@ -44,7 +45,6 @@
#include <haproxy/arg.h>
#include <proto/backend.h>
#include <proto/channel.h>
#include <proto/lb_map.h>
#include <proto/log.h>
#include <haproxy/protocol.h>
#include <proto/http_ana.h>

2
src/cfgparse.c
View File

@ -50,6 +50,7 @@
#include <haproxy/lb_fas.h>
#include <haproxy/lb_fwlc.h>
#include <haproxy/lb_fwrr.h>
#include <haproxy/lb_map.h>
#include <haproxy/listener.h>
#include <haproxy/mailers-t.h>
#include <haproxy/obj_type-t.h>
@ -70,7 +71,6 @@
#include <proto/backend.h>
#include <proto/channel.h>
#include <proto/filters.h>
#include <proto/lb_map.h>
#include <proto/log.h>
#include <haproxy/protocol.h>
#include <proto/http_ana.h>

2
src/lb_map.c
View File

@ -11,12 +11,12 @@
*/
#include <haproxy/api.h>
#include <haproxy/lb_map.h>
#include <import/eb32tree.h>
#include <types/server.h>
#include <proto/backend.h>
#include <proto/lb_map.h>
#include <proto/queue.h>
/* this function updates the map according to server <srv>'s new state.