mirror of
https://github.com/apache/nuttx.git
synced 2026-06-07 09:18:00 +08:00
Replace all occurrences of vdbg with vinfo
This commit is contained in:
@@ -152,7 +152,7 @@ static inline void os_pgworker(void)
|
||||
* resolve page faults in other threads
|
||||
*/
|
||||
|
||||
svdbg("Starting paging thread\n");
|
||||
sinfo("Starting paging thread\n");
|
||||
|
||||
g_pgworker = kernel_thread("pgfill", CONFIG_PAGING_DEFPRIO,
|
||||
CONFIG_PAGING_STACKSIZE,
|
||||
@@ -253,7 +253,7 @@ static inline void os_do_appstart(void)
|
||||
* entrypoint from the header at the beginning of the user-space blob.
|
||||
*/
|
||||
|
||||
svdbg("Starting init thread\n");
|
||||
sinfo("Starting init thread\n");
|
||||
|
||||
#ifdef CONFIG_BUILD_PROTECTED
|
||||
DEBUGASSERT(USERSPACE->us_entrypoint != NULL);
|
||||
@@ -287,7 +287,7 @@ static inline void os_do_appstart(void)
|
||||
* of the board_initialize() operation.
|
||||
*/
|
||||
|
||||
svdbg("Starting init task: %s\n", CONFIG_USER_INITPATH);
|
||||
sinfo("Starting init task: %s\n", CONFIG_USER_INITPATH);
|
||||
|
||||
ret = exec(CONFIG_USER_INITPATH, NULL, CONFIG_INIT_SYMTAB,
|
||||
CONFIG_INIT_NEXPORTS);
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MODULE_DUMPBUFFER
|
||||
# define mod_dumpbuffer(m,b,n) svdbgdumpbuffer(m,b,n)
|
||||
# define mod_dumpbuffer(m,b,n) sinfodumpbuffer(m,b,n)
|
||||
#else
|
||||
# define mod_dumpbuffer(m,b,n)
|
||||
#endif
|
||||
@@ -146,7 +146,7 @@ int mod_initialize(FAR const char *filename,
|
||||
{
|
||||
int ret;
|
||||
|
||||
svdbg("filename: %s loadinfo: %p\n", filename, loadinfo);
|
||||
sinfo("filename: %s loadinfo: %p\n", filename, loadinfo);
|
||||
|
||||
/* Clear the load info structure */
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MODULE_DUMPBUFFER
|
||||
# define mod_dumpbuffer(m,b,n) svdbgdumpbuffer(m,b,n)
|
||||
# define mod_dumpbuffer(m,b,n) sinfodumpbuffer(m,b,n)
|
||||
#else
|
||||
# define mod_dumpbuffer(m,b,n)
|
||||
#endif
|
||||
@@ -191,7 +191,7 @@ int insmod(FAR const char *filename, FAR const char *modulename)
|
||||
int ret;
|
||||
|
||||
DEBUGASSERT(filename != NULL && modulename != NULL);
|
||||
svdbg("Loading file: %s\n", filename);
|
||||
sinfo("Loading file: %s\n", filename);
|
||||
|
||||
/* Get exclusive access to the module registry */
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ static inline int mod_loadfile(FAR struct mod_loadinfo_s *loadinfo)
|
||||
|
||||
/* Read each section into memory that is marked SHF_ALLOC + SHT_NOBITS */
|
||||
|
||||
svdbg("Loaded sections:\n");
|
||||
sinfo("Loaded sections:\n");
|
||||
text = (FAR uint8_t *)loadinfo->textalloc;
|
||||
data = (FAR uint8_t *)loadinfo->datastart;
|
||||
|
||||
@@ -208,7 +208,7 @@ static inline int mod_loadfile(FAR struct mod_loadinfo_s *loadinfo)
|
||||
|
||||
/* Update sh_addr to point to copy in memory */
|
||||
|
||||
svdbg("%d. %08lx->%08lx\n", i,
|
||||
sinfo("%d. %08lx->%08lx\n", i,
|
||||
(unsigned long)shdr->sh_addr, (unsigned long)*pptr);
|
||||
|
||||
shdr->sh_addr = (uintptr_t)*pptr;
|
||||
@@ -242,7 +242,7 @@ int mod_load(FAR struct mod_loadinfo_s *loadinfo)
|
||||
{
|
||||
int ret;
|
||||
|
||||
svdbg("loadinfo: %p\n", loadinfo);
|
||||
sinfo("loadinfo: %p\n", loadinfo);
|
||||
DEBUGASSERT(loadinfo && loadinfo->filfd >= 0);
|
||||
|
||||
/* Load section headers into memory */
|
||||
|
||||
@@ -171,7 +171,7 @@ static int modprocfs_open(FAR struct file *filep, FAR const char *relpath,
|
||||
{
|
||||
FAR struct modprocfs_file_s *priv;
|
||||
|
||||
fvdbg("Open '%s'\n", relpath);
|
||||
finfo("Open '%s'\n", relpath);
|
||||
|
||||
/* PROCFS is read-only. Any attempt to open with any kind of write
|
||||
* access is not permitted.
|
||||
@@ -232,7 +232,7 @@ static ssize_t modprocfs_read(FAR struct file *filep, FAR char *buffer,
|
||||
FAR struct modprocfs_file_s *priv;
|
||||
int ret;
|
||||
|
||||
fvdbg("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
|
||||
finfo("buffer=%p buflen=%lu\n", buffer, (unsigned long)buflen);
|
||||
|
||||
/* Recover our private data from the struct file instance */
|
||||
|
||||
@@ -270,7 +270,7 @@ static int modprocfs_dup(FAR const struct file *oldp, FAR struct file *newp)
|
||||
FAR struct modprocfs_file_s *oldpriv;
|
||||
FAR struct modprocfs_file_s *newpriv;
|
||||
|
||||
fvdbg("Dup %p->%p\n", oldp, newp);
|
||||
finfo("Dup %p->%p\n", oldp, newp);
|
||||
|
||||
/* Recover our private data from the old struct file instance */
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ int mod_read(FAR struct mod_loadinfo_s *loadinfo, FAR uint8_t *buffer,
|
||||
ssize_t nbytes; /* Number of bytes read */
|
||||
off_t rpos; /* Position returned by lseek */
|
||||
|
||||
svdbg("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset);
|
||||
sinfo("Read %ld bytes from offset %ld\n", (long)readsize, (long)offset);
|
||||
|
||||
/* Loop until all of the requested data has been read. */
|
||||
|
||||
|
||||
@@ -262,7 +262,7 @@ int mod_findsection(FAR struct mod_loadinfo_s *loadinfo,
|
||||
|
||||
/* Check if the name of this section is 'sectname' */
|
||||
|
||||
svdbg("%d. Comparing \"%s\" and .\"%s\"\n",
|
||||
sinfo("%d. Comparing \"%s\" and .\"%s\"\n",
|
||||
i, loadinfo->iobuffer, sectname);
|
||||
|
||||
if (strcmp((FAR const char *)loadinfo->iobuffer, sectname) == 0)
|
||||
|
||||
@@ -281,7 +281,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
|
||||
{
|
||||
/* st_value already holds the correct value */
|
||||
|
||||
svdbg("SHN_ABS: st_value=%08lx\n", (long)sym->st_value);
|
||||
sinfo("SHN_ABS: st_value=%08lx\n", (long)sym->st_value);
|
||||
return OK;
|
||||
}
|
||||
|
||||
@@ -321,7 +321,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
|
||||
|
||||
/* Yes... add the exported symbol value to the ELF symbol table entry */
|
||||
|
||||
svdbg("SHN_ABS: name=%s %08x+%08x=%08x\n",
|
||||
sinfo("SHN_ABS: name=%s %08x+%08x=%08x\n",
|
||||
loadinfo->iobuffer, sym->st_value, symbol->sym_value,
|
||||
sym->st_value + symbol->sym_value);
|
||||
|
||||
@@ -333,7 +333,7 @@ int mod_symvalue(FAR struct mod_loadinfo_s *loadinfo, FAR Elf32_Sym *sym)
|
||||
{
|
||||
secbase = loadinfo->shdr[sym->st_shndx].sh_addr;
|
||||
|
||||
svdbg("Other: %08x+%08x=%08x\n",
|
||||
sinfo("Other: %08x+%08x=%08x\n",
|
||||
sym->st_value, secbase, sym->st_value + secbase);
|
||||
|
||||
sym->st_value += secbase;
|
||||
|
||||
@@ -87,7 +87,7 @@ int mod_verifyheader(FAR const Elf32_Ehdr *ehdr)
|
||||
|
||||
if (memcmp(ehdr->e_ident, g_modmagic, EI_MAGIC_SIZE) != 0)
|
||||
{
|
||||
svdbg("Not ELF magic {%02x, %02x, %02x, %02x}\n",
|
||||
sinfo("Not ELF magic {%02x, %02x, %02x, %02x}\n",
|
||||
ehdr->e_ident[0], ehdr->e_ident[1], ehdr->e_ident[2], ehdr->e_ident[3]);
|
||||
return -ENOEXEC;
|
||||
}
|
||||
|
||||
@@ -159,7 +159,7 @@ void pg_miss(void)
|
||||
{
|
||||
/* Reprioritize the page fill worker thread */
|
||||
|
||||
pgllvdbg("New worker priority. %d->%d\n",
|
||||
pgllinfo("New worker priority. %d->%d\n",
|
||||
wtcb->sched_priority, ftcb->sched_priority);
|
||||
sched_setpriority(wtcb, ftcb->sched_priority);
|
||||
}
|
||||
|
||||
+14
-14
@@ -155,7 +155,7 @@ static void pg_callback(FAR struct tcb_s *tcb, int result)
|
||||
{
|
||||
/* Verify that g_pftcb is non-NULL */
|
||||
|
||||
pgllvdbg("g_pftcb: %p\n", g_pftcb);
|
||||
pgllinfo("g_pftcb: %p\n", g_pftcb);
|
||||
if (g_pftcb)
|
||||
{
|
||||
FAR struct tcb_s *htcb = (FAR struct tcb_s *)g_waitingforfill.head;
|
||||
@@ -181,7 +181,7 @@ static void pg_callback(FAR struct tcb_s *tcb, int result)
|
||||
|
||||
if (priority > wtcb->sched_priority)
|
||||
{
|
||||
pgllvdbg("New worker priority. %d->%d\n",
|
||||
pgllinfo("New worker priority. %d->%d\n",
|
||||
wtcb->sched_priority, priority);
|
||||
sched_setpriority(wtcb, priority);
|
||||
}
|
||||
@@ -246,7 +246,7 @@ static inline bool pg_dequeue(void)
|
||||
/* Remove the TCB from the head of the list (if any) */
|
||||
|
||||
g_pftcb = (FAR struct tcb_s *)dq_remfirst((dq_queue_t *)&g_waitingforfill);
|
||||
pgllvdbg("g_pftcb: %p\n", g_pftcb);
|
||||
pgllinfo("g_pftcb: %p\n", g_pftcb);
|
||||
if (g_pftcb != NULL)
|
||||
{
|
||||
/* Call the architecture-specific function up_checkmapping() to see if
|
||||
@@ -292,7 +292,7 @@ static inline bool pg_dequeue(void)
|
||||
|
||||
/* Reduce the priority of the page fill worker thread */
|
||||
|
||||
pgllvdbg("New worker priority. %d->%d\n",
|
||||
pgllinfo("New worker priority. %d->%d\n",
|
||||
wtcb->sched_priority, priority);
|
||||
sched_setpriority(wtcb, priority);
|
||||
}
|
||||
@@ -365,7 +365,7 @@ static inline bool pg_startfill(void)
|
||||
* a page in-use, un-map it, and make it available.
|
||||
*/
|
||||
|
||||
pgllvdbg("Call up_allocpage(%p)\n", g_pftcb);
|
||||
pgllinfo("Call up_allocpage(%p)\n", g_pftcb);
|
||||
result = up_allocpage(g_pftcb, &vpage);
|
||||
DEBUGASSERT(result == OK);
|
||||
|
||||
@@ -382,7 +382,7 @@ static inline bool pg_startfill(void)
|
||||
* status of the fill will be provided by return value from up_fillpage().
|
||||
*/
|
||||
|
||||
pgllvdbg("Call up_fillpage(%p)\n", g_pftcb);
|
||||
pgllinfo("Call up_fillpage(%p)\n", g_pftcb);
|
||||
result = up_fillpage(g_pftcb, vpage);
|
||||
DEBUGASSERT(result == OK);
|
||||
#else
|
||||
@@ -395,7 +395,7 @@ static inline bool pg_startfill(void)
|
||||
* This callback will probably from interrupt level.
|
||||
*/
|
||||
|
||||
pgllvdbg("Call up_fillpage(%p)\n", g_pftcb);
|
||||
pgllinfo("Call up_fillpage(%p)\n", g_pftcb);
|
||||
result = up_fillpage(g_pftcb, vpage, pg_callback);
|
||||
DEBUGASSERT(result == OK);
|
||||
|
||||
@@ -454,7 +454,7 @@ static inline void pg_alldone(void)
|
||||
{
|
||||
FAR struct tcb_s *wtcb = this_task();
|
||||
g_pftcb = NULL;
|
||||
pgllvdbg("New worker priority. %d->%d\n",
|
||||
pgllinfo("New worker priority. %d->%d\n",
|
||||
wtcb->sched_priority, CONFIG_PAGING_DEFPRIO);
|
||||
sched_setpriority(wtcb, CONFIG_PAGING_DEFPRIO);
|
||||
}
|
||||
@@ -588,7 +588,7 @@ int pg_worker(int argc, char *argv[])
|
||||
* no fill was started).
|
||||
*/
|
||||
|
||||
pgllvdbg("Calling pg_startfill\n");
|
||||
pgllinfo("Calling pg_startfill\n");
|
||||
if (!pg_startfill())
|
||||
{
|
||||
/* No fill was started. This can mean only that all queued
|
||||
@@ -596,7 +596,7 @@ int pg_worker(int argc, char *argv[])
|
||||
* nothing more to do.
|
||||
*/
|
||||
|
||||
pgllvdbg("Call pg_alldone()\n");
|
||||
pgllinfo("Call pg_alldone()\n");
|
||||
pg_alldone();
|
||||
}
|
||||
}
|
||||
@@ -626,7 +626,7 @@ int pg_worker(int argc, char *argv[])
|
||||
* g_pftcb).
|
||||
*/
|
||||
|
||||
pgllvdbg("Calling pg_startfill\n");
|
||||
pgllinfo("Calling pg_startfill\n");
|
||||
(void)pg_startfill();
|
||||
}
|
||||
#else
|
||||
@@ -641,7 +641,7 @@ int pg_worker(int argc, char *argv[])
|
||||
* (false means that no fill was perforemd).
|
||||
*/
|
||||
|
||||
pgllvdbg("Calling pg_startfill\n");
|
||||
pgllinfo("Calling pg_startfill\n");
|
||||
if (!pg_startfill())
|
||||
{
|
||||
/* Break out of the loop -- there is nothing more to do */
|
||||
@@ -656,13 +656,13 @@ int pg_worker(int argc, char *argv[])
|
||||
* returns true.
|
||||
*/
|
||||
|
||||
pgllvdbg("Restarting TCB: %p\n", g_pftcb);
|
||||
pgllinfo("Restarting TCB: %p\n", g_pftcb);
|
||||
up_unblock_task(g_pftcb);
|
||||
}
|
||||
|
||||
/* All queued fills have been processed */
|
||||
|
||||
pgllvdbg("Call pg_alldone()\n");
|
||||
pgllinfo("Call pg_alldone()\n");
|
||||
pg_alldone();
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ static bool pthread_notifywaiters(FAR struct join_s *pjoin)
|
||||
int ntasks_waiting;
|
||||
int status;
|
||||
|
||||
svdbg("pjoin=0x%p\n", pjoin);
|
||||
sinfo("pjoin=0x%p\n", pjoin);
|
||||
|
||||
/* Are any tasks waiting for our exit value? */
|
||||
|
||||
@@ -205,7 +205,7 @@ int pthread_completejoin(pid_t pid, FAR void *exit_value)
|
||||
FAR struct task_group_s *group = task_getgroup(pid);
|
||||
FAR struct join_s *pjoin;
|
||||
|
||||
svdbg("pid=%d exit_value=%p group=%p\n", pid, exit_value, group);
|
||||
sinfo("pid=%d exit_value=%p group=%p\n", pid, exit_value, group);
|
||||
DEBUGASSERT(group);
|
||||
|
||||
/* First, find thread's structure in the private data set. */
|
||||
|
||||
@@ -359,7 +359,7 @@ int posix_spawn(FAR pid_t *pid, FAR const char *path,
|
||||
|
||||
DEBUGASSERT(path);
|
||||
|
||||
svdbg("pid=%p path=%s file_actions=%p attr=%p argv=%p\n",
|
||||
sinfo("pid=%p path=%s file_actions=%p attr=%p argv=%p\n",
|
||||
pid, path, file_actions, attr, argv);
|
||||
|
||||
/* If there are no file actions to be performed and there is no change to
|
||||
|
||||
@@ -350,7 +350,7 @@ int task_spawn(FAR pid_t *pid, FAR const char *name, main_t entry,
|
||||
#endif
|
||||
int ret;
|
||||
|
||||
svdbg("pid=%p name=%s entry=%p file_actions=%p attr=%p argv=%p\n",
|
||||
sinfo("pid=%p name=%s entry=%p file_actions=%p attr=%p argv=%p\n",
|
||||
pid, name, entry, file_actions, attr, argv);
|
||||
|
||||
/* If there are no file actions to be performed and there is no change to
|
||||
|
||||
@@ -83,7 +83,7 @@ static inline int spawn_close(FAR struct spawn_close_file_action_s *action)
|
||||
{
|
||||
/* The return value from close() is ignored */
|
||||
|
||||
svdbg("Closing fd=%d\n", action->fd);
|
||||
sinfo("Closing fd=%d\n", action->fd);
|
||||
|
||||
(void)close(action->fd);
|
||||
return OK;
|
||||
@@ -95,7 +95,7 @@ static inline int spawn_dup2(FAR struct spawn_dup2_file_action_s *action)
|
||||
|
||||
/* Perform the dup */
|
||||
|
||||
svdbg("Dup'ing %d->%d\n", action->fd1, action->fd2);
|
||||
sinfo("Dup'ing %d->%d\n", action->fd1, action->fd2);
|
||||
|
||||
ret = dup2(action->fd1, action->fd2);
|
||||
if (ret < 0)
|
||||
@@ -116,7 +116,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action)
|
||||
|
||||
/* Open the file */
|
||||
|
||||
svdbg("Open'ing path=%s oflags=%04x mode=%04x\n",
|
||||
sinfo("Open'ing path=%s oflags=%04x mode=%04x\n",
|
||||
action->path, action->oflags, action->mode);
|
||||
|
||||
fd = open(action->path, action->oflags, action->mode);
|
||||
@@ -134,7 +134,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action)
|
||||
{
|
||||
/* No.. dup2 to get the correct file number */
|
||||
|
||||
svdbg("Dup'ing %d->%d\n", fd, action->fd);
|
||||
sinfo("Dup'ing %d->%d\n", fd, action->fd);
|
||||
|
||||
ret = dup2(fd, action->fd);
|
||||
if (ret < 0)
|
||||
@@ -143,7 +143,7 @@ static inline int spawn_open(FAR struct spawn_open_file_action_s *action)
|
||||
sdbg("ERROR: dup2 failed: %d\n", ret);
|
||||
}
|
||||
|
||||
svdbg("Closing fd=%d\n", fd);
|
||||
sinfo("Closing fd=%d\n", fd);
|
||||
close(fd);
|
||||
}
|
||||
|
||||
@@ -246,7 +246,7 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr)
|
||||
|
||||
if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) == 0)
|
||||
{
|
||||
svdbg("Setting priority=%d for pid=%d\n",
|
||||
sinfo("Setting priority=%d for pid=%d\n",
|
||||
param.sched_priority, pid);
|
||||
|
||||
(void)sched_setparam(pid, ¶m);
|
||||
@@ -269,7 +269,7 @@ int spawn_execattrs(pid_t pid, FAR const posix_spawnattr_t *attr)
|
||||
|
||||
if ((attr->flags & POSIX_SPAWN_SETSCHEDULER) != 0)
|
||||
{
|
||||
svdbg("Setting policy=%d priority=%d for pid=%d\n",
|
||||
sinfo("Setting policy=%d priority=%d for pid=%d\n",
|
||||
attr->policy, param.sched_priority, pid);
|
||||
|
||||
#ifdef CONFIG_SCHED_SPORADIC
|
||||
|
||||
@@ -303,14 +303,14 @@ FAR struct task_tcb_s *task_vforksetup(start_t retaddr)
|
||||
|
||||
/* Initialize the task control block. This calls up_initial_state() */
|
||||
|
||||
svdbg("Child priority=%d start=%p\n", priority, retaddr);
|
||||
sinfo("Child priority=%d start=%p\n", priority, retaddr);
|
||||
ret = task_schedsetup(child, priority, retaddr, parent->entry.main, ttype);
|
||||
if (ret < OK)
|
||||
{
|
||||
goto errout_with_tcb;
|
||||
}
|
||||
|
||||
svdbg("parent=%p, returning child=%p\n", parent, child);
|
||||
sinfo("parent=%p, returning child=%p\n", parent, child);
|
||||
return child;
|
||||
|
||||
errout_with_tcb:
|
||||
@@ -369,7 +369,7 @@ pid_t task_vforkstart(FAR struct task_tcb_s *child)
|
||||
int rc;
|
||||
int ret;
|
||||
|
||||
svdbg("Starting Child TCB=%p, parent=%p\n", child, this_task());
|
||||
sinfo("Starting Child TCB=%p, parent=%p\n", child, this_task());
|
||||
DEBUGASSERT(child);
|
||||
|
||||
/* Duplicate the original argument list in the forked child TCB */
|
||||
|
||||
@@ -152,7 +152,7 @@ int work_hpstart(void)
|
||||
|
||||
/* Start the high-priority, kernel mode worker thread */
|
||||
|
||||
svdbg("Starting high-priority kernel worker thread\n");
|
||||
sinfo("Starting high-priority kernel worker thread\n");
|
||||
|
||||
pid = kernel_thread(HPWORKNAME, CONFIG_SCHED_HPWORKPRIORITY,
|
||||
CONFIG_SCHED_HPWORKSTACKSIZE,
|
||||
|
||||
@@ -197,7 +197,7 @@ int work_lpstart(void)
|
||||
|
||||
/* Start the low-priority, kernel mode worker thread(s) */
|
||||
|
||||
svdbg("Starting low-priority kernel worker thread(s)\n");
|
||||
sinfo("Starting low-priority kernel worker thread(s)\n");
|
||||
|
||||
for (wndx = 0; wndx < CONFIG_SCHED_LPNTHREADS; wndx++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user