senset/vnpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] 去掉get...中的异常捕获

Browse Source 
异常会被上层捕获，即pybind11.
pybind11会将异常转化为python异常然后回传到python之中。
This commit is contained in:
nanoric 2019-02-14 03:09:01 -04:00
parent 8c0d11d601
commit 92d488e640
1 changed files with 59 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
vnpy/api/ctp/vnctp/vnctp.h
View File

@ -18,125 +18,95 @@ using namespace pybind11;
//任务结构体 //任务结构体
struct Task struct Task
{ {
int task_name; //回调函数名称对应的常量 int task_name; //回调函数名称对应的常量
void *task_data; //数据指针 void *task_data; //数据指针
void *task_error; //错误指针 void *task_error; //错误指针
int task_id; //请求id int task_id; //请求id
bool task_last; //是否为最后返回 bool task_last; //是否为最后返回
}; };
class TaskQueue class TaskQueue
{ {
private: private:
queue<Task> queue_; //标准库队列 queue<Task> queue_; //标准库队列
mutex mutex_; //互斥锁 mutex mutex_; //互斥锁
condition_variable cond_; //条件变量 condition_variable cond_; //条件变量
public: public:
//存入新的任务 //存入新的任务
void push(const Task &task) void push(const Task &task)
{ {
unique_lock<mutex > mlock(mutex_); unique_lock<mutex > mlock(mutex_);
queue_.push(task); //向队列中存入数据 queue_.push(task); //向队列中存入数据
mlock.unlock(); //释放锁 mlock.unlock(); //释放锁
cond_.notify_one(); //通知正在阻塞等待的线程 cond_.notify_one(); //通知正在阻塞等待的线程
} }
//取出老的任务 //取出老的任务
Task pop() Task pop()
{ {
unique_lock<mutex> mlock(mutex_); unique_lock<mutex> mlock(mutex_);
while (queue_.empty()) //当队列为空时 while (queue_.empty()) //当队列为空时
{ {
cond_.wait(mlock); //等待条件变量通知 cond_.wait(mlock); //等待条件变量通知
} }
Task task = queue_.front(); //获取队列中的最后一个任务 Task task = queue_.front(); //获取队列中的最后一个任务
queue_.pop(); //删除该任务 queue_.pop(); //删除该任务
return task; //返回该任务 return task; //返回该任务
} }
}; };
//从字典中获取某个建值对应的整数，并赋值到请求结构体对象的值上 //从字典中获取某个建值对应的整数，并赋值到请求结构体对象的值上
void getInt(dict d, const char *key, int *value) void getInt(const dict &d, const char *key, int *value)
{ {
if (d.contains(key)) //检查字典中是否存在该键值 if (d.contains(key)) //检查字典中是否存在该键值
{ {
object o = d[key]; //获取该键值 object o = d[key]; //获取该键值
try *value = o.cast<int>();
{ }
*value = o.cast<int>();
}
catch (const error_already_set &e)
{
cout << e.what() << endl;
}
}
}; };
//从字典中获取某个建值对应的浮点数，并赋值到请求结构体对象的值上 //从字典中获取某个建值对应的浮点数，并赋值到请求结构体对象的值上
void getDouble(dict d, const char *key, double *value) void getDouble(const dict &d, const char *key, double *value)
{ {
if (d.contains(key)) if (d.contains(key))
{ {
object o = d[key]; object o = d[key];
try *value = o.cast<double>();
{ }
*value = o.cast<double>();
}
catch (const error_already_set &e)
{
cout << e.what() << endl;
}
}
}; };
//从字典中获取某个建值对应的字符，并赋值到请求结构体对象的值上 //从字典中获取某个建值对应的字符，并赋值到请求结构体对象的值上
void getChar(dict d, const char *key, char *value) void getChar(const dict &d, const char *key, char *value)
{ {
if (d.contains(key)) if (d.contains(key))
{ {
object o = d[key]; object o = d[key];
*value = o.cast<char>();
try }
{
*value = o.cast<char>();
}
catch (const error_already_set &e)
{
cout << e.what() << endl;
}
}
}; };
//从字典中获取某个建值对应的字符串，并赋值到请求结构体对象的值上 template <size_t size>
void getString(dict d, const char *key, char *value) using string_literal = char[size];
{
if (d.contains(key))
{
object o = d[key];
try
{
string s = o.cast<string>();
const char *buf = s.c_str();
#ifdef _MSC_VER //WIN32 //从字典中获取某个建值对应的字符串，并赋值到请求结构体对象的值上
strcpy_s(value, strlen(buf) + 1, buf); template <size_t size>
#elif __GNUC__ void getString(const pybind11::dict &d, const char *key, string_literal<size> &value)
strncpy(value, buffer, strlen(buffer) + 1); {
#endif if (d.contains(key))
} {
catch (const error_already_set &e) object o = d[key];
{ std::string s = o.cast<std::string>();
cout << e.what() << endl; const char *buf = s.c_str();
} strcpy(value, buf);
} }
}; };
//将GBK编码的字符串转换为UTF8 //将GBK编码的字符串转换为UTF8