Unify return types to 'norns_error_t' (6693f8c1) · Commits · hpc / norns

include/norns/norns.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -84,13 +84,13 @@ norns_error_t norns_submit(norns_iotask_t* task) __THROW;
		norns_error_t norns_wait(norns_iotask_t* task) __THROW;

		/* Try to cancel an asynchronous I/O task associated with task */
		ssize_t norns_cancel(norns_iotask_t* task) __THROW;
		norns_error_t norns_cancel(norns_iotask_t* task) __THROW;

		/* Check the status of a submitted I/O task */
		norns_error_t norns_status(norns_iotask_t* task, norns_stat_t* stats) __THROW;

		/* Retrieve return status associated with task */
		ssize_t norns_return(norns_iotask_t* task, norns_stat_t* stats) __THROW;
		norns_error_t norns_return(norns_iotask_t* task, norns_stat_t* stats) __THROW;

		/* Retrieve current status associated with task (if task is NULL, retrieve status for all running tasks) */
		//ssize_t norns_progress(norns_iotask_t* task, struct norns_iotst* statp) __THROW;
		@@ -99,7 +99,7 @@ ssize_t norns_return(norns_iotask_t* task, norns_stat_t* stats) __THROW;
		//int norns_error(norns_iotask_t* task) __THROW;

		/* Return a string describing the error number */
		char* norns_strerror(int errnum) __THROW;
		char* norns_strerror(norns_error_t errnum) __THROW;

		#ifdef __cplusplus
		}

include/norns/nornsctl.h

+11 −11

Original line number	Diff line number	Diff line
		@@ -89,38 +89,38 @@ void norns_job_init(norns_job_t* job, const char** hosts, size_t nhosts,
		norns_backend_t** backends, size_t nbackends) __THROW;

		/* Check if the urd daemon is running */
		int norns_ping() __THROW;
		norns_error_t norns_ping() __THROW;

		/* Send a command to the daemon (e.g. stop accepting new tasks) */
		//int norns_command(struct norns_cred* auth);
		//norns_error_t norns_command(struct norns_cred* auth);

		/* Register a batch job into the system */
		int norns_register_job(struct norns_cred* auth, uint32_t jobid, norns_job_t* job) __THROW;
		norns_error_t norns_register_job(struct norns_cred* auth, uint32_t jobid, norns_job_t* job) __THROW;

		/* Update an existing batch job */
		/* XXX: At the moment this invalidates all registered processes for this job */
		int norns_update_job(struct norns_cred* auth, uint32_t jobid, norns_job_t* job) __THROW;
		norns_error_t norns_update_job(struct norns_cred* auth, uint32_t jobid, norns_job_t* job) __THROW;

		/* Remove a batch job from the system */
		int norns_unregister_job(struct norns_cred* auth, uint32_t jobid) __THROW;
		norns_error_t norns_unregister_job(struct norns_cred* auth, uint32_t jobid) __THROW;

		/* Add a process to a registered batch job */
		int norns_add_process(struct norns_cred* auth, uint32_t jobid, uid_t uid, gid_t gid, pid_t pid) __THROW;
		norns_error_t norns_add_process(struct norns_cred* auth, uint32_t jobid, uid_t uid, gid_t gid, pid_t pid) __THROW;

		/* Remove a process from a registered batch job */
		int norns_remove_process(struct norns_cred* auth, uint32_t jobid, uid_t uid, gid_t gid, pid_t pid) __THROW;
		norns_error_t norns_remove_process(struct norns_cred* auth, uint32_t jobid, uid_t uid, gid_t gid, pid_t pid) __THROW;

		/* Register a backend in the local norns server */
		int norns_register_backend(struct norns_cred* auth, norns_backend_t* backend) __THROW;
		norns_error_t norns_register_backend(struct norns_cred* auth, norns_backend_t* backend) __THROW;

		/* Update an existing backend in the local norns server */
		int norns_register_backend(struct norns_cred* auth, norns_backend_t* backend) __THROW;
		norns_error_t norns_register_backend(struct norns_cred* auth, norns_backend_t* backend) __THROW;

		/* Unregister a backend from the local norns server */
		int norns_unregister_backend(struct norns_cred* auth, const char* prefix) __THROW;
		norns_error_t norns_unregister_backend(struct norns_cred* auth, const char* prefix) __THROW;

		/* Return a string describing the error number */
		char* norns_strerror(int errnum) __THROW;
		char* norns_strerror(norns_error_t errnum) __THROW;

		#ifdef __cplusplus
		}