Merge /users/m4burns/pos
This commit is contained in:
commit
787da7bab2
|
@ -6,7 +6,7 @@ CXXFLAGS = -g -O0 -Wall -I/users/m4burns/thrift/include/thrift -I. -Igen-cpp
|
||||||
else
|
else
|
||||||
CXXFLAGS = -O3 -fexpensive-optimizations -ffast-math -fno-math-errno -Wall -I/users/m4burns/thrift/include/thrift -I. -Igen-cpp
|
CXXFLAGS = -O3 -fexpensive-optimizations -ffast-math -fno-math-errno -Wall -I/users/m4burns/thrift/include/thrift -I. -Igen-cpp
|
||||||
endif
|
endif
|
||||||
LDFLAGS = /users/m4burns/thrift/lib//libthrift.a
|
LDFLAGS = /users/m4burns/thrift/lib/libthriftnb.a /users/m4burns/thrift/lib/libthrift.a -levent
|
||||||
|
|
||||||
SOURCES = ConfigFile.cpp db.cpp db_if.cpp linus_sha1.c log.cpp nameserver.cpp sha1.cpp gen-cpp/pos_constants.cpp gen-cpp/Pos.cpp gen-cpp/pos_types.cpp
|
SOURCES = ConfigFile.cpp db.cpp db_if.cpp linus_sha1.c log.cpp nameserver.cpp sha1.cpp gen-cpp/pos_constants.cpp gen-cpp/Pos.cpp gen-cpp/pos_types.cpp
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include "Pos.h"
|
#include "Pos.h"
|
||||||
#include <protocol/TBinaryProtocol.h>
|
#include <protocol/TBinaryProtocol.h>
|
||||||
#include <server/TSimpleServer.h>
|
#include <server/TNonblockingServer.h>
|
||||||
#include <transport/TServerSocket.h>
|
#include <transport/TServerSocket.h>
|
||||||
#include <transport/TBufferTransports.h>
|
#include <transport/TBufferTransports.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
@ -161,11 +161,8 @@ int main(int argc, char **argv) {
|
||||||
|
|
||||||
shared_ptr<PosHandler> handler(new PosHandler());
|
shared_ptr<PosHandler> handler(new PosHandler());
|
||||||
shared_ptr<TProcessor> processor(new PosProcessor(handler));
|
shared_ptr<TProcessor> processor(new PosProcessor(handler));
|
||||||
shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));
|
|
||||||
shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
|
|
||||||
shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
|
|
||||||
|
|
||||||
TSimpleServer server(processor, serverTransport, transportFactory, protocolFactory);
|
TNonblockingServer server(processor, port);
|
||||||
server.serve();
|
server.serve();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue