You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/12/09 22:29:54 UTC
[1/2] incubator-mynewt-core git commit: kernel;
keep track of low-water mark with memory pools.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 42d981f28 -> ba813559b
kernel; keep track of low-water mark with memory pools.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/0395a1c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0395a1c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0395a1c7
Branch: refs/heads/develop
Commit: 0395a1c7aed9916d4990ecf76b999b883c49eafb
Parents: 42d981f
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Dec 9 11:00:35 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Dec 9 13:12:00 2016 -0800
----------------------------------------------------------------------
kernel/os/include/os/os_mempool.h | 2 ++
kernel/os/src/os_mempool.c | 5 +++++
mgmt/newtmgr/nmgr_os/src/newtmgr_os.c | 2 ++
sys/shell/src/shell_os.c | 8 +++++---
4 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0395a1c7/kernel/os/include/os/os_mempool.h
----------------------------------------------------------------------
diff --git a/kernel/os/include/os/os_mempool.h b/kernel/os/include/os/os_mempool.h
index d6aa237..2c2b0c3 100644
--- a/kernel/os/include/os/os_mempool.h
+++ b/kernel/os/include/os/os_mempool.h
@@ -47,6 +47,7 @@ struct os_mempool {
int mp_block_size; /* Size of the memory blocks, in bytes. */
int mp_num_blocks; /* The number of memory blocks. */
int mp_num_free; /* The number of free blocks left */
+ int mp_min_free; /* The lowest number of free blocks seen */
uint32_t mp_membuf_addr; /* Address of memory buffer used by pool */
STAILQ_ENTRY(os_mempool) mp_list;
SLIST_HEAD(,os_memblock); /* Pointer to list of free blocks */
@@ -59,6 +60,7 @@ struct os_mempool_info {
int omi_block_size;
int omi_num_blocks;
int omi_num_free;
+ int omi_min_free;
char omi_name[OS_MEMPOOL_INFO_NAME_LEN];
};
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0395a1c7/kernel/os/src/os_mempool.c
----------------------------------------------------------------------
diff --git a/kernel/os/src/os_mempool.c b/kernel/os/src/os_mempool.c
index e3682ab..6646826 100644
--- a/kernel/os/src/os_mempool.c
+++ b/kernel/os/src/os_mempool.c
@@ -77,6 +77,7 @@ os_mempool_init(struct os_mempool *mp, int blocks, int block_size,
/* Initialize the memory pool structure */
mp->mp_block_size = block_size;
mp->mp_num_free = blocks;
+ mp->mp_min_free = blocks;
mp->mp_num_blocks = blocks;
mp->mp_membuf_addr = (uint32_t)membuf;
mp->name = name;
@@ -165,6 +166,9 @@ os_memblock_get(struct os_mempool *mp)
/* Decrement number free by 1 */
mp->mp_num_free--;
+ if (mp->mp_min_free > mp->mp_num_free) {
+ mp->mp_min_free = mp->mp_num_free;
+ }
}
OS_EXIT_CRITICAL(sr);
}
@@ -233,6 +237,7 @@ os_mempool_info_get_next(struct os_mempool *mp, struct os_mempool_info *omi)
omi->omi_block_size = cur->mp_block_size;
omi->omi_num_blocks = cur->mp_num_blocks;
omi->omi_num_free = cur->mp_num_free;
+ omi->omi_min_free = cur->mp_min_free;
strncpy(omi->omi_name, cur->name, sizeof(omi->omi_name));
return (cur);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0395a1c7/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c
----------------------------------------------------------------------
diff --git a/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c b/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c
index c645ee0..4a02c30 100644
--- a/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c
+++ b/mgmt/newtmgr/nmgr_os/src/newtmgr_os.c
@@ -219,6 +219,8 @@ nmgr_def_mpstat_read(struct mgmt_cbuf *cb)
g_err |= cbor_encode_uint(&rsp, omi.omi_num_blocks);
g_err |= cbor_encode_text_stringz(&rsp, "nfree");
g_err |= cbor_encode_uint(&rsp, omi.omi_num_free);
+ g_err |= cbor_encode_text_stringz(&rsp, "min");
+ g_err |= cbor_encode_uint(&rsp, omi.omi_min_free);
g_err |= cbor_encoder_close_container(&pools, &pool);
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0395a1c7/sys/shell/src/shell_os.c
----------------------------------------------------------------------
diff --git a/sys/shell/src/shell_os.c b/sys/shell/src/shell_os.c
index ae409ae..48a3b3d 100644
--- a/sys/shell/src/shell_os.c
+++ b/sys/shell/src/shell_os.c
@@ -97,7 +97,8 @@ shell_os_mpool_display_cmd(int argc, char **argv)
console_printf("Mempools: \n");
mp = NULL;
- console_printf("%32s %5s %4s %4s\n", "name", "blksz", "cnt", "free");
+ console_printf("%32s %5s %4s %4s %4s\n", "name", "blksz", "cnt", "free",
+ "min");
while (1) {
mp = os_mempool_info_get_next(mp, &omi);
if (mp == NULL) {
@@ -112,8 +113,9 @@ shell_os_mpool_display_cmd(int argc, char **argv)
}
}
- console_printf("%32s %5d %4d %4d\n", omi.omi_name, omi.omi_block_size,
- omi.omi_num_blocks, omi.omi_num_free);
+ console_printf("%32s %5d %4d %4d %4d\n", omi.omi_name,
+ omi.omi_block_size, omi.omi_num_blocks,
+ omi.omi_num_free, omi.omi_min_free);
}
if (name && !found) {
[2/2] incubator-mynewt-core git commit: tinycbor; fix style.
Posted by ma...@apache.org.
tinycbor; fix style.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/ba813559
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ba813559
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ba813559
Branch: refs/heads/develop
Commit: ba813559b4f013ffb24c608df19d90ab0a7d9021
Parents: 0395a1c
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Dec 9 14:18:35 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Dec 9 14:18:35 2016 -0800
----------------------------------------------------------------------
encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h | 4 +---
encoding/tinycbor/src/cbor_mbuf_writer.c | 6 ++++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ba813559/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h
----------------------------------------------------------------------
diff --git a/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h b/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h
index 11bc5cc..2c904e5 100644
--- a/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h
+++ b/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h
@@ -24,14 +24,12 @@
extern "C" {
#endif
-
struct CborMbufWriter {
struct cbor_encoder_writer enc;
struct os_mbuf *m;
};
-void
-cbor_mbuf_writer_init(struct CborMbufWriter *cb, struct os_mbuf *m);
+void cbor_mbuf_writer_init(struct CborMbufWriter *cb, struct os_mbuf *m);
#ifdef __cplusplus
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ba813559/encoding/tinycbor/src/cbor_mbuf_writer.c
----------------------------------------------------------------------
diff --git a/encoding/tinycbor/src/cbor_mbuf_writer.c b/encoding/tinycbor/src/cbor_mbuf_writer.c
index 59570c5..119193c 100644
--- a/encoding/tinycbor/src/cbor_mbuf_writer.c
+++ b/encoding/tinycbor/src/cbor_mbuf_writer.c
@@ -23,7 +23,8 @@
#include <tinycbor/cbor_mbuf_writer.h>
int
-cbor_mbuf_writer(struct cbor_encoder_writer *arg, const char *data, int len) {
+cbor_mbuf_writer(struct cbor_encoder_writer *arg, const char *data, int len)
+{
int rc;
struct CborMbufWriter *cb = (struct CborMbufWriter *) arg;
rc = os_mbuf_append(cb->m, data, len);
@@ -38,7 +39,8 @@ cbor_mbuf_writer(struct cbor_encoder_writer *arg, const char *data, int len) {
void
-cbor_mbuf_writer_init(struct CborMbufWriter *cb, struct os_mbuf *m) {
+cbor_mbuf_writer_init(struct CborMbufWriter *cb, struct os_mbuf *m)
+{
cb->m = m;
cb->enc.bytes_written = 0;
cb->enc.write = &cbor_mbuf_writer;