diff options
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_socket.c | 15 | ||||
| -rw-r--r-- | src/stroke/stroke.c | 12 | ||||
| -rw-r--r-- | src/stroke/stroke_keywords.h | 1 | ||||
| -rw-r--r-- | src/stroke/stroke_keywords.txt | 1 | ||||
| -rw-r--r-- | src/stroke/stroke_msg.h | 2 |
5 files changed, 31 insertions, 0 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_socket.c b/src/libcharon/plugins/stroke/stroke_socket.c index 88d0270d8..592c77623 100644 --- a/src/libcharon/plugins/stroke/stroke_socket.c +++ b/src/libcharon/plugins/stroke/stroke_socket.c @@ -418,6 +418,18 @@ static void stroke_leases(private_stroke_socket_t *this, } /** + * Show memory usage + */ +static void stroke_memusage(private_stroke_socket_t *this, + stroke_msg_t *msg, FILE *out) +{ + if (lib->leak_detective) + { + lib->leak_detective->usage(lib->leak_detective, out); + } +} + +/** * set the verbosity debug output */ static void stroke_loglevel(private_stroke_socket_t *this, @@ -572,6 +584,9 @@ static job_requeue_t process(stroke_job_context_t *ctx) case STR_LEASES: stroke_leases(this, msg, out); break; + case STR_MEMUSAGE: + stroke_memusage(this, msg, out); + break; default: DBG1(DBG_CFG, "received unknown stroke"); break; diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c index 2c5a03d77..6dbaf6464 100644 --- a/src/stroke/stroke.c +++ b/src/stroke/stroke.c @@ -326,6 +326,15 @@ static int leases(stroke_keyword_t kw, char *pool, char *address) return send_stroke_msg(&msg); } +static int memusage() +{ + stroke_msg_t msg; + + msg.type = STR_MEMUSAGE; + msg.length = offsetof(stroke_msg_t, buffer); + return send_stroke_msg(&msg); +} + static int set_loglevel(char *type, u_int level) { stroke_msg_t msg; @@ -530,6 +539,9 @@ int main(int argc, char *argv[]) res = leases(token->kw, argc > 2 ? argv[2] : NULL, argc > 3 ? argv[3] : NULL); break; + case STROKE_MEMUSAGE: + res = memusage(); + break; default: exit_usage(NULL); } diff --git a/src/stroke/stroke_keywords.h b/src/stroke/stroke_keywords.h index ff2ba36ef..dd00dc24c 100644 --- a/src/stroke/stroke_keywords.h +++ b/src/stroke/stroke_keywords.h @@ -54,6 +54,7 @@ typedef enum { STROKE_PURGE_IKE, STROKE_EXPORT_X509, STROKE_LEASES, + STROKE_MEMUSAGE, } stroke_keyword_t; #define STROKE_LIST_FIRST STROKE_LIST_PUBKEYS diff --git a/src/stroke/stroke_keywords.txt b/src/stroke/stroke_keywords.txt index dafd1ab08..f87b15769 100644 --- a/src/stroke/stroke_keywords.txt +++ b/src/stroke/stroke_keywords.txt @@ -61,3 +61,4 @@ purgecerts, STROKE_PURGE_CERTS purgeike, STROKE_PURGE_IKE exportx509, STROKE_EXPORT_X509 leases, STROKE_LEASES +memusage, STROKE_MEMUSAGE diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h index 9800d4319..2fbacecf7 100644 --- a/src/stroke/stroke_msg.h +++ b/src/stroke/stroke_msg.h @@ -212,6 +212,8 @@ struct stroke_msg_t { STR_LEASES, /* export credentials */ STR_EXPORT, + /* print memory usage details */ + STR_MEMUSAGE, /* more to come */ } type; |