aboutsummaryrefslogtreecommitdiff
path: root/src/command.h
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-07-30 03:43:38 +0000
committerEric Wong <normalperson@yhbt.net>2006-07-30 03:43:38 +0000
commit4cf5d04ca15bc28ee4636d1dccb858763513e571 (patch)
tree7898902e786f5763643a513ea96bcada8a2559cc /src/command.h
parent4d5b8509eb46cff40890b781018669233a79e414 (diff)
interface/connection malloc reductions from mpd-ke
This patch massively reduces the amount of heap allocations at the interface/command layer. Most commands with minimal output should not allocate memory from the heap at all. Things like repeatedly polling status, currentsong, and volume changes should be faster as a result, and more importantly, not a source of memory fragmentation. These changes should be safe in that there's no way for a remote-client to corrupt memory or otherwise do bad stuff to MPD, but an extra set of eyes to review would be good. Of course there's never any warranty :) No longer do we use FILE * structures in the interface, which means we don't have to allocate any new memory for most connections. Now, before you go on about losing the buffering that FILE * +implies+, remember that myfprintf() never took advantage of any of the stdio buffering features. To reduce the diff and make bugs easier to spot in the diff, I've kept myfprintf in places where we write to files (and not network interfaces). Expect myfprintf to go away entirely soon (we'll use fprintf for writing regular files). git-svn-id: https://svn.musicpd.org/mpd/trunk@4483 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/command.h')
-rw-r--r--src/command.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/command.h b/src/command.h
index 05ee2382..cab6562d 100644
--- a/src/command.h
+++ b/src/command.h
@@ -25,7 +25,9 @@
#include "myfprintf.h"
#include "log.h"
#include "ack.h"
+#include "sllist.h"
+#include <unistd.h>
#include <stdio.h>
#define COMMAND_RETURN_KILL 10
@@ -35,30 +37,29 @@
extern char *current_command;
extern int command_listNum;
-int processListOfCommands(FILE * fp, int *permission, int *expired,
- int listOK, List * list);
+int processListOfCommands(int fd, int *permission, int *expired,
+ int listOK, struct strnode *list);
-int processCommand(FILE * fp, int *permission, char *commandString);
+int processCommand(int fd, int *permission, char *commandString);
void initCommands();
void finishCommands();
-#define commandSuccess(fp) myfprintf(fp, "OK\n")
+#define commandSuccess(fd) fdprintf(fd, "OK\n")
-#define commandError(fp, error, format, ... ) \
+#define commandError(fd, error, format, ... ) do \
{\
- if(current_command) { \
- myfprintf(fp, "ACK [%i@%i] {%s} " format "\n", \
+ if (current_command) { \
+ fdprintf(fd, "ACK [%i@%i] {%s} " format "\n", \
(int)error, command_listNum, \
current_command, __VA_ARGS__); \
current_command = NULL; \
} \
else { \
- myfprintf(stderr, "ACK [%i@%i] " format "\n", \
+ fdprintf(STDERR_FILENO, "ACK [%i@%i] " format "\n", \
(int)error, command_listNum, \
__VA_ARGS__); \
} \
- }
-
+ } while (0)
#endif