package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-05 17:16:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[rk_env]: add default value to env_get function

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@35 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-08-05 08:46:46 +00:00
parent ef042eb9df
commit 1fe9a769fc
11 changed files with 106 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
osal/android/os_env.c
View File

@@ -25,49 +25,52 @@
* So the library should compiled on latest ndk * So the library should compiled on latest ndk
*/ */
RK_S32 os_get_env_u32(const char *name, RK_U32 *val) RK_S32 os_get_env_u32(const char *name, RK_U32 *value, RK_U32 default_value)
{ {
RK_S32 ret = -1; char prop[PROP_VALUE_MAX+1];
char value[PROP_VALUE_MAX+1]; int len = __system_property_get(name, prop);
int len = __system_property_get(name, value);
*val = 0;
if (len > 0) { if (len > 0) {
char *endptr; char *endptr;
int base = (value[0] == '0' && value[1] == 'x')?(16):(10); int base = (prop[0] == '0' && prop[1] == 'x')?(16):(10);
errno = 0; errno = 0;
*val = strtoul(value, &endptr, base); *value = strtoul(prop, &endptr, base);
if (errno || (value == endptr)) { if (errno || (prop == endptr)) {
errno = 0; errno = 0;
*value = default_value;
}
} else { } else {
ret = 0; *value = default_value;
} }
} return 0;
return ret;
} }
RK_S32 os_get_env_str(const char *name, char **val) RK_S32 os_get_env_str(const char *name, char **value, char *default_value)
{ {
// use unsigned char to avoid warnning // use unsigned char to avoid warnning
static unsigned char env_str[2][PROP_VALUE_MAX+1]; static unsigned char env_str[2][PROP_VALUE_MAX+1];
static RK_U32 env_idx = 0; static RK_U32 env_idx = 0;
char *value = (char *)env_str[env_idx]; char *prop = (char *)env_str[env_idx];
int len = __system_property_get(name, value); int len = __system_property_get(name, prop);
*val = (len)?(value):(NULL); if (len > 0) {
env_idx = (len)?(!env_idx):(env_idx); *value = prop;
return (len)?(0):(-1); env_idx = !env_idx;
} else {
*value = default_value;
}
return 0;
} }
RK_S32 os_set_env_u32(const char *name, RK_U32 val) RK_S32 os_set_env_u32(const char *name, RK_U32 value)
{ {
char buf[PROP_VALUE_MAX+1+2]; char buf[PROP_VALUE_MAX+1+2];
snprintf(buf, sizeof(buf), "0x%x", val); snprintf(buf, sizeof(buf), "0x%x", value);
int len = __system_property_set(name, buf); int len = __system_property_set(name, buf);
return (len)?(0):(-1); return (len)?(0):(-1);
} }
RK_S32 os_set_env_str(const char *name, char *val) RK_S32 os_set_env_str(const char *name, char *value)
{ {
int len = __system_property_set(name, val); int len = __system_property_set(name, value);
return (len)?(0):(-1); return (len)?(0):(-1);
} }

8
osal/inc/rk_env.h
View File

@@ -23,11 +23,11 @@
extern "C" { extern "C" {
#endif #endif
RK_S32 rk_get_env_u32(const char *name, RK_U32 *val); RK_S32 rk_get_env_u32(const char *name, RK_U32 *value, RK_U32 default_value);
RK_S32 rk_get_env_str(const char *name, char **val); RK_S32 rk_get_env_str(const char *name, char **value, char *default_value);
RK_S32 rk_set_env_u32(const char *name, RK_U32 val); RK_S32 rk_set_env_u32(const char *name, RK_U32 value);
RK_S32 rk_set_env_str(const char *name, char *val); RK_S32 rk_set_env_str(const char *name, char *value);
#ifdef __cplusplus #ifdef __cplusplus
} }

3
osal/inc/rk_malloc.h
View File

@@ -26,7 +26,8 @@
extern "C" { extern "C" {
#endif #endif
void rk_mpp_set_memalign(size_t size); void rk_mpp_set_mem_align(size_t size);
void rk_mpp_show_mem_status();
void *rk_mpp_malloc(size_t size); void *rk_mpp_malloc(size_t size);
void rk_mpp_free(void *ptr); void rk_mpp_free(void *ptr);

33
osal/linux/os_env.c
View File

@@ -16,33 +16,48 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h>
#include "os_env.h" #include "os_env.h"
#define ENV_BUF_SIZE_LINUX 1024 #define ENV_BUF_SIZE_LINUX 1024
RK_S32 os_get_env_u32(const char *name, RK_U32 *val) RK_S32 os_get_env_u32(const char *name, RK_U32 *value, RK_U32 default_value)
{ {
char *ptr = getenv(name); char *ptr = getenv(name);
*val = (RK_U32)atoi(ptr); if (NULL == ptr) {
*value = default_value;
} else {
char *endptr;
int base = (ptr[0] == '0' && ptr[1] == 'x')?(16):(10);
errno = 0;
*value = strtoul(ptr, &endptr, base);
if (errno || (ptr == endptr)) {
errno = 0;
*value = default_value;
}
}
return 0; return 0;
} }
RK_S32 os_get_env_str(const char *name, char **val) RK_S32 os_get_env_str(const char *name, char **value, char *default_value)
{ {
*val = getenv(name); *value = getenv(name);
return (*val)?(0):(-1); if (NULL == *value) {
*value = default_value;
}
return 0;
} }
RK_S32 os_set_env_u32(const char *name, RK_U32 val) RK_S32 os_set_env_u32(const char *name, RK_U32 value)
{ {
char buf[ENV_BUF_SIZE_LINUX]; char buf[ENV_BUF_SIZE_LINUX];
snprintf(buf, sizeof(buf), "%u", val); snprintf(buf, sizeof(buf), "%u", value);
return setenv(name, buf, 1); return setenv(name, buf, 1);
} }
RK_S32 os_set_env_str(const char *name, char *val) RK_S32 os_set_env_str(const char *name, char *value)
{ {
return setenv(name, val, 1); return setenv(name, value, 1);
} }

8
osal/os_env.h
View File

@@ -23,11 +23,11 @@
extern "C" { extern "C" {
#endif #endif
RK_S32 os_get_env_u32(const char *name, RK_U32 *val); RK_S32 os_get_env_u32(const char *name, RK_U32 *value, RK_U32 default_value);
RK_S32 os_get_env_str(const char *name, char **val); RK_S32 os_get_env_str(const char *name, char **value, char *default_value);
RK_S32 os_set_env_u32(const char *name, RK_U32 val); RK_S32 os_set_env_u32(const char *name, RK_U32 value);
RK_S32 os_set_env_str(const char *name, char *val); RK_S32 os_set_env_str(const char *name, char *value);
#ifdef __cplusplus #ifdef __cplusplus
} }

16
osal/rk_env.cpp
View File

@@ -17,24 +17,24 @@
#include "rk_env.h" #include "rk_env.h"
#include "os_env.h" #include "os_env.h"
RK_S32 rk_get_env_u32(const char *name, RK_U32 *val) RK_S32 rk_get_env_u32(const char *name, RK_U32 *value, RK_U32 default_value)
{ {
return os_get_env_u32(name, val); return os_get_env_u32(name, value, default_value);
} }
RK_S32 rk_get_env_str(const char *name, char **val) RK_S32 rk_get_env_str(const char *name, char **value, char *default_value)
{ {
return os_get_env_str(name, val); return os_get_env_str(name, value, default_value);
} }
RK_S32 rk_set_env_u32(const char *name, RK_U32 val) RK_S32 rk_set_env_u32(const char *name, RK_U32 value)
{ {
return os_set_env_u32(name, val); return os_set_env_u32(name, value);
} }
RK_S32 rk_set_env_str(const char *name, char *val) RK_S32 rk_set_env_str(const char *name, char *value)
{ {
return os_set_env_str(name, val); return os_set_env_str(name, value);
} }

1
osal/rk_log.cpp
View File

@@ -56,7 +56,6 @@ RK_U32 rk_get_log_flag()
return mpp_log_flag; return mpp_log_flag;
} }
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

18
osal/rk_malloc.cpp
View File

@@ -17,18 +17,28 @@
#define LOG_TAG "rk_malloc" #define LOG_TAG "rk_malloc"
#include "rk_type.h" #include "rk_type.h"
#include "rk_log.h" #include "rk_log.h"
#include "rk_env.h"
#include "rk_malloc.h" #include "rk_malloc.h"
#include "os_malloc.h" #include "os_malloc.h"
// default memory align size is set to 64 // default memory align size is set to 64
static size_t rk_mpp_memalign = 64; static size_t rk_mpp_mem_align = 64;
static RK_S32 mem_protect_flag = -1;
void rk_mpp_set_memalign(size_t size) static inline RK_S32 mpp_get_mem_proctect_flag()
{
if (mem_protect_flag < 0) {
rk_get_env_u32("mpp_protect", (RK_U32 *)&mem_protect_flag, 0);
}
return mem_protect_flag;
}
void rk_mpp_set_mem_align(size_t size)
{ {
/* determine align size is power of 2 */ /* determine align size is power of 2 */
if (size && !(size & (size - 1))) if (size && !(size & (size - 1)))
rk_mpp_memalign = size; rk_mpp_mem_align = size;
else else
rk_log("set memalign to %d failed\n", size); rk_log("set memalign to %d failed\n", size);
} }
@@ -36,7 +46,7 @@ void rk_mpp_set_memalign(size_t size)
void *rk_mpp_malloc(size_t size) void *rk_mpp_malloc(size_t size)
{ {
void *ptr; void *ptr;
if (0 == os_malloc(&ptr, rk_mpp_memalign, size)) if (0 == os_malloc(&ptr, rk_mpp_mem_align, size))
return ptr; return ptr;
else else
return NULL; return NULL;

4
osal/test/rk_env_test.c
View File

@@ -36,8 +36,8 @@ int main()
env_string_str = NULL; env_string_str = NULL;
rk_log("clear local value to zero\n"); rk_log("clear local value to zero\n");
rk_get_env_u32(env_debug, &env_debug_u32); rk_get_env_u32(env_debug, &env_debug_u32, 0);
rk_get_env_str(env_string, &env_string_str); rk_get_env_str(env_string, &env_string_str, NULL);
rk_log("get env: %s is %u\n", env_debug, env_debug_u32); rk_log("get env: %s is %u\n", env_debug, env_debug_u32);
rk_log("get env: %s is %s\n", env_string, env_string_str); rk_log("get env: %s is %s\n", env_string, env_string_str);

2
osal/test/rk_malloc_test.c
View File

@@ -23,7 +23,7 @@ int main()
void *tmp = NULL; void *tmp = NULL;
rk_log("try memalign of 512\n"); rk_log("try memalign of 512\n");
rk_mpp_set_memalign(512); rk_mpp_set_mem_align(512);
tmp = rk_malloc(int, 100); tmp = rk_malloc(int, 100);
if (tmp) { if (tmp) {

32
osal/window/os_env.c
View File

@@ -20,30 +20,44 @@
#define ENV_BUF_SIZE_WIN 1024 #define ENV_BUF_SIZE_WIN 1024
RK_S32 os_get_env_u32(const char *name, RK_U32 *val) RK_S32 os_get_env_u32(const char *name, RK_U32 *value, RK_U32 default_value)
{ {
char *ptr = getenv(name); char *ptr = getenv(name);
*val = (RK_U32)atoi(ptr); if (NULL == ptr) {
*value = default_value;
} else {
char *endptr;
int base = (ptr[0] == '0' && ptr[1] == 'x')?(16):(10);
errno = 0;
*value = strtoul(ptr, &endptr, base);
if (errno || (ptr == endptr)) {
errno = 0;
*value = default_value;
}
}
return 0; return 0;
} }
RK_S32 os_get_env_str(const char *name, char **val) RK_S32 os_get_env_str(const char *name, char **value, char *default_value)
{ {
*val = getenv(name); *value = getenv(name);
return (*val)?(0):(-1); if (NULL == *value) {
*value = default_value;
}
return 0;
} }
RK_S32 os_set_env_u32(const char *name, RK_U32 val) RK_S32 os_set_env_u32(const char *name, RK_U32 value)
{ {
char buf[ENV_BUF_SIZE_WIN]; char buf[ENV_BUF_SIZE_WIN];
_snprintf(buf, sizeof(buf), "%s=%lu", name, val); _snprintf(buf, sizeof(buf), "%s=%lu", name, value);
return _putenv(buf); return _putenv(buf);
} }
RK_S32 os_set_env_str(const char *name, char *val) RK_S32 os_set_env_str(const char *name, char *value)
{ {
char buf[ENV_BUF_SIZE_WIN]; char buf[ENV_BUF_SIZE_WIN];
_snprintf(buf, sizeof(buf), "%s=%s", name, val); _snprintf(buf, sizeof(buf), "%s=%s", name, value);
return _putenv(buf); return _putenv(buf);
} }