[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Usata-commits] Changes to usata/src/main.cpp
From: |
Chong Kai Xiong |
Subject: |
[Usata-commits] Changes to usata/src/main.cpp |
Date: |
Sun, 26 Dec 2004 16:36:12 -0500 |
Index: usata/src/main.cpp
diff -u usata/src/main.cpp:1.24 usata/src/main.cpp:1.25
--- usata/src/main.cpp:1.24 Fri May 30 12:33:01 2003
+++ usata/src/main.cpp Fri May 30 17:36:50 2003
@@ -38,7 +38,8 @@
#include "log.hpp"
#include "system_manager.hpp"
#include "module.hpp"
-
+#include "args.hpp"
+#include "conf.hpp"
// LEGACY: remove after complete migration
using namespace Usata;
@@ -50,23 +51,36 @@
int main(int argument_count, const char* argument_str[])
{
-
// initialize logger
log_server::init();
log_server *logger = log_server::instance();
logger->add_target(log_stdout);
+
logstream log;
- log << startup_text << logcmd(commit);
+
+ log << startup_text
+ << logcmd(commit);
+
+ conf_node_base *param_cnt = new conf_node;
+ int result(parse_args(argument_count, argument_str, param_cnt));
+
+ if (result == -1)
+ exit (255);
+ system_manager::init(param_cnt);
+
+ delete param_cnt;
+ if (result != 0)
+ goto CLEANUP;
// initialize system manager
- system_manager::init();
+ // system_manager::init();
- std::string vdrivers =
dynamic_loader::instance()->find_all("usata-driver-video");
+ // std::string vdrivers =
dynamic_loader::instance()->find_all("usata-driver-video");
//log << vdrivers << logcmd(commit);
// finalize system manager
+ CLEANUP:
system_manager::done();
- log << logcmd(commit);
// finalize log server
log_server::done();
- [Usata-commits] Changes to usata/src/main.cpp, David Lau, 2004/12/26
- [Usata-commits] Changes to usata/src/main.cpp, David Lau, 2004/12/26
- [Usata-commits] Changes to usata/src/main.cpp, David Lau, 2004/12/26
- [Usata-commits] Changes to usata/src/main.cpp, David Lau, 2004/12/26
- [Usata-commits] Changes to usata/src/main.cpp,
Chong Kai Xiong <=
- [Usata-commits] Changes to usata/src/main.cpp, Chong Kai Xiong, 2004/12/26
- [Usata-commits] Changes to usata/src/main.cpp, David Lau, 2004/12/30
- [Usata-commits] Changes to usata/src/main.cpp, David Lau, 2004/12/30