Skip to content

Commit dc0e373

Browse files
author
Ken Gaillot
authored
Merge pull request #2013 from clumens/deprecated
Stop using deprecated type aliases
2 parents 49b5dde + fefce03 commit dc0e373

47 files changed

Lines changed: 1205 additions & 1191 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎daemons/execd/cts-exec-helper.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ generate_params(void)
425425
int rc = 0;
426426
pe_working_set_t *data_set = NULL;
427427
xmlNode *cib_xml_copy = NULL;
428-
resource_t *rsc = NULL;
428+
pe_resource_t *rsc = NULL;
429429
GHashTable *params = NULL;
430430
GHashTable *meta = NULL;
431431
GHashTableIter iter;

‎daemons/fenced/pacemaker-fenced.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -550,11 +550,11 @@ fencing_topology_init()
550550
*
551551
* \return Pointer to node object if found, NULL otherwise
552552
*/
553-
static node_t *
554-
our_node_allowed_for(resource_t *rsc)
553+
static pe_node_t *
554+
our_node_allowed_for(pe_resource_t *rsc)
555555
{
556556
GHashTableIter iter;
557-
node_t *node = NULL;
557+
pe_node_t *node = NULL;
558558

559559
if (rsc && stonith_our_uname) {
560560
g_hash_table_iter_init(&iter, rsc->allowed_nodes);
@@ -576,12 +576,12 @@ our_node_allowed_for(resource_t *rsc)
576576
* \param[in] rsc Resource to check
577577
* \param[in] data_set Cluster working set with device information
578578
*/
579-
static void cib_device_update(resource_t *rsc, pe_working_set_t *data_set)
579+
static void cib_device_update(pe_resource_t *rsc, pe_working_set_t *data_set)
580580
{
581-
node_t *node = NULL;
581+
pe_node_t *node = NULL;
582582
const char *value = NULL;
583583
const char *rclass = NULL;
584-
node_t *parent = NULL;
584+
pe_node_t *parent = NULL;
585585
gboolean remove = TRUE;
586586

587587
/* If this is a complex resource, check children rather than this resource itself.

‎include/crm/pengine/internal.h‎

Lines changed: 69 additions & 69 deletions
Large diffs are not rendered by default.

‎include/crm/pengine/pe_types.h‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -505,14 +505,27 @@ typedef struct pe_action_wrapper_s {
505505
pe_action_t *action;
506506
} pe_action_wrapper_t;
507507

508-
// Deprecated type aliases
509-
typedef struct pe_action_s action_t; //!< \deprecated Use pe_action_t instead
510-
typedef struct pe_action_wrapper_s action_wrapper_t; //!< \deprecated Use pe_action_wrapper_t instead
511-
typedef struct pe_node_s node_t; //!< \deprecated Use pe_node_t instead
512-
typedef struct pe_resource_s resource_t; //!< \deprecated Use pe_resource_t instead
513-
typedef struct pe_tag_s tag_t; //!< \deprecated Use pe_tag_t instead
514-
typedef struct pe_ticket_s ticket_t; //!< \deprecated Use pe_ticket_t instead
515-
typedef enum pe_quorum_policy no_quorum_policy_t; //!< \deprecated Use enum pe_quorum_policy instead
508+
#ifndef PCMK__NO_COMPAT
509+
/* Everything here is deprecated and kept only for public API backward
510+
* compatibility. It will be moved to compatibility.h when 2.1.0 is released.
511+
*/
512+
513+
//!< \deprecated Use pe_action_t instead
514+
typedef struct pe_action_s action_t;
515+
//!< \deprecated Use pe_action_wrapper_t instead
516+
typedef struct pe_action_wrapper_s action_wrapper_t;
517+
//!< \deprecated Use pe_node_t instead
518+
typedef struct pe_node_s node_t;
519+
//!< \deprecated Use enum pe_quorum_policy instead
520+
typedef enum pe_quorum_policy no_quorum_policy_t;
521+
//!< \deprecated use pe_resource_t instead
522+
typedef struct pe_resource_s resource_t;
523+
//!< \deprecated Use pe_tag_t instead
524+
typedef struct pe_tag_s tag_t;
525+
//!< \deprecated Use pe_ticket_t instead
526+
typedef struct pe_ticket_s ticket_t;
527+
528+
#endif
516529

517530
#ifdef __cplusplus
518531
}

‎include/crm/pengine/remote_internal.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ gboolean pe__is_guest_or_remote_node(pe_node_t *node);
2525
gboolean pe__resource_is_remote_conn(pe_resource_t *rsc, pe_working_set_t *data_set);
2626
pe_resource_t *pe__resource_contains_guest_node(const pe_working_set_t *data_set,
2727
const pe_resource_t *rsc);
28-
void pe_foreach_guest_node(const pe_working_set_t *data_set, const node_t *host,
29-
void (*helper)(const node_t*, void*), void *user_data);
28+
void pe_foreach_guest_node(const pe_working_set_t *data_set, const pe_node_t *host,
29+
void (*helper)(const pe_node_t*, void*), void *user_data);
3030
xmlNode *pe_create_remote_xml(xmlNode *parent, const char *uname,
3131
const char *container_id, const char *migrateable,
3232
const char *is_managed, const char *start_timeout,

‎include/pcmki/pcmki_sched_allocate.h‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
# include <pcmki/pcmki_scheduler.h>
1919

2020
struct resource_alloc_functions_s {
21-
GHashTable *(*merge_weights) (resource_t *, const char *, GHashTable *, const char *, float,
21+
GHashTable *(*merge_weights) (pe_resource_t *, const char *, GHashTable *, const char *, float,
2222
enum pe_weights);
23-
node_t *(*allocate) (resource_t *, node_t *, pe_working_set_t *);
24-
void (*create_actions) (resource_t *, pe_working_set_t *);
25-
gboolean(*create_probe) (resource_t *, node_t *, action_t *, gboolean, pe_working_set_t *);
26-
void (*internal_constraints) (resource_t *, pe_working_set_t *);
23+
pe_node_t *(*allocate) (pe_resource_t *, pe_node_t *, pe_working_set_t *);
24+
void (*create_actions) (pe_resource_t *, pe_working_set_t *);
25+
gboolean(*create_probe) (pe_resource_t *, pe_node_t *, pe_action_t *, gboolean, pe_working_set_t *);
26+
void (*internal_constraints) (pe_resource_t *, pe_working_set_t *);
2727

2828
void (*rsc_colocation_lh) (pe_resource_t *, pe_resource_t *,
2929
rsc_colocation_t *, pe_working_set_t *);
@@ -32,15 +32,15 @@ struct resource_alloc_functions_s {
3232

3333
void (*rsc_location) (pe_resource_t *, pe__location_t *);
3434

35-
enum pe_action_flags (*action_flags) (action_t *, node_t *);
35+
enum pe_action_flags (*action_flags) (pe_action_t *, pe_node_t *);
3636
enum pe_graph_flags (*update_actions) (pe_action_t *, pe_action_t *,
3737
pe_node_t *, enum pe_action_flags,
3838
enum pe_action_flags,
3939
enum pe_ordering,
4040
pe_working_set_t *data_set);
4141

42-
void (*expand) (resource_t *, pe_working_set_t *);
43-
void (*append_meta) (resource_t * rsc, xmlNode * xml);
42+
void (*expand) (pe_resource_t *, pe_working_set_t *);
43+
void (*append_meta) (pe_resource_t * rsc, xmlNode * xml);
4444
};
4545

4646
GHashTable *pcmk__native_merge_weights(pe_resource_t *rsc, const char *rhs,
@@ -53,38 +53,38 @@ GHashTable *pcmk__group_merge_weights(pe_resource_t *rsc, const char *rhs,
5353

5454
pe_node_t *pcmk__native_allocate(pe_resource_t *rsc, pe_node_t *preferred,
5555
pe_working_set_t *data_set);
56-
extern void native_create_actions(resource_t * rsc, pe_working_set_t * data_set);
57-
extern void native_internal_constraints(resource_t * rsc, pe_working_set_t * data_set);
56+
extern void native_create_actions(pe_resource_t * rsc, pe_working_set_t * data_set);
57+
extern void native_internal_constraints(pe_resource_t * rsc, pe_working_set_t * data_set);
5858
void native_rsc_colocation_lh(pe_resource_t *lh_rsc, pe_resource_t *rh_rsc,
5959
rsc_colocation_t *constraint,
6060
pe_working_set_t *data_set);
6161
void native_rsc_colocation_rh(pe_resource_t *lh_rsc, pe_resource_t *rh_rsc,
6262
rsc_colocation_t *constraint,
6363
pe_working_set_t *data_set);
64-
extern void rsc_ticket_constraint(resource_t * lh_rsc, rsc_ticket_t * rsc_ticket,
64+
extern void rsc_ticket_constraint(pe_resource_t * lh_rsc, rsc_ticket_t * rsc_ticket,
6565
pe_working_set_t * data_set);
66-
extern enum pe_action_flags native_action_flags(action_t * action, node_t * node);
66+
extern enum pe_action_flags native_action_flags(pe_action_t * action, pe_node_t * node);
6767

6868
void native_rsc_location(pe_resource_t *rsc, pe__location_t *constraint);
69-
extern void native_expand(resource_t * rsc, pe_working_set_t * data_set);
70-
extern gboolean native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
69+
extern void native_expand(pe_resource_t * rsc, pe_working_set_t * data_set);
70+
extern gboolean native_create_probe(pe_resource_t * rsc, pe_node_t * node, pe_action_t * complete,
7171
gboolean force, pe_working_set_t * data_set);
72-
extern void native_append_meta(resource_t * rsc, xmlNode * xml);
72+
extern void native_append_meta(pe_resource_t * rsc, xmlNode * xml);
7373

7474
pe_node_t *pcmk__group_allocate(pe_resource_t *rsc, pe_node_t *preferred,
7575
pe_working_set_t *data_set);
76-
extern void group_create_actions(resource_t * rsc, pe_working_set_t * data_set);
77-
extern void group_internal_constraints(resource_t * rsc, pe_working_set_t * data_set);
76+
extern void group_create_actions(pe_resource_t * rsc, pe_working_set_t * data_set);
77+
extern void group_internal_constraints(pe_resource_t * rsc, pe_working_set_t * data_set);
7878
void group_rsc_colocation_lh(pe_resource_t *lh_rsc, pe_resource_t *rh_rsc,
7979
rsc_colocation_t *constraint,
8080
pe_working_set_t *data_set);
8181
void group_rsc_colocation_rh(pe_resource_t *lh_rsc, pe_resource_t *rh_rsc,
8282
rsc_colocation_t *constraint,
8383
pe_working_set_t *data_set);
84-
extern enum pe_action_flags group_action_flags(action_t * action, node_t * node);
84+
extern enum pe_action_flags group_action_flags(pe_action_t * action, pe_node_t * node);
8585
void group_rsc_location(pe_resource_t *rsc, pe__location_t *constraint);
86-
extern void group_expand(resource_t * rsc, pe_working_set_t * data_set);
87-
extern void group_append_meta(resource_t * rsc, xmlNode * xml);
86+
extern void group_expand(pe_resource_t * rsc, pe_working_set_t * data_set);
87+
extern void group_append_meta(pe_resource_t * rsc, xmlNode * xml);
8888

8989
pe_node_t *pcmk__bundle_allocate(pe_resource_t *rsc, pe_node_t *preferred,
9090
pe_working_set_t *data_set);
@@ -111,28 +111,28 @@ void pcmk__bundle_append_meta(pe_resource_t *rsc, xmlNode *xml);
111111

112112
pe_node_t *pcmk__clone_allocate(pe_resource_t *rsc, pe_node_t *preferred,
113113
pe_working_set_t *data_set);
114-
extern void clone_create_actions(resource_t * rsc, pe_working_set_t * data_set);
115-
extern void clone_internal_constraints(resource_t * rsc, pe_working_set_t * data_set);
114+
extern void clone_create_actions(pe_resource_t * rsc, pe_working_set_t * data_set);
115+
extern void clone_internal_constraints(pe_resource_t * rsc, pe_working_set_t * data_set);
116116
void clone_rsc_colocation_lh(pe_resource_t *lh_rsc, pe_resource_t *rh_rsc,
117117
rsc_colocation_t *constraint,
118118
pe_working_set_t *data_set);
119119
void clone_rsc_colocation_rh(pe_resource_t *lh_rsc, pe_resource_t *rh_rsc,
120120
rsc_colocation_t *constraint,
121121
pe_working_set_t *data_set);
122122
void clone_rsc_location(pe_resource_t *rsc, pe__location_t *constraint);
123-
extern enum pe_action_flags clone_action_flags(action_t * action, node_t * node);
124-
extern void clone_expand(resource_t * rsc, pe_working_set_t * data_set);
125-
extern gboolean clone_create_probe(resource_t * rsc, node_t * node, action_t * complete,
123+
extern enum pe_action_flags clone_action_flags(pe_action_t * action, pe_node_t * node);
124+
extern void clone_expand(pe_resource_t * rsc, pe_working_set_t * data_set);
125+
extern gboolean clone_create_probe(pe_resource_t * rsc, pe_node_t * node, pe_action_t * complete,
126126
gboolean force, pe_working_set_t * data_set);
127-
extern void clone_append_meta(resource_t * rsc, xmlNode * xml);
127+
extern void clone_append_meta(pe_resource_t * rsc, xmlNode * xml);
128128

129-
void apply_master_prefs(resource_t *rsc);
129+
void apply_master_prefs(pe_resource_t *rsc);
130130
pe_node_t *pcmk__set_instance_roles(pe_resource_t *rsc,
131131
pe_working_set_t *data_set);
132-
void create_promotable_actions(resource_t *rsc, pe_working_set_t *data_set);
133-
void promote_demote_constraints(resource_t *rsc, pe_working_set_t *data_set);
134-
void promotable_constraints(resource_t *rsc, pe_working_set_t *data_set);
135-
void promotable_colocation_rh(resource_t *lh_rsc, resource_t *rh_rsc,
132+
void create_promotable_actions(pe_resource_t *rsc, pe_working_set_t *data_set);
133+
void promote_demote_constraints(pe_resource_t *rsc, pe_working_set_t *data_set);
134+
void promotable_constraints(pe_resource_t *rsc, pe_working_set_t *data_set);
135+
void promotable_colocation_rh(pe_resource_t *lh_rsc, pe_resource_t *rh_rsc,
136136
rsc_colocation_t *constraint,
137137
pe_working_set_t *data_set);
138138

@@ -148,11 +148,11 @@ extern gboolean unpack_location(xmlNode * xml_obj, pe_working_set_t * data_set);
148148
extern gboolean unpack_rsc_ticket(xmlNode * xml_obj, pe_working_set_t * data_set);
149149

150150
void LogNodeActions(pe_working_set_t * data_set, gboolean terminal);
151-
void LogActions(resource_t * rsc, pe_working_set_t * data_set, gboolean terminal);
151+
void LogActions(pe_resource_t * rsc, pe_working_set_t * data_set, gboolean terminal);
152152
void pcmk__bundle_log_actions(pe_resource_t *rsc, pe_working_set_t *data_set,
153153
gboolean terminal);
154154

155-
extern void rsc_stonith_ordering(resource_t * rsc, action_t * stonith_op,
155+
extern void rsc_stonith_ordering(pe_resource_t * rsc, pe_action_t * stonith_op,
156156
pe_working_set_t * data_set);
157157

158158
enum pe_graph_flags native_update_actions(pe_action_t *first, pe_action_t *then,
@@ -175,10 +175,10 @@ enum pe_graph_flags pcmk__multi_update_actions(pe_action_t *first,
175175
enum pe_ordering type,
176176
pe_working_set_t *data_set);
177177

178-
gboolean update_action_flags(action_t * action, enum pe_action_flags flags, const char *source, int line);
178+
gboolean update_action_flags(pe_action_t * action, enum pe_action_flags flags, const char *source, int line);
179179
gboolean update_action(pe_action_t *action, pe_working_set_t *data_set);
180-
void complex_set_cmds(resource_t * rsc);
180+
void complex_set_cmds(pe_resource_t * rsc);
181181
void pcmk__log_transition_summary(const char *filename);
182182
void clone_create_pseudo_actions(
183-
resource_t * rsc, GListPtr children, notify_data_t **start_notify, notify_data_t **stop_notify, pe_working_set_t * data_set);
183+
pe_resource_t * rsc, GListPtr children, notify_data_t **start_notify, notify_data_t **stop_notify, pe_working_set_t * data_set);
184184
#endif

‎include/pcmki/pcmki_sched_notif.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@
2222

2323
# include <crm/pengine/internal.h>
2424

25-
notify_data_t * create_notification_boundaries(resource_t *rsc,
25+
notify_data_t * create_notification_boundaries(pe_resource_t *rsc,
2626
const char *action,
27-
action_t *start, action_t *end,
27+
pe_action_t *start, pe_action_t *end,
2828
pe_working_set_t *data_set);
2929

30-
void collect_notification_data(resource_t *rsc, gboolean state,
30+
void collect_notification_data(pe_resource_t *rsc, gboolean state,
3131
gboolean activity, notify_data_t *n_data);
3232

33-
gboolean expand_notification_data(resource_t *rsc, notify_data_t *n_data,
33+
gboolean expand_notification_data(pe_resource_t *rsc, notify_data_t *n_data,
3434
pe_working_set_t *data_set);
3535

36-
void create_notifications(resource_t *rsc, notify_data_t *n_data,
36+
void create_notifications(pe_resource_t *rsc, notify_data_t *n_data,
3737
pe_working_set_t *data_set);
3838

3939
void free_notification_data(notify_data_t *n_data);
4040

41-
void create_secondary_notification(pe_action_t *action, resource_t *rsc,
41+
void create_secondary_notification(pe_action_t *action, pe_resource_t *rsc,
4242
pe_action_t *stonith_op,
4343
pe_working_set_t *data_set);
4444

‎include/pcmki/pcmki_sched_utils.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,37 +29,37 @@ pe__location_t *rsc2node_new(const char *id, pe_resource_t *rsc, int weight,
2929
pe_working_set_t *data_set);
3030

3131
extern gboolean rsc_colocation_new(const char *id, const char *node_attr, int score,
32-
resource_t * rsc_lh, resource_t * rsc_rh,
32+
pe_resource_t * rsc_lh, pe_resource_t * rsc_rh,
3333
const char *state_lh, const char *state_rh,
3434
pe_working_set_t * data_set);
3535

36-
extern gboolean rsc_ticket_new(const char *id, resource_t * rsc_lh, ticket_t * ticket,
36+
extern gboolean rsc_ticket_new(const char *id, pe_resource_t * rsc_lh, pe_ticket_t * ticket,
3737
const char *state_lh, const char *loss_policy,
3838
pe_working_set_t * data_set);
3939

4040
GList *sort_nodes_by_weight(GList *nodes, pe_node_t *active_node,
4141
pe_working_set_t *data_set);
4242

43-
extern gboolean can_run_resources(const node_t * node);
44-
extern gboolean native_assign_node(resource_t * rsc, GListPtr candidates, node_t * chosen,
43+
extern gboolean can_run_resources(const pe_node_t * node);
44+
extern gboolean native_assign_node(pe_resource_t * rsc, GListPtr candidates, pe_node_t * chosen,
4545
gboolean force);
46-
void native_deallocate(resource_t * rsc);
46+
void native_deallocate(pe_resource_t * rsc);
4747

4848
extern void log_action(unsigned int log_level, const char *pre_text,
49-
action_t * action, gboolean details);
49+
pe_action_t * action, gboolean details);
5050

5151
gboolean can_run_any(GHashTable * nodes);
5252
pe_resource_t *find_compatible_child(pe_resource_t *local_child,
5353
pe_resource_t *rsc, enum rsc_role_e filter,
5454
gboolean current,
5555
pe_working_set_t *data_set);
56-
resource_t *find_compatible_child_by_node(resource_t * local_child, node_t * local_node, resource_t * rsc,
57-
enum rsc_role_e filter, gboolean current);
58-
gboolean is_child_compatible(resource_t *child_rsc, node_t * local_node, enum rsc_role_e filter, gboolean current);
59-
bool assign_node(resource_t * rsc, node_t * node, gboolean force);
60-
enum pe_action_flags summary_action_flags(action_t * action, GListPtr children, node_t * node);
61-
enum action_tasks clone_child_action(action_t * action);
62-
int copies_per_node(resource_t * rsc);
56+
pe_resource_t *find_compatible_child_by_node(pe_resource_t * local_child, pe_node_t * local_node, pe_resource_t * rsc,
57+
enum rsc_role_e filter, gboolean current);
58+
gboolean is_child_compatible(pe_resource_t *child_rsc, pe_node_t * local_node, enum rsc_role_e filter, gboolean current);
59+
bool assign_node(pe_resource_t * rsc, pe_node_t * node, gboolean force);
60+
enum pe_action_flags summary_action_flags(pe_action_t * action, GListPtr children, pe_node_t * node);
61+
enum action_tasks clone_child_action(pe_action_t * action);
62+
int copies_per_node(pe_resource_t * rsc);
6363

6464
enum filter_colocation_res {
6565
influence_nothing = 0,
@@ -68,15 +68,15 @@ enum filter_colocation_res {
6868
};
6969

7070
extern enum filter_colocation_res
71-
filter_colocation_constraint(resource_t * rsc_lh, resource_t * rsc_rh,
71+
filter_colocation_constraint(pe_resource_t * rsc_lh, pe_resource_t * rsc_rh,
7272
rsc_colocation_t * constraint, gboolean preview);
7373

74-
extern int compare_capacity(const node_t * node1, const node_t * node2);
74+
extern int compare_capacity(const pe_node_t * node1, const pe_node_t * node2);
7575
extern void calculate_utilization(GHashTable * current_utilization,
7676
GHashTable * utilization, gboolean plus);
7777

78-
extern void process_utilization(resource_t * rsc, node_t ** prefer, pe_working_set_t * data_set);
79-
pe_action_t *create_pseudo_resource_op(resource_t * rsc, const char *task, bool optional, bool runnable, pe_working_set_t *data_set);
78+
extern void process_utilization(pe_resource_t * rsc, pe_node_t ** prefer, pe_working_set_t * data_set);
79+
pe_action_t *create_pseudo_resource_op(pe_resource_t * rsc, const char *task, bool optional, bool runnable, pe_working_set_t *data_set);
8080
pe_action_t *pe_cancel_op(pe_resource_t *rsc, const char *name,
8181
guint interval_ms, pe_node_t *node,
8282
pe_working_set_t *data_set);

0 commit comments

Comments
 (0)