#include "ustcomm.h"
#include "ustcmd.h"
-#define _GNU_SOURCE
-
-pid_t* ustcmd_get_online_pids(void)
+pid_t *ustcmd_get_online_pids(void)
{
- struct dirent* dirent;
- DIR* dir;
+ struct dirent *dirent;
+ DIR *dir;
unsigned int ret_size = 1 * sizeof(pid_t), i = 0;
dir = opendir(SOCK_DIR);
return NULL;
}
- pid_t* ret = (pid_t*) malloc(ret_size);
+ pid_t *ret = (pid_t *) malloc(ret_size);
while ((dirent = readdir(dir))) {
if (!strcmp(dirent->d_name, ".") ||
if (dirent->d_type != DT_DIR &&
!!strcmp(dirent->d_name, "ustd")) {
- sscanf(dirent->d_name, "%u", (unsigned int*) &ret[i]);
+ sscanf(dirent->d_name, "%u", (unsigned int *) &ret[i]);
if (pid_is_online(ret[i])) {
ret_size += sizeof(pid_t);
- ret = (pid_t*) realloc(ret, ret_size);
+ ret = (pid_t *) realloc(ret, ret_size);
++i;
}
}
ret[i] = 0; /* Array end */
- if (ret[0] == 0) { /* No PID at all.. */
+ if (ret[0] == 0) {
+ /* No PID at all */
free(ret);
return NULL;
}
* @param pid Traced process ID
* @return 0 if successful, or errors {USTCMD_ERR_GEN, USTCMD_ERR_ARG}
*/
-int ustcmd_set_marker_state(const char* mn, int state, pid_t pid)
+int ustcmd_set_marker_state(const char *mn, int state, pid_t pid)
{
- char* cmd_str [] = {"disable_marker", "enable_marker"};
- char* cmd;
+ char *cmd_str [] = {"disable_marker", "enable_marker"};
+ char *cmd;
int result;
if (mn == NULL) {
asprintf(&cmd, "%s %s", cmd_str[state], mn);
- result = ustcmd_shoot(cmd, pid, NULL);
+ result = ustcmd_send_cmd(cmd, pid, NULL);
if (result) {
free(cmd);
return USTCMD_ERR_GEN;
{
int result;
- result = ustcmd_shoot("destroy", pid, NULL);
+ result = ustcmd_send_cmd("trace_destroy", pid, NULL);
if (result) {
return USTCMD_ERR_GEN;
}
{
int result;
- result = ustcmd_shoot("start", pid, NULL);
+ result = ustcmd_send_cmd("start", pid, NULL);
if (result) {
return USTCMD_ERR_GEN;
}
{
int result;
- result = ustcmd_shoot("trace_start", pid, NULL);
+ result = ustcmd_send_cmd("trace_start", pid, NULL);
if (result) {
return USTCMD_ERR_GEN;
}
{
int result;
- result = ustcmd_shoot("trace_stop", pid, NULL);
+ result = ustcmd_send_cmd("trace_stop", pid, NULL);
if (result) {
return USTCMD_ERR_GEN;
}
* @param str String to search in
* @return Total newlines count
*/
-unsigned int ustcmd_count_nl(const char* str)
+unsigned int ustcmd_count_nl(const char *str)
{
unsigned int i = 0, tot = 0;
* @param cmsf CMSF array to free
* @return 0 if successful, or error USTCMD_ERR_ARG
*/
-int ustcmd_free_cmsf(struct USTcmd_cmsf* cmsf)
+int ustcmd_free_cmsf(struct marker_status *cmsf)
{
if (cmsf == NULL) {
return USTCMD_ERR_ARG;
* @param pid Targeted PID
* @return 0 if successful, or errors {USTCMD_ERR_ARG, USTCMD_ERR_GEN}
*/
-int ustcmd_get_cmsf(struct USTcmd_cmsf** cmsf, const pid_t pid)
+int ustcmd_get_cmsf(struct marker_status **cmsf, const pid_t pid)
{
- char* big_str = NULL;
+ char *big_str = NULL;
int result;
- struct USTcmd_cmsf* tmp_cmsf = NULL;
+ struct marker_status *tmp_cmsf = NULL;
unsigned int i = 0, cmsf_ind = 0;
if (cmsf == NULL) {
return USTCMD_ERR_ARG;
}
- result = ustcmd_shoot("list_markers", pid, &big_str);
+ result = ustcmd_send_cmd("list_markers", pid, &big_str);
if (result) {
return USTCMD_ERR_GEN;
}
return USTCMD_ERR_GEN;
}
- tmp_cmsf = (struct USTcmd_cmsf*) malloc(sizeof(struct USTcmd_cmsf) *
+ tmp_cmsf = (struct marker_status *) malloc(sizeof(struct marker_status) *
(ustcmd_count_nl(big_str) + 1));
if (tmp_cmsf == NULL) {
return USTCMD_ERR_GEN;
while (big_str[i] != '\0') {
char state;
- sscanf(big_str + i, "%a[^/]/%a[^ ] %c %a[^\n]",
+ sscanf(big_str + i, "marker: %a[^/]/%a[^ ] %c %a[^\n]",
&tmp_cmsf[cmsf_ind].channel,
&tmp_cmsf[cmsf_ind].marker,
&state,
* @return 0 if successful, or errors {USTCMD_ERR_ARG, USTCMD_ERR_CONN}
*/
-int ustcmd_shoot(const char* cmd, const pid_t pid, char** reply)
+int ustcmd_send_cmd(const char *cmd, const pid_t pid, char **reply)
{
struct ustcomm_connection conn;
}
if (ustcomm_connect_app(pid, &conn)) {
- fprintf(stderr, "ustcmd_shoot: could not connect to PID %u\n",
+ fprintf(stderr, "ustcmd_send_cmd: could not connect to PID %u\n",
(unsigned int) pid);
return USTCMD_ERR_CONN;
}