| 1 |
commit: 3a1262703fd20d2e8288d13d908fb282c77d1793 |
| 2 |
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Mar 22 20:04:14 2015 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 14 21:52:57 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3a126270 |
| 7 |
|
| 8 |
Remove the DEBUG_MEMORY macro |
| 9 |
|
| 10 |
This fixes #43. |
| 11 |
|
| 12 |
README.md | 3 --- |
| 13 |
src/librc/librc-misc.c | 18 ++++++------------ |
| 14 |
src/rc/openrc-run.c | 4 ---- |
| 15 |
src/rc/rc-misc.c | 2 -- |
| 16 |
src/rc/rc-service.c | 6 ------ |
| 17 |
src/rc/rc-status.c | 2 -- |
| 18 |
src/rc/rc.c | 16 ++++++---------- |
| 19 |
src/rc/start-stop-daemon.c | 4 ---- |
| 20 |
8 files changed, 12 insertions(+), 43 deletions(-) |
| 21 |
|
| 22 |
diff --git a/README.md b/README.md |
| 23 |
index 7fadd23..edf6426 100644 |
| 24 |
--- a/README.md |
| 25 |
+++ b/README.md |
| 26 |
@@ -43,9 +43,6 @@ We don't support building a static OpenRC with PAM. |
| 27 |
|
| 28 |
You may need to use `PROGLDFLAGS=-Wl,-Bstatic` on glibc instead of just `-static`. |
| 29 |
|
| 30 |
-If you debug memory under valgrind, add `-DDEBUG_MEMORY` |
| 31 |
-to your `CPPFLAGS` so that all malloc memory should be freed at exit. |
| 32 |
- |
| 33 |
If you are building OpenRC for a Gentoo Prefix installation, add `MKPREFIX=yes`. |
| 34 |
|
| 35 |
`PKG_PREFIX` should be set to where packages install to by default. |
| 36 |
|
| 37 |
diff --git a/src/librc/librc-misc.c b/src/librc/librc-misc.c |
| 38 |
index d558941..45bdb7a 100644 |
| 39 |
--- a/src/librc/librc-misc.c |
| 40 |
+++ b/src/librc/librc-misc.c |
| 41 |
@@ -404,6 +404,12 @@ librc_hidden_def(rc_config_value) |
| 42 |
* each rc_conf_value call */ |
| 43 |
static RC_STRINGLIST *rc_conf = NULL; |
| 44 |
|
| 45 |
+static void |
| 46 |
+_free_rc_conf(void) |
| 47 |
+{ |
| 48 |
+ rc_stringlist_free(rc_conf); |
| 49 |
+} |
| 50 |
+ |
| 51 |
char * |
| 52 |
rc_conf_value(const char *setting) |
| 53 |
{ |
| 54 |
@@ -413,17 +419,13 @@ rc_conf_value(const char *setting) |
| 55 |
|
| 56 |
if (! rc_conf) { |
| 57 |
rc_conf = rc_config_load(RC_CONF); |
| 58 |
-#ifdef DEBUG_MEMORY |
| 59 |
atexit(_free_rc_conf); |
| 60 |
-#endif |
| 61 |
|
| 62 |
/* Support old configs. */ |
| 63 |
if (exists(RC_CONF_OLD)) { |
| 64 |
old = rc_config_load(RC_CONF_OLD); |
| 65 |
TAILQ_CONCAT(rc_conf, old, entries); |
| 66 |
-#ifdef DEBUG_MEMORY |
| 67 |
free(old); |
| 68 |
-#endif |
| 69 |
} |
| 70 |
|
| 71 |
rc_conf = rc_config_directory(rc_conf); |
| 72 |
@@ -443,11 +445,3 @@ rc_conf_value(const char *setting) |
| 73 |
return rc_config_value(rc_conf, setting); |
| 74 |
} |
| 75 |
librc_hidden_def(rc_conf_value) |
| 76 |
- |
| 77 |
-#ifdef DEBUG_MEMORY |
| 78 |
-static void |
| 79 |
-_free_rc_conf(void) |
| 80 |
-{ |
| 81 |
- rc_stringlist_free(rc_conf); |
| 82 |
-} |
| 83 |
-#endif |
| 84 |
|
| 85 |
diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c |
| 86 |
index 275cb32..ff884c4 100644 |
| 87 |
--- a/src/rc/openrc-run.c |
| 88 |
+++ b/src/rc/openrc-run.c |
| 89 |
@@ -247,7 +247,6 @@ cleanup(void) |
| 90 |
|
| 91 |
rc_plugin_unload(); |
| 92 |
|
| 93 |
-#ifdef DEBUG_MEMORY |
| 94 |
rc_stringlist_free(deptypes_b); |
| 95 |
rc_stringlist_free(deptypes_n); |
| 96 |
rc_stringlist_free(deptypes_nw); |
| 97 |
@@ -267,7 +266,6 @@ cleanup(void) |
| 98 |
free(service); |
| 99 |
free(prefix); |
| 100 |
free(runlevel); |
| 101 |
-#endif |
| 102 |
} |
| 103 |
|
| 104 |
/* Buffer and lock all output messages so that we get readable content */ |
| 105 |
@@ -1097,9 +1095,7 @@ service_plugable(void) |
| 106 |
break; |
| 107 |
} |
| 108 |
} |
| 109 |
-#ifdef DEBUG_MEMORY |
| 110 |
free(list); |
| 111 |
-#endif |
| 112 |
return allow; |
| 113 |
} |
| 114 |
|
| 115 |
|
| 116 |
diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c |
| 117 |
index 82f1b78..85a0db7 100644 |
| 118 |
--- a/src/rc/rc-misc.c |
| 119 |
+++ b/src/rc/rc-misc.c |
| 120 |
@@ -110,11 +110,9 @@ env_filter(void) |
| 121 |
setenv(env->value, e + 1, 1); |
| 122 |
} |
| 123 |
|
| 124 |
-#ifdef DEBUG_MEMORY |
| 125 |
rc_stringlist_free(env_list); |
| 126 |
rc_stringlist_free(env_allow); |
| 127 |
rc_stringlist_free(profile); |
| 128 |
-#endif |
| 129 |
} |
| 130 |
|
| 131 |
void |
| 132 |
|
| 133 |
diff --git a/src/rc/rc-service.c b/src/rc/rc-service.c |
| 134 |
index 3fd94b2..d0a6499 100644 |
| 135 |
--- a/src/rc/rc-service.c |
| 136 |
+++ b/src/rc/rc-service.c |
| 137 |
@@ -76,9 +76,7 @@ int main(int argc, char **argv) |
| 138 |
case 'e': |
| 139 |
service = rc_service_resolve(optarg); |
| 140 |
opt = service ? EXIT_SUCCESS : EXIT_FAILURE; |
| 141 |
-#ifdef DEBUG_MEMORY |
| 142 |
free(service); |
| 143 |
-#endif |
| 144 |
return opt; |
| 145 |
/* NOTREACHED */ |
| 146 |
case 'i': |
| 147 |
@@ -97,9 +95,7 @@ int main(int argc, char **argv) |
| 148 |
rc_stringlist_sort(&list); |
| 149 |
TAILQ_FOREACH(s, list, entries) |
| 150 |
printf("%s\n", s->value); |
| 151 |
-#ifdef DEBUG_MEMORY |
| 152 |
rc_stringlist_free(list); |
| 153 |
-#endif |
| 154 |
return EXIT_SUCCESS; |
| 155 |
/* NOTREACHED */ |
| 156 |
case 'r': |
| 157 |
@@ -107,9 +103,7 @@ int main(int argc, char **argv) |
| 158 |
if (service == NULL) |
| 159 |
return EXIT_FAILURE; |
| 160 |
printf("%s\n", service); |
| 161 |
-#ifdef DEBUG_MEMORY |
| 162 |
free(service); |
| 163 |
-#endif |
| 164 |
return EXIT_SUCCESS; |
| 165 |
/* NOTREACHED */ |
| 166 |
|
| 167 |
|
| 168 |
diff --git a/src/rc/rc-status.c b/src/rc/rc-status.c |
| 169 |
index a0a2fce..6724db8 100644 |
| 170 |
--- a/src/rc/rc-status.c |
| 171 |
+++ b/src/rc/rc-status.c |
| 172 |
@@ -331,7 +331,6 @@ int main(int argc, char **argv) |
| 173 |
|
| 174 |
exit: |
| 175 |
free(runlevel); |
| 176 |
-#ifdef DEBUG_MEMORY |
| 177 |
rc_stringlist_free(alist); |
| 178 |
rc_stringlist_free(needsme); |
| 179 |
rc_stringlist_free(sservices); |
| 180 |
@@ -340,7 +339,6 @@ exit: |
| 181 |
rc_stringlist_free(types); |
| 182 |
rc_stringlist_free(levels); |
| 183 |
rc_deptree_free(deptree); |
| 184 |
-#endif |
| 185 |
|
| 186 |
return retval; |
| 187 |
} |
| 188 |
|
| 189 |
diff --git a/src/rc/rc.c b/src/rc/rc.c |
| 190 |
index ed06bf7..45f57b3 100644 |
| 191 |
--- a/src/rc/rc.c |
| 192 |
+++ b/src/rc/rc.c |
| 193 |
@@ -86,6 +86,12 @@ const char *usagestring = "" \ |
| 194 |
#define DEVBOOT "/dev/.rcboot" |
| 195 |
|
| 196 |
const char *applet = NULL; |
| 197 |
+static RC_STRINGLIST *hotplugged_services; |
| 198 |
+static RC_STRINGLIST *stop_services; |
| 199 |
+static RC_STRINGLIST *start_services; |
| 200 |
+static RC_STRINGLIST *types_nw; |
| 201 |
+static RC_STRINGLIST *types_nwua; |
| 202 |
+static RC_DEPTREE *deptree; |
| 203 |
static char *runlevel; |
| 204 |
static RC_HOOK hook_out; |
| 205 |
|
| 206 |
@@ -127,10 +133,8 @@ clean_failed(void) |
| 207 |
static void |
| 208 |
cleanup(void) |
| 209 |
{ |
| 210 |
-#ifdef DEBUG_MEMORY |
| 211 |
RC_PID *p1 = LIST_FIRST(&service_pids); |
| 212 |
RC_PID *p2; |
| 213 |
-#endif |
| 214 |
|
| 215 |
if (!rc_in_logger && !rc_in_plugin && |
| 216 |
applet && (strcmp(applet, "rc") == 0 || strcmp(applet, "openrc") == 0)) |
| 217 |
@@ -152,7 +156,6 @@ cleanup(void) |
| 218 |
rc_logger_close(); |
| 219 |
} |
| 220 |
|
| 221 |
-#ifdef DEBUG_MEMORY |
| 222 |
while (p1) { |
| 223 |
p2 = LIST_NEXT(p1, entries); |
| 224 |
free(p1); |
| 225 |
@@ -166,7 +169,6 @@ cleanup(void) |
| 226 |
rc_stringlist_free(types_nwua); |
| 227 |
rc_deptree_free(deptree); |
| 228 |
free(runlevel); |
| 229 |
-#endif |
| 230 |
} |
| 231 |
|
| 232 |
static char |
| 233 |
@@ -735,12 +737,6 @@ int main(int argc, char **argv) |
| 234 |
const char *bootlevel = NULL; |
| 235 |
char *newlevel = NULL; |
| 236 |
const char *systype = NULL; |
| 237 |
- static RC_STRINGLIST *hotplugged_services; |
| 238 |
- static RC_STRINGLIST *stop_services; |
| 239 |
- static RC_STRINGLIST *start_services; |
| 240 |
- static RC_STRINGLIST *types_nw; |
| 241 |
- static RC_STRINGLIST *types_nwua; |
| 242 |
- static RC_DEPTREE *deptree; |
| 243 |
RC_STRINGLIST *deporder = NULL; |
| 244 |
RC_STRINGLIST *tmplist; |
| 245 |
RC_STRING *service; |
| 246 |
|
| 247 |
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c |
| 248 |
index 8ed3e92..27939c2 100644 |
| 249 |
--- a/src/rc/start-stop-daemon.c |
| 250 |
+++ b/src/rc/start-stop-daemon.c |
| 251 |
@@ -177,7 +177,6 @@ free_schedulelist(void) |
| 252 |
TAILQ_INIT(&schedule); |
| 253 |
} |
| 254 |
|
| 255 |
-#ifdef DEBUG_MEMORY |
| 256 |
static void |
| 257 |
cleanup(void) |
| 258 |
{ |
| 259 |
@@ -185,7 +184,6 @@ cleanup(void) |
| 260 |
free(nav); |
| 261 |
free_schedulelist(); |
| 262 |
} |
| 263 |
-#endif |
| 264 |
|
| 265 |
static int |
| 266 |
parse_signal(const char *sig) |
| 267 |
@@ -688,9 +686,7 @@ int main(int argc, char **argv) |
| 268 |
|
| 269 |
applet = basename_c(argv[0]); |
| 270 |
TAILQ_INIT(&schedule); |
| 271 |
-#ifdef DEBUG_MEMORY |
| 272 |
atexit(cleanup); |
| 273 |
-#endif |
| 274 |
|
| 275 |
signal_setup(SIGINT, handle_signal); |
| 276 |
signal_setup(SIGQUIT, handle_signal); |
Archives