C++ helper function split_by_clusters: allow initialization with number of processors

This can avoid issues when the no task is assigned to the last partition, in
which case the existing code would leave the last partions in the Clusters
data structure uninitialized.

2 files changed, 5 insertions, 2 deletions

diff --git a/native/include/blocking.h b/native/include/blocking.h
index cbb4d15..efa9cad 100644
--- a/native/include/blocking.h
+++ b/native/include/blocking.h
@@ -30,7 +30,7 @@ void sort_by_request_length(ContentionSet& cs);
 typedef std::vector<const TaskInfo*> Cluster;
 typedef std::vector<Cluster> Clusters;
 
-void split_by_cluster(const ResourceSharingInfo& info, Clusters& clusters);
+void split_by_cluster(const ResourceSharingInfo& info, Clusters& clusters, unsigned int num_cpus = 0);
 void split_by_resource(const ResourceSharingInfo& info, Resources& resources);
 void split_by_resource(const Cluster& cluster, Resources& resources);
 void split_by_resource(const Clusters& clusters, ClusterResources& resources);
diff --git a/native/src/sharedres.cpp b/native/src/sharedres.cpp
index 97cf466..5caa75e 100644
--- a/native/src/sharedres.cpp
+++ b/native/src/sharedres.cpp
@@ -72,8 +72,11 @@ unsigned int RequestBound::get_max_num_requests(unsigned long interval) const
 // ****** non-exported helpers *******
 
 
-void split_by_cluster(const ResourceSharingInfo& info, Clusters& clusters)
+void split_by_cluster(const ResourceSharingInfo& info, Clusters& clusters, unsigned int num_cpus)
 {
+        if (num_cpus > 0)
+                while (num_cpus > clusters.size())
+                        clusters.push_back(Cluster());
         foreach(info.get_tasks(), it)
         {
                 const TaskInfo& tsk  = *it;