diff options
| author | Tim Redfern <tim@herge.(none)> | 2013-08-08 13:32:46 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@herge.(none)> | 2013-08-08 13:32:46 +0100 |
| commit | a2254447b138af7fc0719e5a107816487255736b (patch) | |
| tree | fc72463364bd158b5a042ac821766f466efdfcb0 /processmodel | |
| parent | 1f8aca919df6ab2d2636cddaa30de1e388b4c09d (diff) | |
basic speed control for video_loader
Diffstat (limited to 'processmodel')
| -rw-r--r-- | processmodel/Makefile | 252 | ||||
| -rw-r--r-- | processmodel/processmodel.cpp | 296 | ||||
| -rw-r--r-- | processmodel/rendercontext_src/Makefile | 252 | ||||
| -rw-r--r-- | processmodel/rendercontext_src/rendercontext.cpp | 45 |
4 files changed, 0 insertions, 845 deletions
diff --git a/processmodel/Makefile b/processmodel/Makefile deleted file mode 100644 index d2546e0..0000000 --- a/processmodel/Makefile +++ /dev/null @@ -1,252 +0,0 @@ -# The pre-processor and compiler options. - -#http://docs.gstreamer.com/display/GstSDK/Installing+on+Linux - -#MY_CFLAGS = -fpermissive -std=c++11 -Wno-error -I /opt/gstreamer-sdk/include/gstreamer-0.10/ -I /opt/gstreamer-sdk/include/glib-2.0 -I /opt/gstreamer-sdk/lib/glib-2.0/include -I /opt/gstreamer-sdk/include/libxml2 $(shell pkg-config gstreamer-0.10 gstreamer-video-0.10 gstreamer-base-0.10 --cflags) -MY_CFLAGS = -fpermissive -std=c++11 -#-Wno-error $(shell pkg-config gstreamer-0.10 gstreamer-video-0.10 gstreamer-base-0.10 --cflags) - -# -I ../ffmpeg - -# The linker options.libgstaasinklibgstaasink.so -MY_LIBS = -lPocoNet -lPocoXML -lPocoUtil -lPocoFoundation -lvamp-hostsdk -lsndfile -L /usr/local/lib -lswscale -lavcodec -lavformat -lavfilter -lavdevice -lavutil -#MY_LIBS = -lPocoNet -lPocoXML -lPocoUtil -lPocoFoundation -lvamp-hostsdk -lsndfile -L /usr/local/lib -lswscale -lavcodec -lavformat -lavfilter -lavdevice -lavutil $(shell pkg-config gstreamer-0.10 gstreamer-video-0.10 gstreamer-base-0.10 --libs) -# -lgstreamer-0.10 -lgstreamer-video-0.10 -lgstreamer-base-0.10 -lglib-2.0 -lgstapp-0.10 -#MY_LIBS = ../libavcodec/ffmpeg/libavcodec/libavcodec.a ../libavcodec/ffmpeg/libavutil/libavutil.a ../libavcodec/ffmpeg/libavformat/libavformat.a ../libavcodec/ffmpeg/libavfilter/libavfilter.a ../libavcodec/ffmpeg/libavdevice/libavdevice.a -lPocoNet -lPocoXML -lPocoUtil -lPocoFoundation -lvamp-hostsdk -#GAH! HARD! - -# The pre-processor options used by the cpp (man cpp for more). -CPPFLAGS = -Wall - -# The options used in linking as well as in any direct use of ld. -LDFLAGS = - -# The directories in which source files reside. -# If not specified, only the current directory will be serached. -SRCDIRS = - -# The executable file name. -# If not specified, current directory name or `a.out' will be used. -PROGRAM = - -## Implicit Section: change the following only when necessary. -##========================================================================== - -# The source file types (headers excluded). -# .c indicates C source files, and others C++ ones. -SRCEXTS = .c .C .cc .cpp .CPP .c++ .cxx .cp - -# The header file types. -HDREXTS = .h .H .hh .hpp .HPP .h++ .hxx .hp - -# The pre-processor and compiler options. -# Users can override those variables from the command line. -CFLAGS = -g -O2 -CXXFLAGS= - -# The C program compiler. -#CC = gcc - -# The C++ program compiler. -#CXX = g++ - -# Un-comment the following line to compile C programs as C++ ones. -#CC = $(CXX) - -# The command used to delete file. -RM = rm -f - -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -## Stable Section: usually no need to be changed. But you can add more. -##========================================================================== -SHELL = /bin/sh -EMPTY = -SPACE = $(EMPTY) $(EMPTY) -ifeq ($(PROGRAM),) - CUR_PATH_NAMES = $(subst /,$(SPACE),$(subst $(SPACE),_,$(CURDIR))) - PROGRAM = $(word $(words $(CUR_PATH_NAMES)),$(CUR_PATH_NAMES)) - ifeq ($(PROGRAM),) - PROGRAM = a.out - endif -endif -ifeq ($(SRCDIRS),) - SRCDIRS = . -endif -SOURCES = $(foreach d,$(SRCDIRS),$(wildcard $(addprefix $(d)/*,$(SRCEXTS)))) -HEADERS = $(foreach d,$(SRCDIRS),$(wildcard $(addprefix $(d)/*,$(HDREXTS)))) -SRC_CXX = $(filter-out %.c,$(SOURCES)) -OBJS = $(addsuffix .o, $(basename $(SOURCES))) -DEPS = $(OBJS:.o=.d) - -## Define some useful variables. -DEP_OPT = $(shell if `$(CC) --version | grep "GCC" >/dev/null`; then \ - echo "-MM -MP"; else echo "-M"; fi ) -DEPEND = $(CC) $(DEP_OPT) $(MY_CFLAGS) $(CFLAGS) $(CPPFLAGS) -DEPEND.d = $(subst -g ,,$(DEPEND)) -COMPILE.c = $(CC) $(MY_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c -COMPILE.cxx = $(CXX) $(MY_CFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -LINK.c = $(CC) $(MY_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -LINK.cxx = $(CXX) $(MY_CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) - -.PHONY: all objs tags ctags clean distclean help show install - -# Delete the default suffixes -.SUFFIXES: - -all: Release - -Clang: CXX = clang - -Clang: $(PROGRAM) - -Release: CXXFLAGS += -O2 - -Release: $(PROGRAM) - -Debug: CXXFLAGS += -g3 - -Debug: $(PROGRAM) - -prefix=/usr/local - -Install: rotord - strip rotord - install -m 0755 rotord $(prefix)/bin - - -# Rules for creating dependency files (.d). -#------------------------------------------ - -%.d:%.c - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.C - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.cc - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.cpp - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.CPP - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.c++ - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.cp - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.cxx - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -# Rules for generating object files (.o). -#---------------------------------------- -objs:$(OBJS) - -%.o:%.c - $(COMPILE.c) $< -o $@ - -%.o:%.C - $(COMPILE.cxx) $< -o $@ - -%.o:%.cc - $(COMPILE.cxx) $< -o $@ - -%.o:%.cpp - $(COMPILE.cxx) $< -o $@ - -%.o:%.CPP - $(COMPILE.cxx) $< -o $@ - -%.o:%.c++ - $(COMPILE.cxx) $< -o $@ - -%.o:%.cp - $(COMPILE.cxx) $< -o $@ - -%.o:%.cxx - $(COMPILE.cxx) $< -o $@ - -# Rules for generating the tags. -#------------------------------------- -tags: $(HEADERS) $(SOURCES) - $(ETAGS) $(ETAGSFLAGS) $(HEADERS) $(SOURCES) - -ctags: $(HEADERS) $(SOURCES) - $(CTAGS) $(CTAGSFLAGS) $(HEADERS) $(SOURCES) - -# Rules for generating the executable. -#------------------------------------- -$(PROGRAM):$(OBJS) -ifeq ($(SRC_CXX),) # C program - $(LINK.c) $(OBJS) $(MY_LIBS) -o $@ - @echo Type ./$@ to execute the program. -else # C++ program - $(LINK.cxx) $(OBJS) $(MY_LIBS) -o $@ - @echo Type ./$@ to execute the program. -endif - -ifndef NODEP -ifneq ($(DEPS),) - sinclude $(DEPS) -endif -endif - - -clean: - $(RM) $(OBJS) $(PROGRAM) $(PROGRAM).exe - -distclean: clean - $(RM) $(DEPS) TAGS - -# Show help. -help: - @echo 'Generic Makefile for C/C++ Programs (gcmakefile) version 0.5' - @echo 'Copyright (C) 2007, 2008 whyglinux <whyglinux@hotmail.com>' - @echo - @echo 'Usage: make [TARGET]' - @echo 'TARGETS:' - @echo ' all (=make) compile and link.' - @echo ' NODEP=yes make without generating dependencies.' - @echo ' objs compile only (no linking).' - @echo ' tags create tags for Emacs editor.' - @echo ' ctags create ctags for VI editor.' - @echo ' clean clean objects and the executable file.' - @echo ' distclean clean objects, the executable and dependencies.' - @echo ' show show variables (for debug use only).' - @echo ' help print this message.' - @echo - @echo 'Report bugs to <whyglinux AT gmail DOT com>.' - -# Show variables (for debug use only.) -show: - @echo 'PROGRAM :' $(PROGRAM) - @echo 'SRCDIRS :' $(SRCDIRS) - @echo 'HEADERS :' $(HEADERS) - @echo 'SOURCES :' $(SOURCES) - @echo 'SRC_CXX :' $(SRC_CXX) - @echo 'OBJS :' $(OBJS) - @echo 'DEPS :' $(DEPS) - @echo 'DEPEND :' $(DEPEND) - @echo 'COMPILE.c :' $(COMPILE.c) - @echo 'COMPILE.cxx :' $(COMPILE.cxx) - @echo 'link.c :' $(LINK.c) - @echo 'link.cxx :' $(LINK.cxx) - -## End of the Makefile ## Suggestions are welcome ## All rights reserved ## -############################################################################# diff --git a/processmodel/processmodel.cpp b/processmodel/processmodel.cpp deleted file mode 100644 index ec78099..0000000 --- a/processmodel/processmodel.cpp +++ /dev/null @@ -1,296 +0,0 @@ -#include "processmodel.h" - -//1. make a basic executable that represents a render context -//get message passing going -//incorporate in REST server -//fill in the details - -RotorRequestHandler::RotorRequestHandler(const std::string& format): _format(format){ -} - -void RotorRequestHandler::handleRequest(HTTPServerRequest& request,HTTPServerResponse& response) { - - Timestamp now; - std::string dt(DateTimeFormatter::format(now, _format)); - - response.setChunkedTransferEncoding(true); - response.setContentType("text/html"); - - std::ostream& ostr = response.send(); - ostr << "<html><head><title>RotorServer powered by " - "POCO C++ Libraries</title>"; - ostr << "</head>"; - ostr << "<body><p style=\"text-align: center; " - "font-size: 48px;\">"; - ostr << dt; - ostr << "</p></body></html>"; -} - - -AudioAnalyserHandler::AudioAnalyserHandler(const vampHost::Settings& _settings): settings(_settings){ -} - -void AudioAnalyserHandler::handleRequest(HTTPServerRequest& request,HTTPServerResponse& response) { - - response.setChunkedTransferEncoding(true); - response.setContentType("text/html"); - - //string audioData=vampHost::runPlugin(); - - std::ostream& ostr = response.send(); - ostr << "<html><head><title>RotorServer powered by " - "POCO C++ Libraries</title>"; - ostr << "</head>"; - ostr << "<body><p style=\"text-align: center; " - "font-size: 48px;\">"; - vampHost::runPlugin("",settings.soname,settings.filtername, "",0, settings.inputFile, ostr,true); - ostr << "</p></body></html>"; -} - -RenderContextHandler::RenderContextHandler(const std::string _content,const HTTPServerResponse::HTTPStatus _status){ - content=_content; - status=_status; -} - - -void RenderContextHandler::handleRequest(HTTPServerRequest& request,HTTPServerResponse& response) { - - response.setChunkedTransferEncoding(true); - response.setContentType("text/html"); - response.setStatus(status); - - std::ostream& ostr = response.send(); - - ostr << "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; - ostr << content; - -} - - -HTTPRequestHandler* RotorRequestHandlerFactory::createRequestHandler(const HTTPServerRequest& request){ - Application& app = Application::instance(); - - Poco::URI theuri=Poco::URI(request.getURI()); - std::vector <std::string> command; - theuri.getPathSegments(command); - - app.logger().information(request.clientAddress().toString()+" "+request.getMethod()); - - string content=""; - HTTPResponse::HTTPStatus status=HTTPResponse::HTTP_BAD_REQUEST; //by default - - std::string body; - std::ostringstream os; - os<<request.stream().rdbuf(); - body=os.str(); - - /* - - if (command.size()) { - if (command[0]=="new") { - if (request.getMethod()=="GET") { - string sID=idGen.createOne().toString(); //create() seems to cause problems - //Creates a new time-based UUID, using the MAC address of one of the system's ethernet adapters. - //Throws a SystemException if no MAC address can be obtained. - // - //seems to hang, to me - cerr << "Rotor: starting thread "<< sID << endl; - manager.start(new Rotor::Render_context(sID)); - content="<sID>"+sID+"</sID>\n"; - status=HTTPResponse::HTTP_OK; - } - if (request.getMethod()=="PUT") { //undocumented manual thread name - if (body.size()) { - string sID=body; - cerr << "Rotor: starting thread "<< sID << endl; - manager.start(new Rotor::Render_context(sID)); - content="<sID>"+sID+"</sID>\n"; - status=HTTPResponse::HTTP_OK; - } - } - } - else if (command[0]=="list") { - if (request.getMethod()=="GET") { - //std::list < Poco::AutoPtr < Poco::Task > >::iterator it; - //it=manager.taskList().begin(); - //for (it=manager.taskList().begin();it !=manager.taskList().end();++it) { - //content+="<sID>"+(*it)->name()+"</sID>\n"; - //} - - //massive problems making an iterator for the tasklist, the above crashes - //solution: auto type range-based for-loop - //this is c++11 specific but works - - for (auto& task: manager.taskList()) { //c++11 - content+="<sID>"+task->name()+" </sID>\n"; - } - status=HTTPResponse::HTTP_OK; - } - } - else if (command[0]=="styles") { - //eventually retrieve from sql; - //a bit of weirdness here: prefer to just get whole file to a string. - if (request.getMethod()=="GET") { - std::string stylesfile = "styles.xml"; - Poco::File f=Poco::File(stylesfile); - if (f.exists()) { - Poco::FileInputStream file(stylesfile); - //while (!file.eof()) { - // file >> content; - //} - Poco::StreamCopier::copyToString(file, content); - status=HTTPResponse::HTTP_OK; - } - else { - content="<status>Rotor: internal error: styles not found</status>\n"; - } - - } - else { - content="<status>Rotor: bad request</status>\n"; - } - } - else if (command[0]=="exit") { - exit(0); - } - else { - bool found=false; - for (auto& task: manager.taskList()) { //c++11 - if(task->name()==command[0]) { - //valid session command - found=true; - if (command.size()==1) { - //just invoking sID - if (request.getMethod()=="DELETE") { - task->cancel(); - content="<status>1</status>\n"; - status=HTTPResponse::HTTP_OK; - } - else { - content="<status>Rotor: render context invoked with no command</status>\n"; - } - } - else { //session modifier command- to be passed to render context - //some commands need to return error codes - //ie where the audio file isn't found - //on the other hand, some commands need to know state of the renderer? - - - vector<string> sc; //method,id,command1,{command2,}{body} - sc.push_back(request.getMethod()); - for (auto& i: command){ - sc.push_back(i); - } - sc.push_back(body); - - Rotor::Command_response response=((Poco::AutoPtr<Rotor::Render_context>)task)->session_command(sc); - - content=response.description; - status=response.status; - - } - } - } - if (!found) { - status=HTTPResponse::HTTP_NOT_FOUND; - content="<status>Rotor: render context not found</status>\n"; - } - } - } - else { - content="<status>Rotor: empty request</status>"; - } - */ - return new RenderContextHandler(content, status); -} - - -RotorServer::RotorServer(): _helpRequested(false) -{ -} - -RotorServer::~RotorServer() -{ -} - -void RotorServer::initialize(Application& self){ - loadConfiguration(); - ServerApplication::initialize(self); -} - -void RotorServer::uninitialize(){ - ServerApplication::uninitialize(); -} - -void RotorServer::defineOptions(OptionSet& options) { - ServerApplication::defineOptions(options); - options.addOption( - Option("help", "h", "display argument help information") - .required(false) - .repeatable(false) - .callback(OptionCallback<RotorServer>(this, &RotorServer::handleHelp) - ) - ); -} - -void RotorServer::handleHelp(const std::string& name, const std::string& value){ - HelpFormatter helpFormatter(options()); - helpFormatter.setCommand(commandName()); - helpFormatter.setUsage("OPTIONS"); - helpFormatter.setHeader( - "Rotor"); - helpFormatter.format(std::cout); - stopOptionsProcessing(); - _helpRequested = true; -} - -int main(int argc, char** argv) -{ - - std::vector<std::string> args; - args.push_back("-ax"); - if (argc>1) { - std::string cmd=std::string(argv[1]); - Poco::Pipe outPipe; - Poco::Pipe inPipe; - ProcessHandle ph = Process::launch(cmd, args, &inPipe, &outPipe, 0); - Poco::PipeInputStream istr(outPipe); - Poco::PipeOutputStream ostr(inPipe); - //std::ofstream ostr("processes.txt"); - // - while (true){ - Poco::StreamCopier::copyStream(istr,std::cout); - //ostr<<std::cin; - //std::cout<<istr; - } - return 0; - } - else std::cerr<<"usage: processmodel [executable]"<<std::endl; -} - - -int RotorServer::main(const std::vector<std::string>& args){ - if (!_helpRequested) { - - unsigned short port; - - xmlIO xml; - if(xml.loadFile("settings.xml") ){ - port=xml.getAttribute("Rotor","port",9980,0); - } - else cerr<<"Rotord: settings.xml not found, using defaults"<<endl; - - port = (unsigned short) config().getInt("port", port); //override from command line - - std::string format(config().getString("format", DateTimeFormat::SORTABLE_FORMAT)); - - - - ServerSocket svs(port); - HTTPServer srv(new RotorRequestHandlerFactory(),svs, new HTTPServerParams); - srv.start(); - waitForTerminationRequest(); - srv.stop(); - } - return Application::EXIT_OK; -}
\ No newline at end of file diff --git a/processmodel/rendercontext_src/Makefile b/processmodel/rendercontext_src/Makefile deleted file mode 100644 index d2546e0..0000000 --- a/processmodel/rendercontext_src/Makefile +++ /dev/null @@ -1,252 +0,0 @@ -# The pre-processor and compiler options. - -#http://docs.gstreamer.com/display/GstSDK/Installing+on+Linux - -#MY_CFLAGS = -fpermissive -std=c++11 -Wno-error -I /opt/gstreamer-sdk/include/gstreamer-0.10/ -I /opt/gstreamer-sdk/include/glib-2.0 -I /opt/gstreamer-sdk/lib/glib-2.0/include -I /opt/gstreamer-sdk/include/libxml2 $(shell pkg-config gstreamer-0.10 gstreamer-video-0.10 gstreamer-base-0.10 --cflags) -MY_CFLAGS = -fpermissive -std=c++11 -#-Wno-error $(shell pkg-config gstreamer-0.10 gstreamer-video-0.10 gstreamer-base-0.10 --cflags) - -# -I ../ffmpeg - -# The linker options.libgstaasinklibgstaasink.so -MY_LIBS = -lPocoNet -lPocoXML -lPocoUtil -lPocoFoundation -lvamp-hostsdk -lsndfile -L /usr/local/lib -lswscale -lavcodec -lavformat -lavfilter -lavdevice -lavutil -#MY_LIBS = -lPocoNet -lPocoXML -lPocoUtil -lPocoFoundation -lvamp-hostsdk -lsndfile -L /usr/local/lib -lswscale -lavcodec -lavformat -lavfilter -lavdevice -lavutil $(shell pkg-config gstreamer-0.10 gstreamer-video-0.10 gstreamer-base-0.10 --libs) -# -lgstreamer-0.10 -lgstreamer-video-0.10 -lgstreamer-base-0.10 -lglib-2.0 -lgstapp-0.10 -#MY_LIBS = ../libavcodec/ffmpeg/libavcodec/libavcodec.a ../libavcodec/ffmpeg/libavutil/libavutil.a ../libavcodec/ffmpeg/libavformat/libavformat.a ../libavcodec/ffmpeg/libavfilter/libavfilter.a ../libavcodec/ffmpeg/libavdevice/libavdevice.a -lPocoNet -lPocoXML -lPocoUtil -lPocoFoundation -lvamp-hostsdk -#GAH! HARD! - -# The pre-processor options used by the cpp (man cpp for more). -CPPFLAGS = -Wall - -# The options used in linking as well as in any direct use of ld. -LDFLAGS = - -# The directories in which source files reside. -# If not specified, only the current directory will be serached. -SRCDIRS = - -# The executable file name. -# If not specified, current directory name or `a.out' will be used. -PROGRAM = - -## Implicit Section: change the following only when necessary. -##========================================================================== - -# The source file types (headers excluded). -# .c indicates C source files, and others C++ ones. -SRCEXTS = .c .C .cc .cpp .CPP .c++ .cxx .cp - -# The header file types. -HDREXTS = .h .H .hh .hpp .HPP .h++ .hxx .hp - -# The pre-processor and compiler options. -# Users can override those variables from the command line. -CFLAGS = -g -O2 -CXXFLAGS= - -# The C program compiler. -#CC = gcc - -# The C++ program compiler. -#CXX = g++ - -# Un-comment the following line to compile C programs as C++ ones. -#CC = $(CXX) - -# The command used to delete file. -RM = rm -f - -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -## Stable Section: usually no need to be changed. But you can add more. -##========================================================================== -SHELL = /bin/sh -EMPTY = -SPACE = $(EMPTY) $(EMPTY) -ifeq ($(PROGRAM),) - CUR_PATH_NAMES = $(subst /,$(SPACE),$(subst $(SPACE),_,$(CURDIR))) - PROGRAM = $(word $(words $(CUR_PATH_NAMES)),$(CUR_PATH_NAMES)) - ifeq ($(PROGRAM),) - PROGRAM = a.out - endif -endif -ifeq ($(SRCDIRS),) - SRCDIRS = . -endif -SOURCES = $(foreach d,$(SRCDIRS),$(wildcard $(addprefix $(d)/*,$(SRCEXTS)))) -HEADERS = $(foreach d,$(SRCDIRS),$(wildcard $(addprefix $(d)/*,$(HDREXTS)))) -SRC_CXX = $(filter-out %.c,$(SOURCES)) -OBJS = $(addsuffix .o, $(basename $(SOURCES))) -DEPS = $(OBJS:.o=.d) - -## Define some useful variables. -DEP_OPT = $(shell if `$(CC) --version | grep "GCC" >/dev/null`; then \ - echo "-MM -MP"; else echo "-M"; fi ) -DEPEND = $(CC) $(DEP_OPT) $(MY_CFLAGS) $(CFLAGS) $(CPPFLAGS) -DEPEND.d = $(subst -g ,,$(DEPEND)) -COMPILE.c = $(CC) $(MY_CFLAGS) $(CFLAGS) $(CPPFLAGS) -c -COMPILE.cxx = $(CXX) $(MY_CFLAGS) $(CXXFLAGS) $(CPPFLAGS) -c -LINK.c = $(CC) $(MY_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -LINK.cxx = $(CXX) $(MY_CFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) - -.PHONY: all objs tags ctags clean distclean help show install - -# Delete the default suffixes -.SUFFIXES: - -all: Release - -Clang: CXX = clang - -Clang: $(PROGRAM) - -Release: CXXFLAGS += -O2 - -Release: $(PROGRAM) - -Debug: CXXFLAGS += -g3 - -Debug: $(PROGRAM) - -prefix=/usr/local - -Install: rotord - strip rotord - install -m 0755 rotord $(prefix)/bin - - -# Rules for creating dependency files (.d). -#------------------------------------------ - -%.d:%.c - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.C - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.cc - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.cpp - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.CPP - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.c++ - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.cp - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -%.d:%.cxx - @echo -n $(dir $<) > $@ - @$(DEPEND.d) $< >> $@ - -# Rules for generating object files (.o). -#---------------------------------------- -objs:$(OBJS) - -%.o:%.c - $(COMPILE.c) $< -o $@ - -%.o:%.C - $(COMPILE.cxx) $< -o $@ - -%.o:%.cc - $(COMPILE.cxx) $< -o $@ - -%.o:%.cpp - $(COMPILE.cxx) $< -o $@ - -%.o:%.CPP - $(COMPILE.cxx) $< -o $@ - -%.o:%.c++ - $(COMPILE.cxx) $< -o $@ - -%.o:%.cp - $(COMPILE.cxx) $< -o $@ - -%.o:%.cxx - $(COMPILE.cxx) $< -o $@ - -# Rules for generating the tags. -#------------------------------------- -tags: $(HEADERS) $(SOURCES) - $(ETAGS) $(ETAGSFLAGS) $(HEADERS) $(SOURCES) - -ctags: $(HEADERS) $(SOURCES) - $(CTAGS) $(CTAGSFLAGS) $(HEADERS) $(SOURCES) - -# Rules for generating the executable. -#------------------------------------- -$(PROGRAM):$(OBJS) -ifeq ($(SRC_CXX),) # C program - $(LINK.c) $(OBJS) $(MY_LIBS) -o $@ - @echo Type ./$@ to execute the program. -else # C++ program - $(LINK.cxx) $(OBJS) $(MY_LIBS) -o $@ - @echo Type ./$@ to execute the program. -endif - -ifndef NODEP -ifneq ($(DEPS),) - sinclude $(DEPS) -endif -endif - - -clean: - $(RM) $(OBJS) $(PROGRAM) $(PROGRAM).exe - -distclean: clean - $(RM) $(DEPS) TAGS - -# Show help. -help: - @echo 'Generic Makefile for C/C++ Programs (gcmakefile) version 0.5' - @echo 'Copyright (C) 2007, 2008 whyglinux <whyglinux@hotmail.com>' - @echo - @echo 'Usage: make [TARGET]' - @echo 'TARGETS:' - @echo ' all (=make) compile and link.' - @echo ' NODEP=yes make without generating dependencies.' - @echo ' objs compile only (no linking).' - @echo ' tags create tags for Emacs editor.' - @echo ' ctags create ctags for VI editor.' - @echo ' clean clean objects and the executable file.' - @echo ' distclean clean objects, the executable and dependencies.' - @echo ' show show variables (for debug use only).' - @echo ' help print this message.' - @echo - @echo 'Report bugs to <whyglinux AT gmail DOT com>.' - -# Show variables (for debug use only.) -show: - @echo 'PROGRAM :' $(PROGRAM) - @echo 'SRCDIRS :' $(SRCDIRS) - @echo 'HEADERS :' $(HEADERS) - @echo 'SOURCES :' $(SOURCES) - @echo 'SRC_CXX :' $(SRC_CXX) - @echo 'OBJS :' $(OBJS) - @echo 'DEPS :' $(DEPS) - @echo 'DEPEND :' $(DEPEND) - @echo 'COMPILE.c :' $(COMPILE.c) - @echo 'COMPILE.cxx :' $(COMPILE.cxx) - @echo 'link.c :' $(LINK.c) - @echo 'link.cxx :' $(LINK.cxx) - -## End of the Makefile ## Suggestions are welcome ## All rights reserved ## -############################################################################# diff --git a/processmodel/rendercontext_src/rendercontext.cpp b/processmodel/rendercontext_src/rendercontext.cpp deleted file mode 100644 index 2f840d5..0000000 --- a/processmodel/rendercontext_src/rendercontext.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "Poco/Net/HTTPServer.h" -#include "Poco/Net/HTTPRequestHandler.h" -#include "Poco/Net/HTTPRequestHandlerFactory.h" -#include "Poco/Net/HTTPServerParams.h" -#include "Poco/Net/HTTPServerRequest.h" -#include "Poco/Net/HTTPServerResponse.h" -#include "Poco/Net/HTTPServerParams.h" -#include "Poco/Net/ServerSocket.h" -#include "Poco/Timestamp.h" -#include "Poco/DateTimeFormatter.h" -#include "Poco/DateTimeFormat.h" -#include "Poco/Exception.h" -#include "Poco/NotificationCenter.h" -#include "Poco/Util/ServerApplication.h" -#include "Poco/Util/Option.h" -#include "Poco/Util/OptionSet.h" -#include "Poco/Util/HelpFormatter.h" -#include "Poco/FileStream.h" -#include "Poco/StreamCopier.h" -#include "Poco/Net/HTTPStreamFactory.h" - -#include "Poco/Process.h" -#include "Poco/PipeStream.h" -#include <deque> -#include <iostream> - -int main(int argc, char** argv) -{ - std::deque<int> work_queue; - int count=0; - //while (true){ - // std::cout<<count<<" "<<std::cin; - // count ++; - //} - std::cout<<"hello, world!"<<std::endl; //; - //printf("hello, world!\n"); - return 0; -} - -int main(int argc, char** argv) -{ - HTTPStreamFactory::registerFactory(); - RotorServer app; - return app.run(argc, argv); -} |
