Move all Val classes to the zeek namespaces

src/probabilistic/Hasher.cc

@@ -23,7 +23,7 @@ Hasher::seed_t Hasher::MakeSeed(const void* data, size_t size)
 
 	assert(sizeof(tmpseed) == 16);
 
-	static auto global_hash_seed = zeek::id::find_val<StringVal>("global_hash_seed");
+	static auto global_hash_seed = zeek::id::find_val<zeek::StringVal>("global_hash_seed");
 
 	if ( data )
 		hash_update(ctx, data, size);
@@ -178,4 +178,3 @@ bool DoubleHasher::Equals(const Hasher* other) const
 	const DoubleHasher* o = static_cast<const DoubleHasher*>(other);
 	return h1 == o->h1 && h2 == o->h2;
 	}
-

src/probabilistic/Topk.cc

@@ -175,14 +175,14 @@ void TopkVal::Merge(const TopkVal* value, bool doPrune)
 		}
 	}
 
-ValPtr TopkVal::DoClone(CloneState* state)
+zeek::ValPtr TopkVal::DoClone(CloneState* state)
 	{
 	auto clone = zeek::make_intrusive<TopkVal>(size);
 	clone->Merge(this);
 	return state->NewClone(this, std::move(clone));
 	}
 
-VectorValPtr TopkVal::GetTopK(int k) const // returns vector
+zeek::VectorValPtr TopkVal::GetTopK(int k) const // returns vector
 	{
 	if ( numElements == 0 )
 		{
@@ -191,7 +191,7 @@ VectorValPtr TopkVal::GetTopK(int k) const // returns vector
 		}
 
 	auto v = zeek::make_intrusive<zeek::VectorType>(type);
-	auto t = zeek::make_intrusive<VectorVal>(std::move(v));
+	auto t = zeek::make_intrusive<zeek::VectorVal>(std::move(v));
 
 	// this does no estimation if the results is correct!
 	// in any case - just to make this future-proof (and I am lazy) - this can return more than k.
@@ -268,7 +268,7 @@ uint64_t TopkVal::GetSum() const
 	return sum;
 	}
 
-void TopkVal::Encountered(ValPtr encountered)
+void TopkVal::Encountered(zeek::ValPtr encountered)
 	{
 	// ok, let's see if we already know this one.
 

src/probabilistic/Topk.h

@@ -27,11 +27,11 @@ struct Bucket {
 
 struct Element {
 	uint64_t epsilon;
-	ValPtr value;
+	zeek::ValPtr value;
 	Bucket* parent;
 };
 
-class TopkVal : public OpaqueVal {
+class TopkVal : public zeek::OpaqueVal {
 
 public:
 	/**
@@ -55,7 +55,7 @@ public:
 	 *
 	 * @param value The encountered element
 	 */
-	void Encountered(ValPtr value);
+	void Encountered(zeek::ValPtr value);
 
 	/**
 	 * Get the first *k* elements of the result vector. At the moment,
@@ -66,7 +66,7 @@ public:
 	 *
 	 * @returns The top-k encountered elements
 	 */
-	VectorValPtr GetTopK(int k) const;
+	zeek::VectorValPtr GetTopK(int k) const;
 
 	/**
 	 * Get the current count tracked in the top-k data structure for a
@@ -125,7 +125,7 @@ public:
 	 *
 	 * @returns cloned TopkVal
 	 */
-	ValPtr DoClone(CloneState* state) override;
+	zeek::ValPtr DoClone(CloneState* state) override;
 
 	DECLARE_OPAQUE_VALUE(TopkVal)
 
@@ -153,7 +153,7 @@ private:
 	 * @returns HashKey for value
 	 */
 	HashKey* GetHash(Val* v) const; // this probably should go somewhere else.
-	HashKey* GetHash(const ValPtr& v) const
+	HashKey* GetHash(const zeek::ValPtr& v) const
 		{ return GetHash(v.get()); }
 
 	/**

src/probabilistic/bloom-filter.bif

@@ -46,7 +46,7 @@ function bloomfilter_basic_init%(fp: double, capacity: count,
                                  name->Len());
 	const Hasher* h = new DoubleHasher(optimal_k, seed);
 
-	return zeek::make_intrusive<BloomFilterVal>(new BasicBloomFilter(h, cells));
+	return zeek::make_intrusive<zeek::BloomFilterVal>(new BasicBloomFilter(h, cells));
 	%}
 
 ## Creates a basic Bloom filter. This function serves as a low-level
@@ -86,7 +86,7 @@ function bloomfilter_basic_init2%(k: count, cells: count,
 				       name->Len());
 	const Hasher* h = new DoubleHasher(k, seed);
 
-	return zeek::make_intrusive<BloomFilterVal>(new BasicBloomFilter(h, cells));
+	return zeek::make_intrusive<zeek::BloomFilterVal>(new BasicBloomFilter(h, cells));
 	%}
 
 ## Creates a counting Bloom filter.
@@ -130,7 +130,7 @@ function bloomfilter_counting_init%(k: count, cells: count, max: count,
 	while ( max >>= 1 )
 		++width;
 
-	return zeek::make_intrusive<BloomFilterVal>(new CountingBloomFilter(h, cells, width));
+	return zeek::make_intrusive<zeek::BloomFilterVal>(new CountingBloomFilter(h, cells, width));
 	%}
 
 ## Adds an element to a Bloom filter.
@@ -245,5 +245,5 @@ function bloomfilter_merge%(bf1: opaque of bloomfilter,
 function bloomfilter_internal_state%(bf: opaque of bloomfilter%): string
 	%{
 	BloomFilterVal* bfv = static_cast<BloomFilterVal*>(bf);
-	return zeek::make_intrusive<StringVal>(bfv->InternalState());
+	return zeek::make_intrusive<zeek::StringVal>(bfv->InternalState());
 	%}

src/probabilistic/cardinality-counter.bif

@@ -23,7 +23,7 @@ module GLOBAL;
 function hll_cardinality_init%(err: double, confidence: double%): opaque of cardinality
 	%{
 	CardinalityCounter* c = new CardinalityCounter(err, confidence);
-	auto cv = zeek::make_intrusive<CardinalityVal>(c);
+	auto cv = zeek::make_intrusive<zeek::CardinalityVal>(c);
 
 	return cv;
 	%}
@@ -113,7 +113,7 @@ function hll_cardinality_estimate%(handle: opaque of cardinality%): double
 
 	double estimate = h->Size();
 
-	return zeek::make_intrusive<DoubleVal>(estimate);
+	return zeek::make_intrusive<zeek::DoubleVal>(estimate);
 	%}
 
 ## Copy a HLL cardinality counter.
@@ -129,7 +129,7 @@ function hll_cardinality_copy%(handle: opaque of cardinality%): opaque of cardin
 	CardinalityVal* cv = static_cast<CardinalityVal*>(handle);
 	CardinalityCounter* h = cv->Get();
 	CardinalityCounter* h2 = new CardinalityCounter(*h);
-	auto out = zeek::make_intrusive<CardinalityVal>(h2);
+	auto out = zeek::make_intrusive<zeek::CardinalityVal>(h2);
 
 	return out;
 	%}