Commit 44e82135 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Rename norns_backend* to nornsctl_backend*

parent ab0dc8ac

include/norns/nornsctl.h

+9 −7
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ typedef struct { 
    int         b_type;     /* namespace type */

    const char* b_mount;    /* mount point */

    uint32_t    b_capacity; /* namespace capacity (in megabytes) for writing data */

} norns_backend_t;

} nornsctl_backend_t;



/* Descriptor for a batch job limits w.r.t. a namespace */

typedef struct {
@@ -71,10 +71,12 @@ typedef struct { 
    size_t              j_nlimits;  /* entries in limits list */

} norns_job_t;



norns_backend_t NORNS_BACKEND(norns_flags_t flags, const char* mount_point, 

nornsctl_backend_t 

NORNSCTL_BACKEND(norns_flags_t flags, const char* mount_point, 

                 uint32_t capacity) __THROW;



void norns_backend_init(norns_backend_t* backend, norns_flags_t flags, 

void 

nornsctl_backend_init(nornsctl_backend_t* backend, norns_flags_t flags, 

                      const char* mount_point, uint32_t capacity) __THROW;



norns_job_limit_t NORNS_JOB_LIMIT(const char* nsid, uint32_t quota) __THROW;
@@ -110,10 +112,10 @@ norns_error_t nornsctl_add_process(uint32_t jobid, uid_t uid, gid_t gid, pid_t p 
norns_error_t nornsctl_remove_process(uint32_t jobid, uid_t uid, gid_t gid, pid_t pid) __THROW;



/* Register a namespace in the local norns server */

norns_error_t nornsctl_register_namespace(const char* nsid, norns_backend_t* backend) __THROW;

norns_error_t nornsctl_register_namespace(const char* nsid, nornsctl_backend_t* backend) __THROW;



/* Update an existing namespace in the local norns server */

norns_error_t nornsctl_update_namespace(const char* nsid, norns_backend_t* backend) __THROW;

norns_error_t nornsctl_update_namespace(const char* nsid, nornsctl_backend_t* backend) __THROW;



/* Unregister a namespace from the local norns server */

norns_error_t nornsctl_unregister_namespace(const char* nsid) __THROW;

lib/communication.c

+3 −3
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ send_process_request(norns_rpc_type_t type, uint32_t jobid, 


norns_error_t

send_namespace_request(norns_rpc_type_t type, const char* nsid, 

                       norns_backend_t* ns) {

                       nornsctl_backend_t* ns) {



    int res;

    norns_response_t resp;
@@ -262,8 +262,8 @@ send_request(norns_rpc_type_t type, norns_response_t* resp, ...) { 
        {

            const char* const nsid =

                va_arg(ap, const char* const);

            const norns_backend_t* backend = 

                va_arg(ap, const norns_backend_t*);

            const nornsctl_backend_t* backend = 

                va_arg(ap, const nornsctl_backend_t*);



            if((res = pack_to_buffer(type, &req_buf, nsid, backend)) 

                    != NORNS_SUCCESS) {

lib/communication.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ norns_error_t send_job_request(norns_rpc_type_t type, uint32_t jobid, 
norns_error_t send_process_request(norns_rpc_type_t type, uint32_t jobid, 

                                   uid_t uid, gid_t gid, pid_t pid);

norns_error_t send_namespace_request(norns_rpc_type_t type, const char* nsid, 

                                     norns_backend_t* backend);

                                     nornsctl_backend_t* backend);

norns_error_t send_ping_request();



#pragma GCC visibility pop

lib/libnornsctl.c

+10 −10
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#define LIBNORNSCTL_LOG_PREFIX "libnornsctl"



static bool validate_job(norns_job_t* job);

static bool validate_namespace(norns_backend_t* backend);

static bool validate_namespace(nornsctl_backend_t* backend);



static void

load_config_file(void) {
@@ -169,7 +169,7 @@ nornsctl_remove_process(uint32_t jobid, uid_t uid, gid_t gid, pid_t pid) { 


/* Register a namespace in the local norns server */

norns_error_t 

nornsctl_register_namespace(const char* nsid, norns_backend_t* backend) {

nornsctl_register_namespace(const char* nsid, nornsctl_backend_t* backend) {



    if(nsid == NULL || (strncmp(nsid, "", 1) == 0) || 

       !validate_namespace(backend)) {
@@ -181,7 +181,7 @@ nornsctl_register_namespace(const char* nsid, norns_backend_t* backend) { 


/* Update a namespace in the local norns server */

norns_error_t 

nornsctl_update_namespace(const char* nsid, norns_backend_t* backend) {

nornsctl_update_namespace(const char* nsid, nornsctl_backend_t* backend) {



    return NORNS_ENOTSUPPORTED;
@@ -202,19 +202,19 @@ nornsctl_unregister_namespace(const char* nsid) { 
    return send_namespace_request(NORNS_NAMESPACE_UNREGISTER, nsid, NULL);

}



norns_backend_t 

NORNS_BACKEND(norns_flags_t flags, const char* mount_point, 

nornsctl_backend_t 

NORNSCTL_BACKEND(norns_flags_t flags, const char* mount_point, 

                uint32_t capacity) {



    norns_backend_t b;

    nornsctl_backend_t b;



    norns_backend_init(&b, flags, mount_point, capacity);

    nornsctl_backend_init(&b, flags, mount_point, capacity);



    return b;

}



void 

norns_backend_init(norns_backend_t* backend, norns_flags_t flags, 

nornsctl_backend_init(nornsctl_backend_t* backend, norns_flags_t flags, 

                      const char* mount_point, uint32_t capacity) {



    if(backend == NULL) {
@@ -278,7 +278,7 @@ norns_job_init(norns_job_t* job, const char** hosts, size_t nhosts, 
}



static bool

validate_namespace(norns_backend_t* backend) {

validate_namespace(nornsctl_backend_t* backend) {



    if(backend == NULL) {

        return false;

lib/requests.c

+6 −6
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ static void 
free_task_msg(Norns__Rpc__Request__Task* msg);



static Norns__Rpc__Request__Namespace* 

build_namespace_message(const char* nsid, const norns_backend_t* backend);

build_namespace_message(const char* nsid, const nornsctl_backend_t* backend);

static void 

free_namespace_message(Norns__Rpc__Request__Namespace* msg);



static Norns__Rpc__Request__Namespace__Backend* 

build_backend_message(const norns_backend_t* backend);

build_backend_message(const nornsctl_backend_t* backend);

static void 

free_backend_message(Norns__Rpc__Request__Namespace__Backend* msg);
@@ -228,8 +228,8 @@ build_request_msg(norns_rpc_type_t type, va_list ap) { 
        {

            const char* const nsid =

                va_arg(ap, const char* const);

            const norns_backend_t* backend = 

                va_arg(ap, const norns_backend_t*);

            const nornsctl_backend_t* backend = 

                va_arg(ap, const nornsctl_backend_t*);



            if((req_msg->nspace = 

                    build_namespace_message(nsid, backend)) == NULL) {
@@ -300,7 +300,7 @@ free_job_msg(Norns__Rpc__Request__Job* msg) { 
}



static Norns__Rpc__Request__Namespace* 

build_namespace_message(const char* nsid, const norns_backend_t* backend) {

build_namespace_message(const char* nsid, const nornsctl_backend_t* backend) {



    assert(nsid != NULL);
@@ -347,7 +347,7 @@ free_namespace_message(Norns__Rpc__Request__Namespace* msg) { 
}



static Norns__Rpc__Request__Namespace__Backend*

build_backend_message(const norns_backend_t* backend) {

build_backend_message(const nornsctl_backend_t* backend) {



    assert(backend != NULL);