forked from Archive/PX4-Autopilot
POSIX: Fix formatting
This commit is contained in:
parent
0b7f6902a9
commit
d60f201dc8
|
@ -69,28 +69,24 @@
|
|||
* Global Type Declarations
|
||||
************************************************************************/
|
||||
|
||||
struct sq_entry_s
|
||||
{
|
||||
struct sq_entry_s {
|
||||
FAR struct sq_entry_s *flink;
|
||||
};
|
||||
typedef struct sq_entry_s sq_entry_t;
|
||||
|
||||
struct dq_entry_s
|
||||
{
|
||||
struct dq_entry_s {
|
||||
FAR struct dq_entry_s *flink;
|
||||
FAR struct dq_entry_s *blink;
|
||||
};
|
||||
typedef struct dq_entry_s dq_entry_t;
|
||||
|
||||
struct sq_queue_s
|
||||
{
|
||||
struct sq_queue_s {
|
||||
FAR sq_entry_t *head;
|
||||
FAR sq_entry_t *tail;
|
||||
};
|
||||
typedef struct sq_queue_s sq_queue_t;
|
||||
|
||||
struct dq_queue_s
|
||||
{
|
||||
struct dq_queue_s {
|
||||
FAR dq_entry_t *head;
|
||||
FAR dq_entry_t *tail;
|
||||
};
|
||||
|
|
|
@ -96,6 +96,7 @@ static void run_cmd(const vector<string> &appargs, bool exit_on_fail)
|
|||
if (exit_on_fail && retval) {
|
||||
exit(retval);
|
||||
}
|
||||
|
||||
usleep(65000);
|
||||
|
||||
} else if (command.compare("help") == 0) {
|
||||
|
@ -108,6 +109,7 @@ static void run_cmd(const vector<string> &appargs, bool exit_on_fail)
|
|||
cout << "Invalid command: " << command << "\ntype 'help' for a list of commands" << endl;
|
||||
|
||||
}
|
||||
|
||||
print_prompt();
|
||||
}
|
||||
|
||||
|
|
|
@ -237,6 +237,7 @@ void hrt_init(void)
|
|||
sq_init(&callout_queue);
|
||||
|
||||
int sem_ret = px4_sem_init(&_hrt_lock, 0, 1);
|
||||
|
||||
if (sem_ret) {
|
||||
PX4_ERR("SEM INIT FAIL: %s", strerror(errno));
|
||||
}
|
||||
|
|
|
@ -54,8 +54,7 @@
|
|||
* Private Data
|
||||
************************************************************************************************/
|
||||
|
||||
static const uint32_t crc32_tab[] =
|
||||
{
|
||||
static const uint32_t crc32_tab[] = {
|
||||
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
|
||||
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
|
||||
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
|
||||
|
@ -105,10 +104,10 @@ uint32_t crc32part(FAR const uint8_t *src, size_t len, uint32_t crc32val)
|
|||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
{
|
||||
for (i = 0; i < len; i++) {
|
||||
crc32val = crc32_tab[(crc32val ^ src[i]) & 0xff] ^ (crc32val >> 8);
|
||||
}
|
||||
|
||||
return crc32val;
|
||||
}
|
||||
|
||||
|
|
|
@ -63,8 +63,7 @@
|
|||
|
||||
pthread_t _shell_task_id = 0;
|
||||
|
||||
struct task_entry
|
||||
{
|
||||
struct task_entry {
|
||||
pthread_t pid;
|
||||
std::string name;
|
||||
bool isused;
|
||||
|
@ -73,15 +72,14 @@ struct task_entry
|
|||
|
||||
static task_entry taskmap[PX4_MAX_TASKS];
|
||||
|
||||
typedef struct
|
||||
{
|
||||
typedef struct {
|
||||
px4_main_t entry;
|
||||
int argc;
|
||||
char *argv[];
|
||||
// strings are allocated after the
|
||||
} pthdata_t;
|
||||
|
||||
static void *entry_adapter ( void *ptr )
|
||||
static void *entry_adapter(void *ptr)
|
||||
{
|
||||
pthdata_t *data;
|
||||
data = (pthdata_t *) ptr;
|
||||
|
@ -102,7 +100,8 @@ px4_systemreset(bool to_bootloader)
|
|||
exit(0);
|
||||
}
|
||||
|
||||
px4_task_t px4_task_spawn_cmd(const char *name, int scheduler, int priority, int stack_size, px4_main_t entry, char * const argv[])
|
||||
px4_task_t px4_task_spawn_cmd(const char *name, int scheduler, int priority, int stack_size, px4_main_t entry,
|
||||
char *const argv[])
|
||||
{
|
||||
int rv;
|
||||
int argc = 0;
|
||||
|
@ -110,7 +109,7 @@ px4_task_t px4_task_spawn_cmd(const char *name, int scheduler, int priority, int
|
|||
unsigned int len = 0;
|
||||
unsigned long offset;
|
||||
unsigned long structsize;
|
||||
char * p = (char *)argv;
|
||||
char *p = (char *)argv;
|
||||
|
||||
pthread_t task;
|
||||
pthread_attr_t attr;
|
||||
|
@ -119,43 +118,53 @@ px4_task_t px4_task_spawn_cmd(const char *name, int scheduler, int priority, int
|
|||
// Calculate argc
|
||||
while (p != (char *)0) {
|
||||
p = argv[argc];
|
||||
if (p == (char *)0)
|
||||
|
||||
if (p == (char *)0) {
|
||||
break;
|
||||
++argc;
|
||||
len += strlen(p)+1;
|
||||
}
|
||||
structsize = sizeof(pthdata_t)+(argc+1)*sizeof(char *);
|
||||
|
||||
++argc;
|
||||
len += strlen(p) + 1;
|
||||
}
|
||||
|
||||
structsize = sizeof(pthdata_t) + (argc + 1) * sizeof(char *);
|
||||
pthdata_t *taskdata;
|
||||
|
||||
// not safe to pass stack data to the thread creation
|
||||
taskdata = (pthdata_t *)malloc(structsize+len);
|
||||
offset = ((unsigned long)taskdata)+structsize;
|
||||
taskdata = (pthdata_t *)malloc(structsize + len);
|
||||
offset = ((unsigned long)taskdata) + structsize;
|
||||
|
||||
taskdata->entry = entry;
|
||||
taskdata->argc = argc;
|
||||
|
||||
for (i=0; i<argc; i++) {
|
||||
for (i = 0; i < argc; i++) {
|
||||
PX4_DEBUG("arg %d %s\n", i, argv[i]);
|
||||
taskdata->argv[i] = (char *)offset;
|
||||
strcpy((char *)offset, argv[i]);
|
||||
offset+=strlen(argv[i])+1;
|
||||
offset += strlen(argv[i]) + 1;
|
||||
}
|
||||
|
||||
// Must add NULL at end of argv
|
||||
taskdata->argv[argc] = (char *)0;
|
||||
|
||||
PX4_DEBUG("starting task %s", name);
|
||||
|
||||
rv = pthread_attr_init(&attr);
|
||||
|
||||
if (rv != 0) {
|
||||
PX4_WARN("px4_task_spawn_cmd: failed to init thread attrs");
|
||||
return (rv < 0) ? rv : -rv;
|
||||
}
|
||||
|
||||
rv = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
|
||||
|
||||
if (rv != 0) {
|
||||
PX4_WARN("px4_task_spawn_cmd: failed to set inherit sched");
|
||||
return (rv < 0) ? rv : -rv;
|
||||
}
|
||||
|
||||
rv = pthread_attr_setschedpolicy(&attr, scheduler);
|
||||
|
||||
if (rv != 0) {
|
||||
PX4_WARN("px4_task_spawn_cmd: failed to set sched policy");
|
||||
return (rv < 0) ? rv : -rv;
|
||||
|
@ -164,28 +173,31 @@ px4_task_t px4_task_spawn_cmd(const char *name, int scheduler, int priority, int
|
|||
param.sched_priority = priority;
|
||||
|
||||
rv = pthread_attr_setschedparam(&attr, ¶m);
|
||||
|
||||
if (rv != 0) {
|
||||
PX4_WARN("px4_task_spawn_cmd: failed to set sched param");
|
||||
return (rv < 0) ? rv : -rv;
|
||||
}
|
||||
|
||||
rv = pthread_create (&task, &attr, &entry_adapter, (void *) taskdata);
|
||||
rv = pthread_create(&task, &attr, &entry_adapter, (void *) taskdata);
|
||||
|
||||
if (rv != 0) {
|
||||
|
||||
if (rv == EPERM) {
|
||||
//printf("WARNING: NOT RUNING AS ROOT, UNABLE TO RUN REALTIME THREADS\n");
|
||||
rv = pthread_create (&task, NULL, &entry_adapter, (void *) taskdata);
|
||||
rv = pthread_create(&task, NULL, &entry_adapter, (void *) taskdata);
|
||||
|
||||
if (rv != 0) {
|
||||
PX4_ERR("px4_task_spawn_cmd: failed to create thread %d %d\n", rv, errno);
|
||||
return (rv < 0) ? rv : -rv;
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
} else {
|
||||
return (rv < 0) ? rv : -rv;
|
||||
}
|
||||
}
|
||||
|
||||
for (i=0; i<PX4_MAX_TASKS; ++i) {
|
||||
for (i = 0; i < PX4_MAX_TASKS; ++i) {
|
||||
if (taskmap[i].isused == false) {
|
||||
taskmap[i].pid = task;
|
||||
taskmap[i].name = name;
|
||||
|
@ -193,9 +205,11 @@ px4_task_t px4_task_spawn_cmd(const char *name, int scheduler, int priority, int
|
|||
break;
|
||||
}
|
||||
}
|
||||
if (i>=PX4_MAX_TASKS) {
|
||||
|
||||
if (i >= PX4_MAX_TASKS) {
|
||||
return -ENOSPC;
|
||||
}
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
|
@ -205,15 +219,18 @@ int px4_task_delete(px4_task_t id)
|
|||
pthread_t pid;
|
||||
PX4_DEBUG("Called px4_task_delete");
|
||||
|
||||
if (id < PX4_MAX_TASKS && taskmap[id].isused)
|
||||
if (id < PX4_MAX_TASKS && taskmap[id].isused) {
|
||||
pid = taskmap[id].pid;
|
||||
else
|
||||
|
||||
} else {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
// If current thread then exit, otherwise cancel
|
||||
if (pthread_self() == pid) {
|
||||
taskmap[id].isused = false;
|
||||
pthread_exit(0);
|
||||
|
||||
} else {
|
||||
rv = pthread_cancel(pid);
|
||||
}
|
||||
|
@ -229,16 +246,17 @@ void px4_task_exit(int ret)
|
|||
pthread_t pid = pthread_self();
|
||||
|
||||
// Get pthread ID from the opaque ID
|
||||
for (i=0; i<PX4_MAX_TASKS; ++i) {
|
||||
for (i = 0; i < PX4_MAX_TASKS; ++i) {
|
||||
if (taskmap[i].pid == pid) {
|
||||
taskmap[i].isused = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i>=PX4_MAX_TASKS) {
|
||||
|
||||
if (i >= PX4_MAX_TASKS) {
|
||||
PX4_ERR("px4_task_exit: self task not found!");
|
||||
}
|
||||
else {
|
||||
|
||||
} else {
|
||||
PX4_DEBUG("px4_task_exit: %s", taskmap[i].name.c_str());
|
||||
}
|
||||
|
||||
|
@ -251,10 +269,12 @@ int px4_task_kill(px4_task_t id, int sig)
|
|||
pthread_t pid;
|
||||
PX4_DEBUG("Called px4_task_kill %d", sig);
|
||||
|
||||
if (id < PX4_MAX_TASKS && taskmap[id].isused && taskmap[id].pid != 0)
|
||||
if (id < PX4_MAX_TASKS && taskmap[id].isused && taskmap[id].pid != 0) {
|
||||
pid = taskmap[id].pid;
|
||||
else
|
||||
|
||||
} else {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
// If current thread then exit, otherwise cancel
|
||||
rv = pthread_kill(pid, sig);
|
||||
|
@ -268,27 +288,30 @@ void px4_show_tasks()
|
|||
int count = 0;
|
||||
|
||||
PX4_INFO("Active Tasks:");
|
||||
for (idx=0; idx < PX4_MAX_TASKS; idx++)
|
||||
{
|
||||
|
||||
for (idx = 0; idx < PX4_MAX_TASKS; idx++) {
|
||||
if (taskmap[idx].isused) {
|
||||
PX4_INFO(" %-10s %lu", taskmap[idx].name.c_str(), (unsigned long)taskmap[idx].pid);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
if (count == 0)
|
||||
|
||||
if (count == 0) {
|
||||
PX4_INFO(" No running tasks");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool px4_task_is_running(const char *taskname)
|
||||
{
|
||||
int idx;
|
||||
for (idx=0; idx < PX4_MAX_TASKS; idx++)
|
||||
{
|
||||
|
||||
for (idx = 0; idx < PX4_MAX_TASKS; idx++) {
|
||||
if (taskmap[idx].isused && (strcmp(taskmap[idx].name.c_str(), taskname) == 0)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
__BEGIN_DECLS
|
||||
|
@ -302,13 +325,13 @@ const char *getprogname();
|
|||
const char *getprogname()
|
||||
{
|
||||
pthread_t pid = pthread_self();
|
||||
for (int i=0; i<PX4_MAX_TASKS; i++)
|
||||
{
|
||||
if (taskmap[i].isused && taskmap[i].pid == pid)
|
||||
{
|
||||
|
||||
for (int i = 0; i < PX4_MAX_TASKS; i++) {
|
||||
if (taskmap[i].isused && taskmap[i].pid == pid) {
|
||||
return taskmap[i].name.c_str();
|
||||
}
|
||||
}
|
||||
|
||||
return "Unknown App";
|
||||
}
|
||||
__END_DECLS
|
||||
|
|
|
@ -65,9 +65,11 @@ int px4_sem_wait(px4_sem_t *s)
|
|||
{
|
||||
pthread_mutex_lock(&(s->lock));
|
||||
s->value--;
|
||||
if(s->value < 0) {
|
||||
|
||||
if (s->value < 0) {
|
||||
pthread_cond_wait(&(s->wait), &(s->lock));
|
||||
}
|
||||
|
||||
pthread_mutex_unlock(&(s->lock));
|
||||
|
||||
return 0;
|
||||
|
@ -77,9 +79,11 @@ int px4_sem_post(px4_sem_t *s)
|
|||
{
|
||||
pthread_mutex_lock(&(s->lock));
|
||||
s->value++;
|
||||
if(s->value <= 0) {
|
||||
|
||||
if (s->value <= 0) {
|
||||
pthread_cond_signal(&(s->wait));
|
||||
}
|
||||
|
||||
pthread_mutex_unlock(&(s->lock));
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in New Issue