Remove unused queuegroup hash
It turns out we never used it, so let's kill it. Makes it easier to
move to event loops since we really just want the string to represent
the world.
Change-Id: If3815bdc02b98237c409afaa59cbf926657b1555
diff --git a/aos/build/queues/output/q_file.rb b/aos/build/queues/output/q_file.rb
index 1e39247..3bbdaed 100644
--- a/aos/build/queues/output/q_file.rb
+++ b/aos/build/queues/output/q_file.rb
@@ -118,8 +118,7 @@
type_class.add_member(:public,member_func)
#cpp_tree.cc_file.add_funct(member_func)
member_func.args << "const char *name";
- member_func.args << "uint32_t hash";
- member_func.add_cons("::aos::QueueGroup","name", "hash")
+ member_func.add_cons("::aos::QueueGroup","name")
@queues.each do |queue|
member_func.args << "const char *#{queue.name}_name";
member_func.add_cons(queue.name,"#{queue.name}_name")
@@ -169,7 +168,6 @@
cons_call = CPP::FuncCall.new("new #{type_name}")
cons_call.args.push(@loc.queue_name(@name).inspect)
- cons_call.args.push(@type.hash_with_name(@loc.queue_name(@name).inspect))
@type.queues.collect do |queue|
cons_call.args.push(@loc.queue_name(@name + "." + queue.name).inspect)
end
diff --git a/aos/queue.h b/aos/queue.h
index 1897773..47540f6 100644
--- a/aos/queue.h
+++ b/aos/queue.h
@@ -209,16 +209,13 @@
public:
// Constructs a queue group given its name and a unique hash of the name and
// type.
- QueueGroup(const char *name, uint32_t hash) : name_(name), hash_(hash) {}
+ QueueGroup(const char *name) : name_(name) {}
// Returns the name of the queue group.
const char *name() const { return name_.c_str(); }
- // Returns a unique hash representing this instance of the queue group.
- uint32_t hash() const { return hash_; }
private:
std::string name_;
- uint32_t hash_;
};
} // namespace aos
diff --git a/aos/queue_test.cc b/aos/queue_test.cc
index 8eeca6e..1c4ebdd 100644
--- a/aos/queue_test.cc
+++ b/aos/queue_test.cc
@@ -213,7 +213,6 @@
protected:
GroupTest()
: my_test_queuegroup(".aos.common.testing.test_queuegroup",
- 0x20561114,
".aos.common.testing.test_queuegroup.first",
".aos.common.testing.test_queuegroup.second") {}
@@ -226,16 +225,6 @@
::aos::testing::TestSharedMemory my_shm_;
};
-// Tests that the hash gets preserved.
-TEST_F(GroupTest, Hash) {
- EXPECT_EQ(static_cast<uint32_t>(0x20561114), my_test_queuegroup.hash());
-}
-
-// Tests that the hash works.
-TEST_F(GroupTest, RealHash) {
- EXPECT_EQ(static_cast<uint32_t>(0x93596b2f), test_queuegroup.hash());
-}
-
// Tests that name works.
TEST_F(GroupTest, Name) {
EXPECT_EQ(std::string(".aos.common.testing.test_queuegroup"),
diff --git a/frc971/codelab/basic_test.cc b/frc971/codelab/basic_test.cc
index 0761cb2..5132407 100644
--- a/frc971/codelab/basic_test.cc
+++ b/frc971/codelab/basic_test.cc
@@ -20,7 +20,7 @@
class BasicSimulation {
public:
BasicSimulation()
- : basic_queue_(".frc971.codelab.basic_queue", 0x78d8e372,
+ : basic_queue_(".frc971.codelab.basic_queue",
".frc971.codelab.basic_queue.goal",
".frc971.codelab.basic_queue.position",
".frc971.codelab.basic_queue.output",
@@ -60,7 +60,7 @@
class BasicControlLoopTest : public ::aos::testing::ControlLoopTest {
public:
BasicControlLoopTest()
- : basic_queue_(".frc971.codelab.basic_queue", 0x78d8e372,
+ : basic_queue_(".frc971.codelab.basic_queue",
".frc971.codelab.basic_queue.goal",
".frc971.codelab.basic_queue.position",
".frc971.codelab.basic_queue.output",
diff --git a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
index e4d320e..a6711e4 100644
--- a/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
+++ b/frc971/control_loops/drivetrain/drivetrain_lib_test.cc
@@ -103,7 +103,7 @@
// TODO(aschuh) Do we want to test the clutch one too?
DrivetrainSimulation()
: drivetrain_plant_(new DrivetrainPlant(MakeDrivetrainPlant())),
- my_drivetrain_queue_(".frc971.control_loops.drivetrain", 0x8a8dde77,
+ my_drivetrain_queue_(".frc971.control_loops.drivetrain",
".frc971.control_loops.drivetrain.goal",
".frc971.control_loops.drivetrain.position",
".frc971.control_loops.drivetrain.output",
@@ -223,7 +223,7 @@
DrivetrainSimulation drivetrain_motor_plant_;
DrivetrainTest()
- : my_drivetrain_queue_(".frc971.control_loops.drivetrain", 0x8a8dde77,
+ : my_drivetrain_queue_(".frc971.control_loops.drivetrain",
".frc971.control_loops.drivetrain.goal",
".frc971.control_loops.drivetrain.position",
".frc971.control_loops.drivetrain.output",
diff --git a/y2014/control_loops/claw/claw_lib_test.cc b/y2014/control_loops/claw/claw_lib_test.cc
index 753c087..f10e61e 100644
--- a/y2014/control_loops/claw/claw_lib_test.cc
+++ b/y2014/control_loops/claw/claw_lib_test.cc
@@ -37,7 +37,7 @@
ClawMotorSimulation(double initial_top_position,
double initial_bottom_position)
: claw_plant_(new StateFeedbackPlant<4, 2, 2>(MakeClawPlant())),
- claw_queue(".y2014.control_loops.claw_queue", 0x9f1a99dd,
+ claw_queue(".y2014.control_loops.claw_queue",
".y2014.control_loops.claw_queue.goal",
".y2014.control_loops.claw_queue.position",
".y2014.control_loops.claw_queue.output",
@@ -254,7 +254,7 @@
double min_separation_;
ClawTest()
- : claw_queue(".y2014.control_loops.claw_queue", 0x9f1a99dd,
+ : claw_queue(".y2014.control_loops.claw_queue",
".y2014.control_loops.claw_queue.goal",
".y2014.control_loops.claw_queue.position",
".y2014.control_loops.claw_queue.output",
diff --git a/y2014/control_loops/shooter/shooter_lib_test.cc b/y2014/control_loops/shooter/shooter_lib_test.cc
index 972b8b0..108502b 100644
--- a/y2014/control_loops/shooter/shooter_lib_test.cc
+++ b/y2014/control_loops/shooter/shooter_lib_test.cc
@@ -35,12 +35,11 @@
plunger_latched_(false),
brake_piston_state_(true),
brake_delay_count_(0),
- shooter_queue_(
- ".y2014.control_loops.shooter_queue", 0xcbf22ba9,
- ".y2014.control_loops.shooter_queue.goal",
- ".y2014.control_loops.shooter_queue.position",
- ".y2014.control_loops.shooter_queue.output",
- ".y2014.control_loops.shooter_queue.status") {
+ shooter_queue_(".y2014.control_loops.shooter_queue",
+ ".y2014.control_loops.shooter_queue.goal",
+ ".y2014.control_loops.shooter_queue.position",
+ ".y2014.control_loops.shooter_queue.output",
+ ".y2014.control_loops.shooter_queue.status") {
Reinitialize(initial_position);
}
@@ -299,15 +298,13 @@
}
ShooterTestTemplated()
- : shooter_queue_(
- ".y2014.control_loops.shooter_queue", 0xcbf22ba9,
- ".y2014.control_loops.shooter_queue.goal",
- ".y2014.control_loops.shooter_queue.position",
- ".y2014.control_loops.shooter_queue.output",
- ".y2014.control_loops.shooter_queue.status"),
+ : shooter_queue_(".y2014.control_loops.shooter_queue",
+ ".y2014.control_loops.shooter_queue.goal",
+ ".y2014.control_loops.shooter_queue.position",
+ ".y2014.control_loops.shooter_queue.output",
+ ".y2014.control_loops.shooter_queue.status"),
shooter_motor_(&shooter_queue_),
- shooter_motor_plant_(0.2) {
- }
+ shooter_motor_plant_(0.2) {}
void VerifyNearGoal() {
shooter_queue_.goal.FetchLatest();
diff --git a/y2016/control_loops/shooter/shooter_lib_test.cc b/y2016/control_loops/shooter/shooter_lib_test.cc
index c5d5aa7..bba603f 100644
--- a/y2016/control_loops/shooter/shooter_lib_test.cc
+++ b/y2016/control_loops/shooter/shooter_lib_test.cc
@@ -53,7 +53,7 @@
::y2016::control_loops::shooter::MakeShooterPlant())),
shooter_plant_right_(new ShooterPlant(
::y2016::control_loops::shooter::MakeShooterPlant())),
- shooter_queue_(".y2016.control_loops.shooter", 0x78d8e372,
+ shooter_queue_(".y2016.control_loops.shooter",
".y2016.control_loops.shooter.goal",
".y2016.control_loops.shooter.position",
".y2016.control_loops.shooter.output",
@@ -101,7 +101,7 @@
class ShooterTest : public ::aos::testing::ControlLoopTest {
protected:
ShooterTest()
- : shooter_queue_(".y2016.control_loops.shooter", 0x78d8e372,
+ : shooter_queue_(".y2016.control_loops.shooter",
".y2016.control_loops.shooter.goal",
".y2016.control_loops.shooter.position",
".y2016.control_loops.shooter.output",
diff --git a/y2016/control_loops/superstructure/superstructure_lib_test.cc b/y2016/control_loops/superstructure/superstructure_lib_test.cc
index 824f291..e4d1301 100644
--- a/y2016/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2016/control_loops/superstructure/superstructure_lib_test.cc
@@ -88,7 +88,7 @@
pot_encoder_shoulder_(
constants::Values::kShoulderEncoderIndexDifference),
pot_encoder_wrist_(constants::Values::kWristEncoderIndexDifference),
- superstructure_queue_(".y2016.control_loops.superstructure", 0x0,
+ superstructure_queue_(".y2016.control_loops.superstructure",
".y2016.control_loops.superstructure.goal",
".y2016.control_loops.superstructure.status",
".y2016.control_loops.superstructure.output",
@@ -246,7 +246,7 @@
class SuperstructureTest : public ::aos::testing::ControlLoopTest {
protected:
SuperstructureTest()
- : superstructure_queue_(".y2016.control_loops.superstructure", 0x0,
+ : superstructure_queue_(".y2016.control_loops.superstructure",
".y2016.control_loops.superstructure.goal",
".y2016.control_loops.superstructure.status",
".y2016.control_loops.superstructure.output",
diff --git a/y2017/control_loops/superstructure/superstructure_lib_test.cc b/y2017/control_loops/superstructure/superstructure_lib_test.cc
index 894f99d..de47690 100644
--- a/y2017/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2017/control_loops/superstructure/superstructure_lib_test.cc
@@ -134,7 +134,7 @@
column_plant_(new ColumnPlant(
::y2017::control_loops::superstructure::column::MakeColumnPlant())),
- superstructure_queue_(".y2017.control_loops.superstructure", 0xdeadbeef,
+ superstructure_queue_(".y2017.control_loops.superstructure",
".y2017.control_loops.superstructure.goal",
".y2017.control_loops.superstructure.position",
".y2017.control_loops.superstructure.output",
@@ -432,7 +432,7 @@
class SuperstructureTest : public ::aos::testing::ControlLoopTest {
protected:
SuperstructureTest()
- : superstructure_queue_(".y2017.control_loops.superstructure", 0xdeadbeef,
+ : superstructure_queue_(".y2017.control_loops.superstructure",
".y2017.control_loops.superstructure.goal",
".y2017.control_loops.superstructure.position",
".y2017.control_loops.superstructure.output",
diff --git a/y2018/control_loops/superstructure/superstructure_lib_test.cc b/y2018/control_loops/superstructure/superstructure_lib_test.cc
index 62b20f8..0856a7d 100644
--- a/y2018/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2018/control_loops/superstructure/superstructure_lib_test.cc
@@ -196,7 +196,7 @@
constants::GetValues().right_intake.zeroing),
arm_(constants::GetValues().arm_proximal.zeroing,
constants::GetValues().arm_distal.zeroing),
- superstructure_queue_(".y2018.control_loops.superstructure", 0xdeadbeef,
+ superstructure_queue_(".y2018.control_loops.superstructure",
".y2018.control_loops.superstructure.goal",
".y2018.control_loops.superstructure.position",
".y2018.control_loops.superstructure.output",
@@ -268,7 +268,7 @@
class SuperstructureTest : public ::aos::testing::ControlLoopTest {
protected:
SuperstructureTest()
- : superstructure_queue_(".y2018.control_loops.superstructure", 0xdeadbeef,
+ : superstructure_queue_(".y2018.control_loops.superstructure",
".y2018.control_loops.superstructure.goal",
".y2018.control_loops.superstructure.position",
".y2018.control_loops.superstructure.output",