--- a/src/network/cgi/inserter.cpp +++ b/src/network/cgi/inserter.cpp @@ -50,8 +50,8 @@ tag_inserter::~tag_inserter() { - shared_ptr elem(new tag_elem(name, attrs)); - vector > children=b.leave(); + pfi::lang::shared_ptr elem(new tag_elem(name, attrs)); + vector > children=b.leave(); for (int i=0;i<(int)children.size();i++) elem->add_child(children[i]); b.push(elem); @@ -59,12 +59,12 @@ text_inserter::text_inserter(const string &text, xhtml_builder &b) { - b.push(shared_ptr(new text_elem(text))); + b.push(pfi::lang::shared_ptr(new text_elem(text))); } prim_inserter::prim_inserter(const string &text, xhtml_builder &b) { - b.push(shared_ptr(new prim_elem(text))); + b.push(pfi::lang::shared_ptr(new prim_elem(text))); } } // cgi --- a/src/network/cgi/server.cpp +++ b/src/network/cgi/server.cpp @@ -161,12 +161,12 @@ <<", thread-num="< gen_resp(stringstream &ss) +static pfi::lang::shared_ptr gen_resp(stringstream &ss) { http::header head(ss); @@ -210,7 +210,7 @@ head.erase("status"); } - shared_ptr resp(new http::response(code, reason)); + pfi::lang::shared_ptr resp(new http::response(code, reason)); head["Content-Type"]=content_type; @@ -232,10 +232,10 @@ } void run_server::process(socket_type ssock, - shared_ptr cc) + pfi::lang::shared_ptr cc) { for (;;){ - shared_ptr sock(ssock->accept()); + pfi::lang::shared_ptr sock(ssock->accept()); if (!sock) continue; if (ssock->timeout()>0 && !sock->set_timeout(ssock->timeout())) @@ -272,7 +272,7 @@ cc->exec(req.body(), sout, cerr, env); - shared_ptr resp=gen_resp(sout); + pfi::lang::shared_ptr resp=gen_resp(sout); resp->send(sock); } catch(const exception &e){ --- a/src/network/http/base.cpp +++ b/src/network/http/base.cpp @@ -61,7 +61,7 @@ { } -void header::read_header(function f) +void header::read_header(pfi::lang::function f) { string line, key, val; if (!f(&line)) @@ -124,7 +124,7 @@ return sock->getline(*str, line_limit); } -header::header(shared_ptr sock) +header::header(pfi::lang::shared_ptr sock) { read_header(bind(&socket_getline, sock.get(), _1, line_limit)); } @@ -211,7 +211,7 @@ return dat.end(); } -void header::send(shared_ptr sock) +void header::send(pfi::lang::shared_ptr sock) { for (int i=0;i<(int)dat.size();i++){ string line=dat[i].first+": "+dat[i].second+"\r\n"; @@ -228,7 +228,7 @@ public: typedef C char_type; - basic_httpbody_chunked_streambuf(shared_ptr sock) + basic_httpbody_chunked_streambuf(pfi::lang::shared_ptr sock) : sock(sock) , chunk_rest(0) , buf(buf_size) @@ -321,7 +321,7 @@ iss>>hex>>chunk_rest; } - shared_ptr sock; + pfi::lang::shared_ptr sock; int chunk_rest; @@ -334,7 +334,7 @@ public: typedef C char_type; - basic_httpbody_streambuf(shared_ptr sock, int length) + basic_httpbody_streambuf(pfi::lang::shared_ptr sock, int length) : sock(sock) , rest(length) , buf(T::eof()){ @@ -359,7 +359,7 @@ } private: - shared_ptr sock; + pfi::lang::shared_ptr sock; int rest; int buf; @@ -368,7 +368,7 @@ template > class basic_httpbody_chunked_stream : public basic_iostream{ public: - basic_httpbody_chunked_stream(shared_ptr sock) + basic_httpbody_chunked_stream(pfi::lang::shared_ptr sock) : basic_iostream() , buf(sock){ this->init(&buf); @@ -380,7 +380,7 @@ template > class basic_httpbody_stream : public basic_iostream{ public: - basic_httpbody_stream(shared_ptr sock, int len) + basic_httpbody_stream(pfi::lang::shared_ptr sock, int len) : basic_iostream() , buf(sock, len){ this->init(&buf); @@ -406,7 +406,7 @@ { } -request::request(shared_ptr sock) +request::request(pfi::lang::shared_ptr sock) : method_("") , uri_("/") , version_(1,1) @@ -438,11 +438,11 @@ // body if (cicmp(header_["Transfer-Encoding"],"chunked")) - stream=shared_ptr(new basic_httpbody_chunked_stream(sock)); + stream=pfi::lang::shared_ptr(new basic_httpbody_chunked_stream(sock)); else if (header_["Content-Length"]!="") - stream=shared_ptr(new basic_httpbody_stream(sock, lexical_cast(header_["Content-Length"]))); + stream=pfi::lang::shared_ptr(new basic_httpbody_stream(sock, lexical_cast(header_["Content-Length"]))); else - stream=shared_ptr(new socketstream(sock)); + stream=pfi::lang::shared_ptr(new socketstream(sock)); } request::~request() @@ -474,7 +474,7 @@ return *stream; } -void request::send(shared_ptr sock) +void request::send(pfi::lang::shared_ptr sock) { stringstream *ss=dynamic_cast(stream.get()); if (!ss) throw http_exception("body is not stringstream"); @@ -499,7 +499,7 @@ if (sock->flush()>=0) throw http_exception("flush failed"); if (dat.length()==0) - stream=shared_ptr(new socketstream(sock)); + stream=pfi::lang::shared_ptr(new socketstream(sock)); } response::response() @@ -518,7 +518,7 @@ { } -response::response(shared_ptr sock) +response::response(pfi::lang::shared_ptr sock) { // status-line { @@ -546,11 +546,11 @@ // body if (cicmp(header_["Transfer-Encoding"],"chunked")) - stream=shared_ptr(new basic_httpbody_chunked_stream(sock)); + stream=pfi::lang::shared_ptr(new basic_httpbody_chunked_stream(sock)); else if (header_["Content-Length"]!="") - stream=shared_ptr(new basic_httpbody_stream(sock, lexical_cast(header_["Content-Length"]))); + stream=pfi::lang::shared_ptr(new basic_httpbody_stream(sock, lexical_cast(header_["Content-Length"]))); else - stream=shared_ptr(new socketstream(sock)); + stream=pfi::lang::shared_ptr(new socketstream(sock)); } response::~response() @@ -582,7 +582,7 @@ return *stream; } -void response::send(shared_ptr sock) +void response::send(pfi::lang::shared_ptr sock) { stringstream *ss=dynamic_cast(stream.get()); if (!ss) throw http_exception("body is not stringstream"); @@ -607,7 +607,7 @@ if (sock->flush()>=0) throw http_exception("flush failed"); if (dat.length()==0) - stream=shared_ptr(new socketstream(sock)); + stream=pfi::lang::shared_ptr(new socketstream(sock)); } } // http --- a/src/network/rpc/base.cpp +++ b/src/network/rpc/base.cpp @@ -59,20 +59,20 @@ { } -void rpc_server::add(const string &name, shared_ptr invoker) +void rpc_server::add(const string &name, pfi::lang::shared_ptr invoker) { funcs[name]=invoker; } bool rpc_server::serv(uint16_t port, int nthreads) { - shared_ptr ssock(new server_socket()); + pfi::lang::shared_ptr ssock(new server_socket()); if (!ssock->create(port)) return false; - vector > ths(nthreads); + vector > ths(nthreads); for (int i=0; i(new thread(bind(&rpc_server::process, this, ssock))); + ths[i]=pfi::lang::shared_ptr(new thread(bind(&rpc_server::process, this, ssock))); if (!ths[i]->start()) return false; } for (int i=0; i ssock) +void rpc_server::process(pfi::lang::shared_ptr ssock) { for (;;){ - shared_ptr sock(ssock->accept()); + pfi::lang::shared_ptr sock(ssock->accept()); if (!sock) continue; sock->set_nodelay(true); @@ -139,11 +139,11 @@ { } -shared_ptr rpc_client::get_connection() +pfi::lang::shared_ptr rpc_client::get_connection() { for (int i=0;i<2;i++){ if (!ss || !(*ss)){ - ss=shared_ptr(new socketstream(host, port)); + ss=pfi::lang::shared_ptr(new socketstream(host, port)); if (!(*ss)){ ss.reset(); continue; @@ -180,7 +180,7 @@ return ss; } -void rpc_client::return_connection(shared_ptr css) +void rpc_client::return_connection(pfi::lang::shared_ptr css) { ss=css; } --- a/src/network/socket.cpp +++ b/src/network/socket.cpp @@ -58,7 +58,7 @@ namespace pfi{ namespace network{ -shared_ptr stream_socket::resolver; +pfi::lang::shared_ptr stream_socket::resolver; r_mutex stream_socket::resolver_m; class sigign{ @@ -88,7 +88,7 @@ close(); } -void stream_socket::set_dns_resolver(shared_ptr r) +void stream_socket::set_dns_resolver(pfi::lang::shared_ptr r) { synchronized(resolver_m) resolver=r; @@ -106,10 +106,10 @@ return false; } - shared_ptr res; + pfi::lang::shared_ptr res; synchronized(resolver_m){ if (!resolver) - set_dns_resolver(shared_ptr + set_dns_resolver(pfi::lang::shared_ptr (new normal_dns_resolver())); res=resolver; }