opensci
/
gStore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix a bug in Socket::recv().

This commit is contained in:
Caesar11 2015-01-12 03:59:37 -05:00
parent 49ad0c5493
commit f1d3e2c3b8
3 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Query/BasicQuery.cpp
View File

@ -11,22 +11,7 @@
/* _query is a SPARQL query string */ /* _query is a SPARQL query string */
BasicQuery::BasicQuery(const string _query) BasicQuery::BasicQuery(const string _query)
{ {
this->option_vs.clear(); this->initial();
this->triple_vt.clear();
this->var_str2id.clear();
this->var_degree = NULL;
this->is_literal_candidate_added = NULL;
this->edge_id = NULL;
this->edge_nei_id = NULL;
this->edge_pre_id = NULL;
this->edge_type = NULL;
this->var_sig = NULL;
this->edge_sig = NULL;
this->encode_method = BasicQuery::NOT_JUST_SELECT;
this->candidate_list = NULL;
this->graph_var_num = 0;
this->select_var_num = 0;
this->var_name = 0;
} }
BasicQuery::~BasicQuery() BasicQuery::~BasicQuery()
@ -410,6 +395,25 @@ const Triple& BasicQuery::getTriple(int _i_th_triple)
} }
/* private methods */ /* private methods */
void BasicQuery::null_initial()
{
this->option_vs.clear();
this->triple_vt.clear();
this->var_str2id.clear();
this->var_degree = NULL;
this->is_literal_candidate_added = NULL;
this->edge_id = NULL;
this->edge_nei_id = NULL;
this->edge_pre_id = NULL;
this->edge_type = NULL;
this->var_sig = NULL;
this->edge_sig = NULL;
this->encode_method = BasicQuery::NOT_JUST_SELECT;
this->candidate_list = NULL;
this->graph_var_num = 0;
this->select_var_num = 0;
this->var_name = 0;
}
void BasicQuery::initial() void BasicQuery::initial()
{ {

1
Query/BasicQuery.h
View File

@ -71,6 +71,7 @@ private:
void findVarNotInSelect(); void findVarNotInSelect();
void buildTuple2Freq(); void buildTuple2Freq();
void initial(); void initial();
void null_initial();
public: public:
static const char EDGE_IN = 'i'; static const char EDGE_IN = 'i';

29
Server/Socket.cpp
View File

@ -178,22 +178,25 @@ int Socket::recv(std::string& _msg)const
} }
char* buf = new char[msg_len]; char* buf = new char[msg_len];
recv_return = ::recv(this->sock, buf, msg_len, 0); int recv_len = 0;
do
if (recv_return == -1)
{ {
std::cerr << "receive message context error, errno=" << errno << ".@Socket::recv" << std::endl; int cur_len = ::recv(this->sock, buf + recv_len, msg_len - recv_len, 0);
delete[] buf;
return 0; if (cur_len == -1)
} {
else std::cerr << "receive message context error, errno=" << errno << ".@Socket::recv" << std::endl;
{ delete[] buf;
_msg = buf;
delete[] buf;
return recv_return; return 0;
} }
recv_len += cur_len;
}while (recv_len < msg_len);
_msg = buf;
delete[] buf;
return msg_len;
} }
bool Socket::connect(const std::string _hostname, const unsigned short _port) bool Socket::connect(const std::string _hostname, const unsigned short _port)