*
*/
-
+
#include <stdio.h>
#include <string.h>
return 0;
}
-const char* mmf_value_get_string(const mmf_value_t *v, int *size)
+char* mmf_value_get_string(const mmf_value_t *v, int *size)
{
return_val_if_fail(v && v->type == MMF_VALUE_TYPE_STRING, NULL);
*size=v->size;
{
return_val_if_fail(item, false);
return_val_if_fail(item->value.type == MMF_VALUE_TYPE_INT, false);
-
+
bool valid = true;
int i = 0;
-
+
switch (item->value_spec.type) {
case MMF_VALUE_SPEC_INT_RANGE:
- if (val < item->value_spec.spec.int_spec.range.min ||
+ if (val < item->value_spec.spec.int_spec.range.min ||
val > item->value_spec.spec.int_spec.range.max) {
valid = false;
//mmf_debug(MMF_DEBUG_LOG, "[mmf_attribute:%s] out of range\n", item->name);
}
break;
default:
- break;
+ break;
}
-
+
return valid;
}
{
return_val_if_fail(item, false);
return_val_if_fail(item->value.type == MMF_VALUE_TYPE_DOUBLE, false);
-
+
bool valid = true;
int i = 0;
-
+
switch (item->value_spec.type) {
case MMF_VALUE_SPEC_DOUBLE_RANGE:
- if (val < item->value_spec.spec.double_spec.range.min ||
+ if (val < item->value_spec.spec.double_spec.range.min ||
val > item->value_spec.spec.double_spec.range.max) {
valid = false;
//mmf_debug(MMF_DEBUG_LOG, "[mmf_attribute:%s] out of range\n", item->name);
}
break;
default:
- break;
+ break;
}
-
+
return valid;
}
mmf_value_clear(&item->tmpval);
mmf_value_clear(&item->value);
mmf_value_spec_clear(&item->value_spec);
+ pthread_mutex_destroy(&item->write_lock);
}
bool mmf_attribute_is_modified(mmf_attribute_t *item)
return_val_if_fail(item, -1);
if (mmf_value_set_string(&item->tmpval, string,size) == 0) {
- if (string)
- item->flags |= MM_ATTRS_FLAG_MODIFIED;
-
+ if (string)
+ item->flags |= MM_ATTRS_FLAG_MODIFIED;
+
return 0;
}
return -1;
attrs->count = count;
attrs->items = (mmf_attribute_t *) malloc (sizeof(mmf_attribute_t) * count);
- memset(attrs->items, 0, sizeof(mmf_attribute_t) * count);
+ if(attrs->items == NULL) {
+ debug_error("Failed to malloc for attrs->items.");
+ free(attrs);
+ attrs=NULL;
+ return 0;
+ }
- if (pthread_mutex_init(&attrs->write_lock, NULL) != 0) {
- //mmf_debug(MMF_DEBUG_ERROR, "mutex init failed");
- if (attrs) {
- if (attrs->items) {
- free(attrs->items);
- attrs->items = NULL;
- }
- free(attrs);
- attrs=NULL;
- }
- return 0;
- }
+ memset(attrs->items, 0, sizeof(mmf_attribute_t) * count);
return (MMHandleType) attrs;
}
free(attrs->items);
attrs->items = NULL;
}
- pthread_mutex_destroy(&attrs->write_lock);
free(attrs);
}
}
{
return_val_if_fail(h && info && count > 0, -1);
mmf_attrs_t *attrs = (mmf_attrs_t *) h;
+ mmf_attribute_t *item = NULL;
int i;
int size = 0;
for (i = 0; i < count; i++) {
- mmf_attribute_init(&attrs->items[i],
+ item = &attrs->items[i];
+
+ pthread_mutex_init(&item->write_lock, NULL);
+
+ mmf_attribute_init(item,
info[i].name,
info[i].value_type,
info[i].flags);
switch (info[i].value_type) {
case MMF_VALUE_TYPE_INT:
- assert(attrs->items[i].value.value.i_val == 0);
- mmf_value_set_int(&attrs->items[i].value,
- (int)info[i].default_value);
+ assert(item->value.value.i_val == 0);
+ mmf_value_set_int(&item->value,
+ (intptr_t)info[i].default_value);
break;
case MMF_VALUE_TYPE_DOUBLE:
{
- int i_val = (int)info[i].default_value;
+ int i_val = (intptr_t)info[i].default_value;
double d_val = (double) i_val;
- assert(attrs->items[i].value.value.d_val == 0);
- mmf_value_set_double(&attrs->items[i].value, d_val);
+ assert(item->value.value.d_val == 0);
+ mmf_value_set_double(&item->value, d_val);
break;
}
case MMF_VALUE_TYPE_STRING:
- assert(attrs->items[i].value.value.s_val == NULL);
+ assert(item->value.value.s_val == NULL);
if (info[i].default_value) {
size = strlen(info[i].default_value)+1;
}
- mmf_value_set_string(&attrs->items[i].value,
+ mmf_value_set_string(&item->value,
(const char *)info[i].default_value,size);
break;
case MMF_VALUE_TYPE_DATA:
- assert(attrs->items[i].value.value.p_val == NULL);
+ assert(item->value.value.p_val == NULL);
if (info[i].default_value) {
size = sizeof(info[i].default_value)+1;
}
- mmf_value_set_data(&attrs->items[i].value, info[i].default_value,size);
+ mmf_value_set_data(&item->value, info[i].default_value,size);
break;
default:
//mmf_debug(MMF_DEBUG_LOG, "ERROR: Invalid MMF_VALUE_TYPE\n");
int mmf_attrs_commit(MMHandleType h)
{
return_val_if_fail(h, -1);
-
+
mmf_attrs_t *attrs = (mmf_attrs_t * )h;
+ mmf_attribute_t *item = NULL;
int i;
int ret = 0;
- MM_ATTRS_WRITE_LOCK(attrs);
-
for (i = 0; i < attrs->count; ++i) {
- if (mmf_attribute_is_modified(&attrs->items[i])) {
+ item = &attrs->items[i];
+
+ MM_ATTR_ITEM_WRITE_LOCK(item);
+
+ if (mmf_attribute_is_modified(item)) {
if (attrs->commit_func) {
- if (attrs->commit_func(i, attrs->items[i].name,
- &attrs->items[i].tmpval,
+ if (attrs->commit_func(i, item->name,
+ &item->tmpval,
attrs->commit_param)) {
- mmf_attribute_commit(&attrs->items[i]);
+ mmf_attribute_commit(item);
} else {
/* without this, there is no way to solve modify when commit_func failed. */
- if (attrs->items[i].flags & MM_ATTRS_FLAG_MODIFIED)
- attrs->items[i].flags ^= MM_ATTRS_FLAG_MODIFIED;
+ if (item->flags & MM_ATTRS_FLAG_MODIFIED)
+ item->flags ^= MM_ATTRS_FLAG_MODIFIED;
ret = -1;
}
} else {
- mmf_attribute_commit(&attrs->items[i]);
+ mmf_attribute_commit(item);
}
}
- }
- MM_ATTRS_WRITE_UNLOCK(attrs);
+ MM_ATTR_ITEM_WRITE_UNLOCK(item);
+ }
return ret;
}
int mmf_attrs_commit_err(MMHandleType h, char **err_attr_name)
{
mmf_attrs_t *attrs = (mmf_attrs_t * )h;
+ mmf_attribute_t *item = NULL;
int i;
int ret = 0;
return_val_if_fail(h, -1);
- MM_ATTRS_WRITE_LOCK(attrs);
-
for (i = 0; i < attrs->count; ++i) {
- if (mmf_attribute_is_modified(&attrs->items[i])) {
+ item = &attrs->items[i];
+
+ MM_ATTR_ITEM_WRITE_LOCK(item);
+
+ if (mmf_attribute_is_modified(item)) {
if (attrs->commit_func) {
- if (attrs->commit_func(i, attrs->items[i].name,
- &attrs->items[i].tmpval,
+ if (attrs->commit_func(i, item->name,
+ &item->tmpval,
attrs->commit_param)) {
- mmf_attribute_commit(&attrs->items[i]);
+ mmf_attribute_commit(item);
} else {
/* without this, there is no way to solve modify when commit_func failed. */
- if (attrs->items[i].flags & MM_ATTRS_FLAG_MODIFIED)
- attrs->items[i].flags ^= MM_ATTRS_FLAG_MODIFIED;
+ if (item->flags & MM_ATTRS_FLAG_MODIFIED)
+ item->flags ^= MM_ATTRS_FLAG_MODIFIED;
ret = -1;
/* Set Error information */
if (err_attr_name)
- *err_attr_name = strdup(attrs->items[i].name);
+ *err_attr_name = strdup(item->name);
+ MM_ATTR_ITEM_WRITE_UNLOCK(item);
break;
}
} else {
- mmf_attribute_commit(&attrs->items[i]);
+ mmf_attribute_commit(item);
}
}
- }
- MM_ATTRS_WRITE_UNLOCK(attrs);
+ MM_ATTR_ITEM_WRITE_UNLOCK(item);
+ }
return ret;
}
projects / platform / core / multimedia / libmm-common.git / blobdiff