shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Fix for gcc compilation warnings

Browse Source 
and put _XOPEN_SOURCE so pthread_mutexattr is properly defined.
This commit is contained in:
Zdenek Kabelac 2011-09-17 13:33:51 +00:00
parent eb607100ef
commit 1b8724d866
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
daemons/lvmetad/lvmetad-core.c
View File

@ -1,3 +1,6 @@
#define _GNU_SOURCE
#define _XOPEN_SOURCE 500 /* pthread */
#include <assert.h> #include <assert.h>
#include <pthread.h> #include <pthread.h>
#include <malloc.h> #include <malloc.h>
@ -19,6 +22,7 @@ typedef struct {
} lock; } lock;
} lvmetad_state; } lvmetad_state;
__attribute__ ((format(printf, 1, 2)))
static void debug(const char *fmt, ...) { static void debug(const char *fmt, ...) {
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
@ -42,8 +46,11 @@ static void unlock_pvid_map(lvmetad_state *s) { pthread_mutex_unlock(&s->lock.pv
* allocating memory that we never release. Not good. * allocating memory that we never release. Not good.
*/ */
static struct dm_config_tree *lock_vg(lvmetad_state *s, const char *id) { static struct dm_config_tree *lock_vg(lvmetad_state *s, const char *id) {
pthread_mutex_t *vg;
struct dm_config_tree *cft;
lock_vgs(s); lock_vgs(s);
pthread_mutex_t *vg = dm_hash_lookup(s->lock.vg, id); vg = dm_hash_lookup(s->lock.vg, id);
if (!vg) { if (!vg) {
pthread_mutexattr_t rec; pthread_mutexattr_t rec;
pthread_mutexattr_init(&rec); pthread_mutexattr_init(&rec);
@ -53,7 +60,7 @@ static struct dm_config_tree *lock_vg(lvmetad_state *s, const char *id) {
dm_hash_insert(s->lock.vg, id, vg); dm_hash_insert(s->lock.vg, id, vg);
} }
pthread_mutex_lock(vg); pthread_mutex_lock(vg);
struct dm_config_tree *cft = dm_hash_lookup(s->vgs, id); cft = dm_hash_lookup(s->vgs, id);
unlock_vgs(s); unlock_vgs(s);
return cft; return cft;
} }
@ -81,6 +88,7 @@ static void set_flag(struct dm_config_tree *cft, struct dm_config_node *parent,
const char *field, const char *flag, int want) { const char *field, const char *flag, int want) {
struct dm_config_value *value = NULL, *pred = NULL; struct dm_config_value *value = NULL, *pred = NULL;
struct dm_config_node *node = dm_config_find_node(parent->child, field); struct dm_config_node *node = dm_config_find_node(parent->child, field);
struct dm_config_value *new;
if (node) if (node)
value = node->v; value = node->v;
@ -112,7 +120,7 @@ static void set_flag(struct dm_config_tree *cft, struct dm_config_node *parent,
node->parent = parent; node->parent = parent;
parent->child = node; parent->child = node;
} }
struct dm_config_value *new = dm_config_create_value(cft); new = dm_config_create_value(cft);
new->type = DM_CFG_STRING; new->type = DM_CFG_STRING;
new->v.str = flag; new->v.str = flag;
new->next = node->v; new->next = node->v;
@ -126,10 +134,11 @@ static int update_pv_status(lvmetad_state *s,
struct dm_config_tree *cft, struct dm_config_tree *cft,
struct dm_config_node *vg, int act) struct dm_config_node *vg, int act)
{ {
struct dm_config_node *pv;
int complete = 1; int complete = 1;
lock_pvs(s); lock_pvs(s);
struct dm_config_node *pv = pvs(vg); pv = pvs(vg);
while (pv) { while (pv) {
const char *uuid = dm_config_find_str(pv->child, "id", NULL); const char *uuid = dm_config_find_str(pv->child, "id", NULL);
int found = uuid ? (dm_hash_lookup(s->pvs, uuid) ? 1 : 0) : 0; int found = uuid ? (dm_hash_lookup(s->pvs, uuid) ? 1 : 0) : 0;
@ -151,18 +160,21 @@ static int update_pv_status(lvmetad_state *s,
static response vg_by_uuid(lvmetad_state *s, request r) static response vg_by_uuid(lvmetad_state *s, request r)
{ {
struct dm_config_tree *cft;
struct dm_config_node *metadata;
struct dm_config_node *n;
response res = { .buffer = NULL };
const char *uuid = daemon_request_str(r, "uuid", "NONE"); const char *uuid = daemon_request_str(r, "uuid", "NONE");
debug("vg_by_uuid: %s (vgs = %p)\n", uuid, s->vgs); debug("vg_by_uuid: %s (vgs = %p)\n", uuid, s->vgs);
struct dm_config_tree *cft = lock_vg(s, uuid); cft = lock_vg(s, uuid);
if (!cft || !cft->root) { if (!cft || !cft->root) {
unlock_vg(s, uuid); unlock_vg(s, uuid);
return daemon_reply_simple("failed", "reason = %s", "uuid not found", NULL); return daemon_reply_simple("failed", "reason = %s", "uuid not found", NULL);
} }
struct dm_config_node *metadata = cft->root; metadata = cft->root;
response res = { .buffer = NULL };
struct dm_config_node *n;
res.cft = dm_config_create(NULL, 0); res.cft = dm_config_create(NULL, 0);
/* The response field */ /* The response field */
@ -249,14 +261,19 @@ static int update_pvid_map(lvmetad_state *s, struct dm_config_tree *vg, const ch
* (anything that might have been retained is copied). */ * (anything that might have been retained is copied). */
static int update_metadata(lvmetad_state *s, const char *_vgid, struct dm_config_node *metadata) static int update_metadata(lvmetad_state *s, const char *_vgid, struct dm_config_node *metadata)
{ {
struct dm_config_tree *cft;
struct dm_config_tree *old;
const char *vgid;
int retval = 0; int retval = 0;
int haveseq = -1;
int seq;
lock_vgs(s); lock_vgs(s);
struct dm_config_tree *old = dm_hash_lookup(s->vgs, _vgid); old = dm_hash_lookup(s->vgs, _vgid);
lock_vg(s, _vgid); lock_vg(s, _vgid);
unlock_vgs(s); unlock_vgs(s);
int seq = dm_config_find_int(metadata, "metadata/seqno", -1); seq = dm_config_find_int(metadata, "metadata/seqno", -1);
int haveseq = -1;
if (old) if (old)
haveseq = dm_config_find_int(old->root, "metadata/seqno", -1); haveseq = dm_config_find_int(old->root, "metadata/seqno", -1);
@ -278,9 +295,9 @@ static int update_metadata(lvmetad_state *s, const char *_vgid, struct dm_config
goto out; goto out;
} }
struct dm_config_tree *cft = dm_config_create(NULL, 0); cft = dm_config_create(NULL, 0);
cft->root = dm_config_clone_node(cft, metadata, 0); cft->root = dm_config_clone_node(cft, metadata, 0);
const char *vgid = dm_config_find_str(cft->root, "metadata/id", NULL); vgid = dm_config_find_str(cft->root, "metadata/id", NULL);
if (!vgid) if (!vgid)
goto out; goto out;
@ -313,6 +330,7 @@ static response pv_add(lvmetad_state *s, request r)
struct dm_config_node *metadata = dm_config_find_node(r.cft->root, "metadata"); struct dm_config_node *metadata = dm_config_find_node(r.cft->root, "metadata");
const char *pvid = daemon_request_str(r, "uuid", NULL); const char *pvid = daemon_request_str(r, "uuid", NULL);
const char *vgid = daemon_request_str(r, "metadata/id", NULL); const char *vgid = daemon_request_str(r, "metadata/id", NULL);
int complete = 0;
if (!pvid) if (!pvid)
return daemon_reply_simple("failed", "reason = %s", "need PV UUID", NULL); return daemon_reply_simple("failed", "reason = %s", "need PV UUID", NULL);
@ -338,7 +356,6 @@ static response pv_add(lvmetad_state *s, request r)
unlock_pvid_map(s); unlock_pvid_map(s);
} }
int complete = 0;
if (vgid) { if (vgid) {
struct dm_config_tree *cft = lock_vg(s, vgid); struct dm_config_tree *cft = lock_vg(s, vgid);
complete = update_pv_status(s, cft, cft->root, 0); complete = update_pv_status(s, cft, cft->root, 0);
@ -374,14 +391,13 @@ static response handler(daemon_state s, client_handle h, request r)
static int init(daemon_state *s) static int init(daemon_state *s)
{ {
pthread_mutexattr_t rec;
lvmetad_state *ls = s->private; lvmetad_state *ls = s->private;
ls->pvs = dm_hash_create(32); ls->pvs = dm_hash_create(32);
ls->vgs = dm_hash_create(32); ls->vgs = dm_hash_create(32);
ls->pvid_map = dm_hash_create(32); ls->pvid_map = dm_hash_create(32);
ls->lock.vg = dm_hash_create(32); ls->lock.vg = dm_hash_create(32);
pthread_mutexattr_t rec;
pthread_mutexattr_init(&rec); pthread_mutexattr_init(&rec);
pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE_NP); pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE_NP);
pthread_mutex_init(&ls->lock.pvs, NULL); pthread_mutex_init(&ls->lock.pvs, NULL);
@ -400,9 +416,10 @@ static int init(daemon_state *s)
static int fini(daemon_state *s) static int fini(daemon_state *s)
{ {
debug("fini\n");
lvmetad_state *ls = s->private; lvmetad_state *ls = s->private;
struct dm_hash_node *n = dm_hash_get_first(ls->vgs); struct dm_hash_node *n = dm_hash_get_first(ls->vgs);
debug("fini\n");
while (n) { while (n) {
dm_config_destroy(dm_hash_get_data(ls->vgs, n)); dm_config_destroy(dm_hash_get_data(ls->vgs, n));
n = dm_hash_get_next(ls->vgs, n); n = dm_hash_get_next(ls->vgs, n);
@ -447,6 +464,7 @@ int main(int argc, char *argv[])
s.handler = handler; s.handler = handler;
s.socket_path = "/var/run/lvm/lvmetad.socket"; s.socket_path = "/var/run/lvm/lvmetad.socket";
s.pidfile = "/var/run/lvm/lvmetad.pid"; s.pidfile = "/var/run/lvm/lvmetad.pid";
s.log_level = 0;
while ((opt = getopt(argc, argv, "?fhVdR")) != EOF) { while ((opt = getopt(argc, argv, "?fhVdR")) != EOF) {
switch (opt) { switch (opt) {