提交 cedbc161 编写于 作者: D dongdaxiang

add more _LINUX maroc on data_feed.cc for mac and window compile

test=develop
上级 c5980c35
...@@ -440,6 +440,7 @@ void MultiSlotDataFeed::Init( ...@@ -440,6 +440,7 @@ void MultiSlotDataFeed::Init(
} }
void MultiSlotDataFeed::ReadThread() { void MultiSlotDataFeed::ReadThread() {
#ifdef _LINUX
std::string filename; std::string filename;
while (PickOneFile(&filename)) { while (PickOneFile(&filename)) {
int err_no = 0; int err_no = 0;
...@@ -455,9 +456,11 @@ void MultiSlotDataFeed::ReadThread() { ...@@ -455,9 +456,11 @@ void MultiSlotDataFeed::ReadThread() {
VLOG(3) << "filename: " << filename << " inst num: " << ins_num; VLOG(3) << "filename: " << filename << " inst num: " << ins_num;
} }
queue_->Close(); queue_->Close();
#endif
} }
bool MultiSlotDataFeed::CheckFile(const char* filename) { bool MultiSlotDataFeed::CheckFile(const char* filename) {
#ifdef _LINUX
CheckInit(); // get info of slots CheckInit(); // get info of slots
std::ifstream fin(filename); std::ifstream fin(filename);
if (!fin.good()) { if (!fin.good()) {
...@@ -565,11 +568,13 @@ bool MultiSlotDataFeed::CheckFile(const char* filename) { ...@@ -565,11 +568,13 @@ bool MultiSlotDataFeed::CheckFile(const char* filename) {
} }
VLOG(3) << "instances cout: " << instance_cout; VLOG(3) << "instances cout: " << instance_cout;
VLOG(3) << "The file format is correct"; VLOG(3) << "The file format is correct";
#endif
return true; return true;
} }
bool MultiSlotDataFeed::ParseOneInstanceFromPipe( bool MultiSlotDataFeed::ParseOneInstanceFromPipe(
std::vector<MultiSlotType>* instance) { std::vector<MultiSlotType>* instance) {
#ifdef _LINUX
thread_local string::LineFileReader reader; thread_local string::LineFileReader reader;
if (!reader.getline(&*(fp_.get()))) { if (!reader.getline(&*(fp_.get()))) {
...@@ -618,6 +623,9 @@ bool MultiSlotDataFeed::ParseOneInstanceFromPipe( ...@@ -618,6 +623,9 @@ bool MultiSlotDataFeed::ParseOneInstanceFromPipe(
} }
return true; return true;
} }
#else
return true;
#endif
} }
bool MultiSlotDataFeed::ParseOneInstance(std::vector<MultiSlotType>* instance) { bool MultiSlotDataFeed::ParseOneInstance(std::vector<MultiSlotType>* instance) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册