0daf78a · opencog-atomspace

Changed files (3) +16 -13

opencog/atomspace/AtomSpace.cc +10 -1

…	…	@@ -137,13 +137,22 @@ AtomSpace::AtomSpace(const HandleSeq& bases) :
137	137	init();
138	138	}
139	139
140
141	140	AtomSpace::~AtomSpace()
142	141	{
143	142	_nameserver.typeAddedSignal().disconnect(addedTypeConnection);
144	143	clear_all_atoms();
145	144	}
146	145
	146	void AtomSpace::do_install(void)
	147	{
	148	// XXX FIXME. I think this is installing into the wrong AtomSpace.
	149	// Maybe. I'm confused. But no unit test seems to fail as a result
	150	// of this, so I dunno. Go figure.
	151	setAtomSpace(this);
	152	Frame::install();
	153	setAtomSpace(nullptr);
	154	}
	155
147	156	// ====================================================================
148	157
149	158	// An extremely primitive permissions system.

opencog/atomspace/AtomSpace.h +4 -7

…	…	@@ -50,6 +50,8 @@ typedef std::shared_ptr<AtomSpace> AtomSpacePtr;
50	50	class AtomSpace : public Frame
51	51	{
52	52	friend class StorageNode; // Needs to call add() directly.
	53	template< class... Args >
	54	friend AtomSpacePtr createAtomSpace(Args&&...); // Needs to call install()
53	55
54	56	// Debug tools
55	57	static const bool EMIT_DIAGNOSTICS = true;
…	…	@@ -75,6 +77,7 @@ class AtomSpace : public Frame
75	77	// we keep two distinct lists to avoid the CPU overhead of casting
76	78	// between the two different pointer types (its significant).
77	79	std::vector<AtomSpacePtr> _environ;
	80	void do_install();
78	81
79	82	void init();
80	83	void clear_all_atoms();
…	…	@@ -536,13 +539,7 @@ AtomSpacePtr createAtomSpace( Args&&... args )
536	539	// Unfortunately, Frame::install() cannot be called in the ctor
537	540	// because shared_from_this() cannot be called in the ctor.
538	541	// So we do this after the ctor has finished.
539
540		// XXX FIXME. I think this is installing into the wrong AtomSpace.
541		// But no unit test seems to fail as a result of this, so I dunno.
542		// But this can't be right, as written.
543		asp->setAtomSpace(asp.get());
544		asp->install();
545		asp->setAtomSpace(nullptr);
	542	asp->do_install();
546	543	return asp;
547	544	}
548	545

opencog/atomspace/Frame.h +2 -5

…	…	@@ -44,11 +44,8 @@ protected:
44	44	HandleSeq _outgoing;
45	45	std::string _name;
46	46	void scrub_incoming_set();
47		virtual void remove();
48
49		public:
50		// Must be public, so that createAtomSpace() can call this.
51		virtual void install();
	47	virtual void remove() override;
	48	virtual void install() override;
52	49
53	50	public:
54	51	/**