nrtb-core team mailing list archive

[Rick Stovall <fpstovall@xxxxxxxxx>]

Rick Stovall has proposed merging lp:~fpstovall/nrtb/GPB_definitions into lp:nrtb with lp:~fpstovall/nrtb/listener-fix as a prerequisite.

Requested reviews:
  NRTB Core (nrtb-core)
Related bugs:
  Bug #723263 in New Real Time Battle: "Todo: Define GPB interface between Visualization and DataBroker"
  https://bugs.launchpad.net/nrtb/+bug/723263

For more details, see:
https://code.launchpad.net/~fpstovall/nrtb/GPB_definitions/+merge/75945

This merge will complete the primary setup for interprocess messaging for the alpha phase. Included are new management messages for the sim to db channel, and a complete working set of messages for the visualization to db channel.

There is some minor refactoring of the sim_engine directory as well.  This branch is dependent on the listener-fix branch, already proposed for review.  Unless there are blocking issues, this branch is scheduled to be merged on Friday, Sept. 23rd after the Friday NRTB meeting.
-- 
https://code.launchpad.net/~fpstovall/nrtb/GPB_definitions/+merge/75945
Your team NRTB Core is requested to review the proposed merge of lp:~fpstovall/nrtb/GPB_definitions into lp:nrtb.

=== modified file 'GPB_proto/sim_to_db_wrapper.proto'
--- GPB_proto/sim_to_db_wrapper.proto	2011-07-24 17:15:15 +0000
+++ GPB_proto/sim_to_db_wrapper.proto	2011-09-19 02:44:24 +0000
@@ -5,17 +5,23 @@
 // This file released under the GPL 3.0 license.
 // 
 // Note: The message defined here is a "channel wrapper", a container for 
-//  all messages from the simulation engine to the data broker.
+//  all messages between the simulation engine and the data broker.
 
 package nrtb_msg;
 
 import "ack_nak.proto";
 import "sim_obj_tq_update.proto";
+import "sim_management.proto";
 
 message sim_to_db {
-    required uint32 msg_uid = 1;    // the msg_uid must be unique for 
-                                    //  for each message on a channel.
-    repeated message_ack ack = 2;
-    repeated message_nak nak = 3;
-    repeated tq_data quanta_results = 4;
+  required uint32 msg_uid = 1;    // the msg_uid must be unique for 
+                                  //  for each message on a channel.
+  // all the below messages are defined in 
+  // the files included above.
+  optional message_ack ack = 2;
+  optional message_nak nak = 3;
+  optional tq_data quanta_results = 4;
+  optional sim_setup_data sim_setup = 5;
+  optional sim_termination_data sim_end = 6;
+  optional db_request_sim_stop db_abort = 7;
 }

=== added directory 'sim_engine/bin'
=== added directory 'sim_engine/include'
=== added directory 'sim_engine/lib'
=== added file 'sim_engine/physics/Makefile'
--- sim_engine/physics/Makefile	1970-01-01 00:00:00 +0000
+++ sim_engine/physics/Makefile	2011-09-19 02:44:24 +0000
@@ -0,0 +1,45 @@
+#***********************************************
+#This file is part of the NRTB project (https://launchpad.net/nrtb).
+#
+#    NRTB is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    NRTB is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with NRTB.  If not, see <http://www.gnu.org/licenses/>.
+#
+#***********************************************
+
+lib: ../lib/nrtb_physics.a
+
+../lib/nrtb_physics.a: ../../commmon/lib.nrtb_common.a
+	@echo "============= building physics ==============="
+	@make action=lib doit
+	@ar -r ../lib/nrtb_physics.a ./obj/*.o
+	@cp -v ./include/* ../include
+	@echo "============= physics complete ==============="
+
+../../commmon/lib.nrtb_common.a:
+	@cd ../../common; make
+
+modules:
+	@echo "============= building physics modules ==============="
+	@make doit
+	@echo "============= completed physics modules =============="
+
+clean:
+	@echo "============= cleaning physics ==============="
+	@cd include; for file in *; do rm -fv ../include/$$file; done
+	@make action=clean doit
+	@rm -fv ./obj/* ./lib/* ./include/*
+	@echo "========== physics cleanup complete ==========="
+
+doit:
+#	@cd abstract_effector; make ${action}
+#	@cd point_mass; make ${action}

=== added directory 'sim_engine/physics/abstract_effector'
=== removed directory 'sim_engine/physics/attitude'
=== added directory 'sim_engine/physics/include'
=== removed directory 'sim_engine/physics/location'
=== added directory 'sim_engine/physics/obj'
=== removed directory 'sim_engine/physics/phyics_triad'
=== added directory 'sim_engine/physics/point_mass'
=== removed directory 'sim_engine/physics/rotation'
=== removed directory 'sim_engine/physics/velocity'