NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

日志输出增加一层输出，以实现嵌套任务缩进输出

This commit is contained in:
大石头X2 2017-02-14 11:20:24 +08:00
parent cb255bc400
commit 0ee1dae747
2 changed files with 71 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Kernel/Sys.cpp
View File

@ -231,6 +231,70 @@ void TSys::Delay(uint us) const
#endif #endif
#endif #endif
/****************系统日志****************/
#include <stdarg.h>
// 打印日志
extern int SmartOS_Log(const String& msg);
extern "C"
{
// 是否新行结尾
static bool newline = false;
int SmartOS_printf(const char* format, ...)
{
if(Sys.Clock == 0 || Sys.MessagePort == COM_NONE) return 0;
char cs[512];
int tab = 0;
// 先根据子任务打印缩进级别
int deepth = Task::Scheduler()->Deepth - 1;
if(newline && deepth > 0 && (format[0] != '\0' || format[1] != '\0' || format[2] != '\0'))
{
String fm = format;
if(fm.Length() == 1)
{
tab = 0;
}
for(int i=0; i<deepth; i++)
cs[tab++] = '\t';
tab += snprintf(&cs[tab], sizeof(cs) - tab, "%d=>", Task::Current().ID);
}
va_list ap;
va_start(ap, format);
//int rs = printf(format, ap);
int rs = vsnprintf(&cs[tab], sizeof(cs) - tab, format, ap);
va_end(ap);
// 如果格式化得到为空，则不做输出
if(rs == 0) return rs;
newline = cs[tab + rs - 1] == '\r' || cs[tab + rs - 1] == '\n';
rs += SmartOS_Log(String(cs, tab + rs));
return rs;
}
/* 重载fputc可以让用户程序使用printf函数 */
int fputc(int ch, FILE *f)
{
#if DEBUG
if(Sys.Clock == 0) return ch;
int idx = Sys.MessagePort;
if(idx == COM_NONE) return ch;
byte b = ch;
SmartOS_Log(String((cstring)&b, 1));
#endif
return ch;
}
}
/****************系统跟踪****************/ /****************系统跟踪****************/
//#if DEBUG //#if DEBUG

68
Platform/CortexM/Sys.cpp
View File

@ -334,68 +334,14 @@ ushort _REV16(ushort value) { return __REV16(value); }
#include "Device\SerialPort.h" #include "Device\SerialPort.h"
#include "Kernel\Task.h" #include "Kernel\Task.h"
extern "C" // 打印日志
int SmartOS_Log(const String& msg)
{ {
// 是否新行结尾 if(Sys.Clock == 0 || Sys.MessagePort == COM_NONE) return 0;
static bool newline = false;
int SmartOS_printf(const char* format, ...) // 检查并打开串口
{ auto sp = SerialPort::GetMessagePort();
if(Sys.Clock == 0 || Sys.MessagePort == COM_NONE) return 0; if(!sp || !sp->Opened) return 0;
// 检查并打开串口 return sp->Write(msg);
auto sp = SerialPort::GetMessagePort();
if(!sp || !sp->Opened) return 0;
char cs[512];
int tab = 0;
// 先根据子任务打印缩进级别
int deepth = Task::Scheduler()->Deepth - 1;
if(newline && deepth > 0 && (format[0] != '\0' || format[1] != '\0' || format[2] != '\0'))
{
String fm = format;
if(fm.Length() == 1)
{
tab = 0;
}
for(int i=0; i<deepth; i++)
cs[tab++] = '\t';
tab += snprintf(&cs[tab], sizeof(cs) - tab, "%d=>", Task::Current().ID);
}
va_list ap;
va_start(ap, format);
//int rs = printf(format, ap);
int rs = vsnprintf(&cs[tab], sizeof(cs) - tab, format, ap);
va_end(ap);
// 如果格式化得到为空，则不做输出
if(rs == 0) return rs;
newline = cs[tab + rs - 1] == '\r' || cs[tab + rs - 1] == '\n';
sp->Write(Buffer(cs, tab + rs));
return rs;
}
/* 重载fputc可以让用户程序使用printf函数 */
int fputc(int ch, FILE *f)
{
#if DEBUG
if(Sys.Clock == 0) return ch;
int idx = Sys.MessagePort;
if(idx == COM_NONE) return ch;
// 检查并打开串口
auto sp = SerialPort::GetMessagePort();
if(!sp) return 0;
byte b = ch;
sp->Write(Buffer(&b, 1));
#endif
return ch;
}
} }