Uncrustify maxscale

See script directory for method. The script to run in the top level
MaxScale directory is called maxscale-uncrustify.sh, which uses
another script, list-src, from the same directory (so you need to set
your PATH). The uncrustify version was 0.66.
This commit is contained in:
Niclas Antti
2018-09-09 22:26:19 +03:00
parent fa7ec95069
commit c447e5cf15
849 changed files with 35002 additions and 27238 deletions

View File

@ -1,63 +1,63 @@
#include "execute_cmd.h"
#include "rds_vpc.h"
RDS::RDS(char * cluster)
RDS::RDS(char* cluster)
{
cluster_name_intern = cluster;
subnets_intern = NULL;
N_intern = 0;
}
const char * RDS::get_instance_name(json_t * instance)
const char* RDS::get_instance_name(json_t* instance)
{
json_t * instance_name = json_object_get(instance, "DBInstanceIdentifier");
json_t* instance_name = json_object_get(instance, "DBInstanceIdentifier");
return json_string_value(instance_name);
}
json_t * RDS::get_cluster_descr(char * json)
json_t* RDS::get_cluster_descr(char* json)
{
json_t *root;
json_t* root;
json_error_t error;
root = json_loads( json, 0, &error );
if ( !root )
root = json_loads(json, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return NULL;
}
json_t * clusters = json_object_get(root, "DBClusters");
//cluster_intern =
json_t* clusters = json_object_get(root, "DBClusters");
// cluster_intern =
return json_array_get(clusters, 0);
}
json_t * RDS::get_subnets_group_descr(char * json)
json_t* RDS::get_subnets_group_descr(char* json)
{
json_t *root;
json_t* root;
json_error_t error;
root = json_loads( json, 0, &error );
if ( !root )
root = json_loads(json, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return NULL;
}
json_t * subnets = json_object_get(root, "DBSubnetGroups");
json_t* subnets = json_object_get(root, "DBSubnetGroups");
return json_array_get(subnets, 0);
}
json_t * RDS::get_cluster_nodes()
json_t* RDS::get_cluster_nodes()
{
return get_cluster_nodes(cluster_intern);
}
json_t * RDS::get_cluster_nodes(json_t *cluster)
json_t* RDS::get_cluster_nodes(json_t* cluster)
{
json_t * members = json_object_get(cluster, "DBClusterMembers");
json_t* members = json_object_get(cluster, "DBClusterMembers");
size_t members_N = json_array_size(members);
json_t * member;
json_t * node_names = json_array();
json_t* member;
json_t* node_names = json_array();
for (size_t i = 0; i < members_N; i++)
{
@ -67,23 +67,23 @@ json_t * RDS::get_cluster_nodes(json_t *cluster)
return node_names;
}
json_t * RDS::get_subnets()
json_t* RDS::get_subnets()
{
char cmd[1024];
char *result;
char* result;
sprintf(cmd, "aws rds describe-db-subnet-groups --db-subnet-group-name %s", subnets_group_name_intern);
if (execute_cmd(cmd, &result) != 0)
{
return NULL;
}
json_t * subnets_group = get_subnets_group_descr(result);
json_t* subnets_group = get_subnets_group_descr(result);
json_t * members = json_object_get(subnets_group, "Subnets");
json_t* members = json_object_get(subnets_group, "Subnets");
vpc_id_intern = json_string_value(json_object_get(subnets_group, "VpcId"));
size_t members_N = json_array_size(members);
json_t * member;
json_t * subnets_names = json_array();
json_t* member;
json_t* subnets_names = json_array();
for (size_t i = 0; i < members_N; i++)
{
@ -94,7 +94,7 @@ json_t * RDS::get_subnets()
return subnets_names;
}
const char * RDS::get_subnetgroup_name()
const char* RDS::get_subnetgroup_name()
{
if (cluster_intern != NULL)
{
@ -108,33 +108,34 @@ const char * RDS::get_subnetgroup_name()
return subnets_group_name_intern;
}
json_t * RDS::get_cluster()
json_t* RDS::get_cluster()
{
char cmd[1024];
char *result;
char* result;
sprintf(cmd, "aws rds describe-db-clusters --db-cluster-identifier=%s", cluster_name_intern);
execute_cmd(cmd , &result);
execute_cmd(cmd, &result);
return get_cluster_descr(result);
}
int RDS::destroy_nodes(json_t * node_names)
int RDS::destroy_nodes(json_t* node_names)
{
size_t N = json_array_size(node_names);
char cmd[1024];
char *res;
json_t * node;
char* res;
json_t* node;
int err = 0;
for (size_t i = 0; i < N; i++)
{
node = json_array_get(node_names, i);
sprintf(cmd, "aws rds delete-db-instance --skip-final-snapshot --db-instance-identifier=%s",
sprintf(cmd,
"aws rds delete-db-instance --skip-final-snapshot --db-instance-identifier=%s",
json_string_value(node));
printf("%s\n", cmd);
if (execute_cmd(cmd, &res) != 0)
{
err = -1;
fprintf( stderr, "error: can not delete node %s\n", json_string_value(node));
fprintf(stderr, "error: can not delete node %s\n", json_string_value(node));
}
}
return err;
@ -145,8 +146,8 @@ int RDS::destroy_subnets()
size_t N = json_array_size(subnets_intern);
char cmd[1024];
char *res;
json_t * subnet;
char* res;
json_t* subnet;
int err = 0;
for (size_t i = 0; i < N; i++)
{
@ -157,7 +158,7 @@ int RDS::destroy_subnets()
if (execute_cmd(cmd, &res) != 0)
{
err = -1;
fprintf( stderr, "error: can not delete subnet %s\n", json_string_value(subnet));
fprintf(stderr, "error: can not delete subnet %s\n", json_string_value(subnet));
}
}
return err;
@ -165,30 +166,30 @@ int RDS::destroy_subnets()
int RDS::destroy_route_tables()
{
json_t *root;
json_t* root;
char cmd[1024];
char * json;
char* json;
sprintf(cmd, "aws ec2 describe-vpcs --vpc-ids=%s", vpc_id_intern);
if (execute_cmd(cmd, &json))
{
fprintf( stderr, "error: can not get internet gateways description\n");
fprintf(stderr, "error: can not get internet gateways description\n");
return -1;
}
root = get_cluster_descr(json);
if ( !root )
if (!root)
{
fprintf( stderr, "error: can not get cluster description\n");
fprintf(stderr, "error: can not get cluster description\n");
return -1;
}
json_t * route_tables = json_object_get(root, "RouteTables");
json_t* route_tables = json_object_get(root, "RouteTables");
size_t i;
json_t *route_table;
const char * rt_id;
const char * vpc_id;
json_t* route_table;
const char* rt_id;
const char* vpc_id;
json_array_foreach(route_tables, i, route_table)
{
rt_id = json_string_value(json_object_get(route_table, "RouteTableId"));
@ -205,71 +206,76 @@ int RDS::destroy_route_tables()
int RDS::detach_and_destroy_gw()
{
json_t *root;
json_t* root;
json_error_t error;
char cmd[1024];
char * json;
char* json;
sprintf(cmd, "aws ec2 describe-internet-gateways --filters Name=attachment.vpc-id,Values=%s", vpc_id_intern);
sprintf(cmd,
"aws ec2 describe-internet-gateways --filters Name=attachment.vpc-id,Values=%s",
vpc_id_intern);
if (execute_cmd(cmd, &json))
{
fprintf( stderr, "error: can not get internet gateways description\n");
fprintf(stderr, "error: can not get internet gateways description\n");
return -1;
}
root = json_loads( json, 0, &error );
if ( !root )
root = json_loads(json, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return -1;
}
json_t * gws = json_object_get(root, "InternetGateways");
json_t* gws = json_object_get(root, "InternetGateways");
if (gws == NULL)
{
fprintf( stderr, "error: can not parse internet gateways description\n");
fprintf(stderr, "error: can not parse internet gateways description\n");
return -1;
}
size_t i;
json_t * gw;
const char * gw_id;
json_t* gw;
const char* gw_id;
json_array_foreach(gws, i, gw)
{
gw_id = json_string_value(json_object_get(gw, "InternetGatewayId"));
sprintf(cmd, "aws ec2 detach-internet-gateway --internet-gateway-id=%s --vpc-id=%s", gw_id, vpc_id_intern);
sprintf(cmd,
"aws ec2 detach-internet-gateway --internet-gateway-id=%s --vpc-id=%s",
gw_id,
vpc_id_intern);
printf("%s\n", cmd);
if (system(cmd) != 0)
{
fprintf( stderr, "error: can not detach gateway %s from vpc %s\n", gw_id, vpc_id_intern );
fprintf(stderr, "error: can not detach gateway %s from vpc %s\n", gw_id, vpc_id_intern);
return -1;
}
sprintf(cmd, "aws ec2 delete-internet-gateway --internet-gateway-id=%s", gw_id);
printf("%s\n", cmd);
if (system(cmd) != 0)
{
fprintf( stderr, "error: can not delete gateway %s\n", gw_id);
fprintf(stderr, "error: can not delete gateway %s\n", gw_id);
return -1;
}
}
return 0;
}
int RDS::create_vpc(const char **vpc_id)
int RDS::create_vpc(const char** vpc_id)
{
json_t *root;
json_t* root;
json_error_t error;
char * result;
char* result;
char cmd[1024];
if (execute_cmd((char *) "aws ec2 create-vpc --cidr-block 172.30.0.0/16", &result) != 0)
if (execute_cmd((char*) "aws ec2 create-vpc --cidr-block 172.30.0.0/16", &result) != 0)
{
fprintf(stderr, "error: can not create VPC\n");
return -1;
}
root = json_loads( result, 0, &error );
if ( !root )
root = json_loads(result, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return -1;
}
*vpc_id = json_string_value(json_object_get(json_object_get(root, "Vpc"), "VpcId"));
@ -296,15 +302,18 @@ int RDS::create_vpc(const char **vpc_id)
return 0;
}
int RDS::create_subnet(const char * az, const char * cidr, const char **subnet_id)
int RDS::create_subnet(const char* az, const char* cidr, const char** subnet_id)
{
json_t *root;
json_t* root;
json_error_t error;
char * result;
char* result;
char cmd[1024];
*subnet_id = NULL;
sprintf(cmd, "aws ec2 create-subnet --cidr-block %s --availability-zone %s --vpc-id %s", cidr, az,
sprintf(cmd,
"aws ec2 create-subnet --cidr-block %s --availability-zone %s --vpc-id %s",
cidr,
az,
vpc_id_intern);
puts(cmd);
if (execute_cmd(cmd, &result) != 0)
@ -312,10 +321,10 @@ int RDS::create_subnet(const char * az, const char * cidr, const char **subnet_i
fprintf(stderr, "error: can not create subnet\n");
return -1;
}
root = json_loads( result, 0, &error );
if ( !root )
root = json_loads(result, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return -1;
}
*subnet_id = json_string_value(json_object_get(json_object_get(root, "Subnet"), "SubnetId"));
@ -345,7 +354,7 @@ int RDS::create_subnet_group()
{
char cmd[1024];
size_t i;
json_t * subnet;
json_t* subnet;
sprintf(cmd,
"aws rds create-db-subnet-group --db-subnet-group-name %s --db-subnet-group-description maxscale --subnet-ids",
@ -365,27 +374,28 @@ int RDS::create_subnet_group()
return 0;
}
int RDS::create_gw(const char **gw_id)
int RDS::create_gw(const char** gw_id)
{
char * result;
char* result;
char cmd[1024];
json_error_t error;
*gw_id = NULL;
gw_intern = NULL;
if (execute_cmd((char *) "aws ec2 create-internet-gateway", &result) != 0)
if (execute_cmd((char*) "aws ec2 create-internet-gateway", &result) != 0)
{
fprintf(stderr, "error: can not create internet gateway\n");
return -1;
}
json_t * root = json_loads( result, 0, &error );
if ( !root )
json_t* root = json_loads(result, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return -1;
}
*gw_id = json_string_value(json_object_get(json_object_get(root, "InternetGateway"), "InternetGatewayId"));
*gw_id
= json_string_value(json_object_get(json_object_get(root, "InternetGateway"), "InternetGatewayId"));
if (*gw_id == NULL)
{
fprintf(stderr, "error: can not parse output of create-internet-gateway command\n");
@ -393,7 +403,10 @@ int RDS::create_gw(const char **gw_id)
}
gw_intern = *gw_id;
sprintf(cmd, "aws ec2 attach-internet-gateway --internet-gateway-id %s --vpc-id %s", *gw_id, vpc_id_intern);
sprintf(cmd,
"aws ec2 attach-internet-gateway --internet-gateway-id %s --vpc-id %s",
*gw_id,
vpc_id_intern);
if (system(cmd) != 0)
{
fprintf(stderr, "error: can not attach gateway to VPC\n");
@ -403,34 +416,34 @@ int RDS::create_gw(const char **gw_id)
return 0;
}
int RDS::configure_route_table(const char **rt)
int RDS::configure_route_table(const char** rt)
{
char * result;
char* result;
char cmd[1024];
json_error_t error;
*rt = NULL;
if (execute_cmd((char *) "aws ec2 describe-route-tables", &result) != 0)
if (execute_cmd((char*) "aws ec2 describe-route-tables", &result) != 0)
{
fprintf(stderr, "error: can not get route tables description\n");
return -1;
}
json_t * root = json_loads( result, 0, &error );
if ( !root )
json_t* root = json_loads(result, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return -1;
}
json_t * route_tables = json_object_get(root, "RouteTables");
json_t* route_tables = json_object_get(root, "RouteTables");
if (route_tables == NULL)
{
fprintf( stderr, "error: can not parse route tables description\n");
fprintf(stderr, "error: can not parse route tables description\n");
return -1;
}
size_t i;
json_t * rtb;
const char * rt_vpc;
json_t* rtb;
const char* rt_vpc;
json_array_foreach(route_tables, i, rtb)
{
@ -439,18 +452,20 @@ int RDS::configure_route_table(const char **rt)
{
// add route to route table which belongs to give VPC
*rt = json_string_value(json_object_get(rtb, "RouteTableId"));
sprintf(cmd, "aws ec2 create-route --route-table-id %s --gateway-id %s --destination-cidr-block 0.0.0.0/0",
*rt, gw_intern);
sprintf(cmd,
"aws ec2 create-route --route-table-id %s --gateway-id %s --destination-cidr-block 0.0.0.0/0",
*rt,
gw_intern);
if (system(cmd) != 0)
{
fprintf( stderr, "error: can not create route\n");
fprintf(stderr, "error: can not create route\n");
return -1;
}
}
}
if (*rt == NULL)
{
fprintf( stderr, "error: can not find route table\n");
fprintf(stderr, "error: can not find route table\n");
return -1;
}
return 0;
@ -459,33 +474,35 @@ int RDS::configure_route_table(const char **rt)
int RDS::create_cluster()
{
char cmd[1024];
char * result;
char* result;
json_error_t error;
size_t i;
sprintf(cmd,
"aws rds create-db-cluster --database-name=test --engine=aurora --master-username=skysql --master-user-password=skysqlrds --db-cluster-identifier=%s --db-subnet-group-name=%s",
cluster_name_intern, cluster_name_intern);
cluster_name_intern,
cluster_name_intern);
execute_cmd(cmd , &result);
json_t * root = json_loads( result, 0, &error );
if ( !root )
execute_cmd(cmd, &result);
json_t* root = json_loads(result, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return -1;
}
json_t * cluster = json_object_get(root, "DBCluster");
json_t* cluster = json_object_get(root, "DBCluster");
cluster_intern = cluster;
json_t * security_groups = json_object_get(cluster, "VpcSecurityGroups");
json_t * sg;
const char * sg_id;
json_t* security_groups = json_object_get(cluster, "VpcSecurityGroups");
json_t* sg;
const char* sg_id;
json_array_foreach(security_groups, i, sg)
{
sg_id = json_string_value(json_object_get(sg, "VpcSecurityGroupId"));
printf("Security group %s\n", sg_id);
sprintf(cmd,
"aws ec2 authorize-security-group-ingress --group-id %s --protocol tcp --port 3306 --cidr 0.0.0.0/0", sg_id);
"aws ec2 authorize-security-group-ingress --group-id %s --protocol tcp --port 3306 --cidr 0.0.0.0/0",
sg_id);
system(cmd);
}
sg_intern = sg_id;
@ -494,27 +511,28 @@ int RDS::create_cluster()
{
sprintf(cmd,
"aws rds create-db-instance --db-cluster-identifier=%s --engine=aurora --db-instance-class=db.t2.medium --publicly-accessible --db-instance-identifier=node%03lu",
cluster_name_intern, i);
cluster_name_intern,
i);
printf("%s\n", cmd);
system(cmd);
}
return 0;
}
int RDS::get_writer(const char ** writer_name)
int RDS::get_writer(const char** writer_name)
{
char * json;
char* json;
char cmd[1024];
sprintf(cmd, "aws rds describe-db-clusters --db-cluster-identifier=%s", cluster_name_intern);
execute_cmd(cmd , &json);
json_t * cluster = get_cluster_descr(json);
json_t * nodes = json_object_get(cluster, "DBClusterMembers");
execute_cmd(cmd, &json);
json_t* cluster = get_cluster_descr(json);
json_t* nodes = json_object_get(cluster, "DBClusterMembers");
//char * s = json_dumps(nodes, JSON_INDENT(4));
//puts(s);
// char * s = json_dumps(nodes, JSON_INDENT(4));
// puts(s);
bool writer;
json_t * node;
json_t* node;
size_t i = 0;
do
@ -539,8 +557,9 @@ int RDS::destroy_vpc()
int RDS::destroy_cluster()
{
char cmd[1024];
char * result;
sprintf(cmd, "aws rds delete-db-cluster --db-cluster-identifier=%s --skip-final-snapshot",
char* result;
sprintf(cmd,
"aws rds delete-db-cluster --db-cluster-identifier=%s --skip-final-snapshot",
cluster_name_intern);
return execute_cmd(cmd, &result);
}
@ -548,7 +567,7 @@ int RDS::destroy_cluster()
int RDS::destroy_subnets_group()
{
char cmd[1024];
char * result;
char* result;
sprintf(cmd, "aws rds delete-db-subnet-group --db-subnet-group-name %s", get_subnetgroup_name());
puts(cmd);
return execute_cmd(cmd, &result);
@ -556,18 +575,18 @@ int RDS::destroy_subnets_group()
int RDS::create_rds_db(int N)
{
const char * vpc;
const char * subnet1;
const char * subnet2;
const char * gw;
const char * rt;
const char* vpc;
const char* subnet1;
const char* subnet2;
const char* gw;
const char* rt;
N_intern = N;
printf("Create VPC\n");
if (create_vpc(&vpc) != 0)
{
fprintf( stderr, "error: can not create VPC\n");
fprintf(stderr, "error: can not create VPC\n");
destroy_vpc();
return -1;
}
@ -624,14 +643,14 @@ int RDS::create_rds_db(int N)
int RDS::delete_rds_cluster()
{
char * result;
char* result;
char cmd[1024];
json_t * current_cluster;
json_t* current_cluster;
printf("Get cluster\n");
cluster_intern = get_cluster();
printf("Get cluster NODES\n");
json_t * nodes = get_cluster_nodes();
json_t* nodes = get_cluster_nodes();
printf("Get subnets group: %s\n", get_subnetgroup_name());
@ -653,7 +672,7 @@ int RDS::delete_rds_cluster()
nodes = get_cluster_nodes(current_cluster);
alive_nodes = json_array_size(nodes);
}
while ( alive_nodes > 0);
while (alive_nodes > 0);
printf("Destroy cluster\n");
destroy_cluster();
@ -664,7 +683,6 @@ int RDS::delete_rds_cluster()
sleep(5);
sprintf(cmd, "aws rds describe-db-clusters --db-cluster-identifier=%s", cluster_name_intern);
execute_cmd(cmd, &result);
}
while (get_cluster_descr(result) != NULL);
@ -683,14 +701,14 @@ int RDS::delete_rds_cluster()
int RDS::wait_for_nodes(size_t N)
{
char * result;
char* result;
size_t active_nodes = 0;
size_t i = 0;
json_t * node;
json_t* node;
char cmd[1024];
json_t * nodes;
json_t * instances;
json_t * instance;
json_t* nodes;
json_t* instances;
json_t* instance;
json_error_t error;
do
@ -703,31 +721,33 @@ int RDS::wait_for_nodes(size_t N)
active_nodes = 0;
json_array_foreach(nodes, i, node)
{
sprintf(cmd, "aws rds describe-db-instances --db-instance-identifier=%s", json_string_value(node));
sprintf(cmd,
"aws rds describe-db-instances --db-instance-identifier=%s",
json_string_value(node));
execute_cmd(cmd, &result);
instances = json_loads( result, 0, &error );
if ( !instances )
instances = json_loads(result, 0, &error);
if (!instances)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return -1;
}
instance = json_array_get(json_object_get(instances, "DBInstances"), 0);
//puts(json_dumps(instance, JSON_INDENT(4)));
// puts(json_dumps(instance, JSON_INDENT(4)));
if (strcmp(json_string_value(json_object_get(instance, "DBInstanceStatus")), "available") == 0)
{
active_nodes++;
}
}
}
while ( active_nodes != N);
while (active_nodes != N);
return 0;
}
int RDS::do_failover()
{
char * result;
const char * writer;
const char * new_writer;
char* result;
const char* writer;
const char* new_writer;
char cmd[1024];
if (get_writer(&writer) != 0)
{
@ -752,25 +772,25 @@ int RDS::do_failover()
return 0;
}
json_t * RDS::get_endpoints()
json_t* RDS::get_endpoints()
{
char cmd[1024];
char * result;
char* result;
json_t *root;
json_t* root;
json_error_t error;
json_t * node;
json_t * node_json;
json_t *endpoint;
json_t* node;
json_t* node_json;
json_t* endpoint;
json_t * endpoints;
json_t* endpoints;
endpoints = json_array();
cluster_intern = get_cluster();
json_t * nodes = get_cluster_nodes();
//puts(json_dumps(nodes, JSON_INDENT(4)));
json_t* nodes = get_cluster_nodes();
// puts(json_dumps(nodes, JSON_INDENT(4)));
size_t i;
json_array_foreach(nodes, i, node)
@ -778,13 +798,13 @@ json_t * RDS::get_endpoints()
sprintf(cmd, "aws rds describe-db-instances --db-instance-identifier=%s", json_string_value(node));
if (execute_cmd(cmd, &result) != 0)
{
fprintf( stderr, "error: executing aws rds describe-db-instances\n");
fprintf(stderr, "error: executing aws rds describe-db-instances\n");
return NULL;
}
root = json_loads( result, 0, &error );
if ( !root )
root = json_loads(result, 0, &error);
if (!root)
{
fprintf( stderr, "error: on line %d: %s\n", error.line, error.text );
fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
return NULL;
}
node_json = json_array_get(json_object_get(root, "DBInstances"), 0);