Skip to content

Commit

Permalink
samplers: API CHANGE - Remove sampler get_set() function
Browse files Browse the repository at this point in the history 
The get_set() function has been unused for a long time. Remove it.
  • Loading branch information
@morrone
morrone committed Aug 19, 2024
1 parent 60ebdcc commit f100503
Show file tree
Hide file tree
Showing 87 changed files with 0 additions and 538 deletions.
6 changes: 0 additions & 6 deletions ldms/src/contrib/sampler/daos/daos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,6 @@ static void term(struct ldmsd_plugin *self)
ovis_log_destroy(mylog);
}

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return NULL;
}

static const char *usage(struct ldmsd_plugin *self)
{
dao_log(OVIS_LDEBUG, "usage() called\n");
Expand All @@ -245,7 +240,6 @@ static struct ldmsd_sampler daos_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
7 changes: 0 additions & 7 deletions ldms/src/contrib/sampler/geopm_sampler/ldms_geopm_sampler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,12 +506,6 @@ static int config(struct ldmsd_plugin *self, struct attr_value_list *kwl, struct
return rc;
}


static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return g_set;
}

static int sample(struct ldmsd_sampler *self)
{
int rc = 0;
Expand Down Expand Up @@ -578,7 +572,6 @@ static struct ldmsd_sampler g_geopm_sampler_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
10 changes: 0 additions & 10 deletions ldms/src/contrib/sampler/gpu_metrics_sampler/gpu_metrics_ldms_sampler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,6 @@ static int config(struct ldmsd_plugin *self,
return rc;
}

/**
* LDMS call this function to obtain the current set of metrics.
* @param self this plugin instance.
* @return current set of metrics.
*/
static ldms_set_t get_set(struct ldmsd_sampler *self) {
return set;
}

/**
* LDMS calls this function to sample GPU metrics and store them in the metrics set.
* @param self
Expand Down Expand Up @@ -357,7 +348,6 @@ static struct ldmsd_sampler gpu_metrics_plugin = {
.config = config, // constructor
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/contrib/sampler/ipmireader/ipmireader.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,11 +429,6 @@ static int config(struct ldmsd_plugin *self, struct attr_value_list *kwl, struct
return rc;
}

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static int sample(struct ldmsd_sampler *self)
{
int metric_no;
Expand Down Expand Up @@ -542,7 +537,6 @@ static struct ldmsd_sampler ipmireader_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/contrib/sampler/ipmireader/ipmisensors.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,11 +305,6 @@ static int config(struct ldmsd_plugin *self, struct attr_value_list *kwl, struct
return rc;
}

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static int sample(struct ldmsd_sampler *self)
{
int metric_no;
Expand Down Expand Up @@ -400,7 +395,6 @@ static struct ldmsd_sampler ipmisensors_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/contrib/sampler/tutorial/tutorial_sampler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,6 @@ static int config(struct ldmsd_plugin *self, struct attr_value_list *kwl, struct
return rc;
}

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return NULL;
}

static int sample(struct ldmsd_sampler *self)
{
int metric_no;
Expand Down Expand Up @@ -266,7 +261,6 @@ static struct ldmsd_sampler tutorial_sampler_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/contrib/sampler/variorum_sampler/variorum_sampler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,6 @@ static int sample(struct ldmsd_sampler *self)

}

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static void term(struct ldmsd_plugin *self)
{
int metric;
Expand Down Expand Up @@ -238,7 +233,6 @@ static struct ldmsd_sampler variorum_sampler_plugin = {
.config = config,
.usage= usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
1 change: 0 additions & 1 deletion ldms/src/ldmsd/ldmsd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,6 @@ struct ldmsd_plugin {

struct ldmsd_sampler {
struct ldmsd_plugin base;
ldms_set_t (*get_set)(struct ldmsd_sampler *self);
int (*sample)(struct ldmsd_sampler *self);
};

Expand Down
9 changes: 0 additions & 9 deletions ldms/src/sampler/appinfo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,14 +375,6 @@ static int config(struct ldmsd_plugin *self, struct attr_value_list *kwl,
return rc;
}

/**
* Sampler metric set accessor (required).
**/
static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

/**
* Sample data. In the appinfo sampler, we need to find in the shared
* memory the next process data structure that is ready for sampling,
Expand Down Expand Up @@ -488,7 +480,6 @@ static struct ldmsd_sampler appinfo_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/sampler/aries_mmr/aries_linkstatus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,6 @@ static int config(struct ldmsd_plugin *self, struct attr_value_list *kwl, struct
return EINVAL;
}

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static int sample(struct ldmsd_sampler *self)
{
int rc, row, col;
Expand Down Expand Up @@ -321,7 +316,6 @@ static struct ldmsd_sampler aries_linkstatus_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
8 changes: 0 additions & 8 deletions ldms/src/sampler/aries_mmr/aries_mmr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,13 +521,6 @@ static int sample(struct ldmsd_sampler *self){

}



static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static void term(struct ldmsd_plugin *self)
{

Expand Down Expand Up @@ -590,7 +583,6 @@ static struct ldmsd_sampler aries_mmr_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
7 changes: 0 additions & 7 deletions ldms/src/sampler/aries_mmr/aries_mmr_configurable.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -945,12 +945,6 @@ static int sample(struct ldmsd_sampler *self)

}


static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static void term(struct ldmsd_plugin *self)
{
int i;
Expand All @@ -975,7 +969,6 @@ static struct ldmsd_sampler aries_mmr_configurable_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
8 changes: 0 additions & 8 deletions ldms/src/sampler/aries_mmr/aries_nic_mmr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,13 +517,6 @@ static int sample(struct ldmsd_sampler *self){

}



static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static void term(struct ldmsd_plugin *self)
{

Expand Down Expand Up @@ -588,7 +581,6 @@ static struct ldmsd_sampler aries_nic_mmr_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
8 changes: 0 additions & 8 deletions ldms/src/sampler/aries_mmr/aries_rtr_mmr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,13 +515,6 @@ static int sample(struct ldmsd_sampler *self){

}



static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static void term(struct ldmsd_plugin *self)
{

Expand Down Expand Up @@ -586,7 +579,6 @@ static struct ldmsd_sampler aries_rtr_mmr_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/sampler/blob_stream/blob_stream_writer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -643,11 +643,6 @@ static const char *usage(struct ldmsd_plugin *self)
;
}

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return NULL;
}

static int sample(struct ldmsd_sampler *self)
{
return 0;
Expand All @@ -661,7 +656,6 @@ static struct ldmsd_sampler blob_stream_writer = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/sampler/clock/clock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,6 @@ static int config(struct ldmsd_plugin *self, struct attr_value_list *kwl, struct
return rc;
}

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static int sample(struct ldmsd_sampler *self)
{
union ldms_value v;
Expand Down Expand Up @@ -221,7 +216,6 @@ static struct ldmsd_sampler clock_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/sampler/coretemp/coretemp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,6 @@ static ldms_set_t set;
static ovis_log_t mylog;
static base_data_t base;

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static int create_metric_set(base_data_t base)
{
int rc;
Expand Down Expand Up @@ -430,7 +425,6 @@ static struct ldmsd_sampler coretemp_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/sampler/cray_system_sampler/cray_aries_r_sampler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ static int off_hsn = 0;

static base_data_t base;

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static int create_metric_set(base_data_t base)
{
int rc, i;
Expand Down Expand Up @@ -361,7 +356,6 @@ static struct ldmsd_sampler cray_aries_r_sampler_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
6 changes: 0 additions & 6 deletions ldms/src/sampler/cray_system_sampler/cray_gemini_r_sampler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ static int off_hsn = 0;

static base_data_t base;

static ldms_set_t get_set(struct ldmsd_sampler *self)
{
return set;
}

static int create_metric_set(base_data_t base)
{

Expand Down Expand Up @@ -370,7 +365,6 @@ static struct ldmsd_sampler cray_gemini_r_sampler_plugin = {
.config = config,
.usage = usage,
},
.get_set = get_set,
.sample = sample,
};

Expand Down
Loading

0 comments on commit f100503

Please sign in to comment.