moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 12:05:06 -05:00
Code Issues Releases Wiki Activity

added socket() / sclose() checks to the memdebug system

Browse Source
This commit is contained in:
Daniel Stenberg 2000-12-14 15:56:59 +00:00
parent 6ad9bd8022
commit bf43b49a20
3 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/memdebug.c
View File

@ -43,6 +43,14 @@
#include <curl/curl.h> #include <curl/curl.h>
#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
#include <winsock.h>
#else /* some kind of unix */
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#endif
#define _MPRINTF_REPLACE #define _MPRINTF_REPLACE
#include <curl/mprintf.h> #include <curl/mprintf.h>
#include "urldata.h" #include "urldata.h"
@ -50,6 +58,8 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
/* DONT include memdebug.h here! */
/* /*
* Note that these debug functions are very simple and they are meant to * Note that these debug functions are very simple and they are meant to
* remain so. For advanced analysis, record a log file and write perl scripts * remain so. For advanced analysis, record a log file and write perl scripts
@ -115,4 +125,21 @@ void curl_dofree(void *ptr, int line, char *source)
source, line, ptr); source, line, ptr);
} }
int curl_socket(int domain, int type, int protocol, int line, char *source)
{
int sockfd=(socket)(domain, type, protocol);
fprintf(logfile?logfile:stderr, "FD %s:%d socket() = %d\n",
source, line, sockfd);
return sockfd;
}
/* this is our own defined way to close sockets on *ALL* platforms */
int curl_sclose(int sockfd, int line, char *source)
{
int res=sclose(sockfd);
fprintf(logfile?logfile:stderr, "FD %s:%d sclose(%d)\n",
source, line, sockfd);
return sockfd;
}
#endif /* MALLOCDEBUG */ #endif /* MALLOCDEBUG */

13
lib/memdebug.h
View File

@ -1,13 +1,26 @@
#ifdef MALLOCDEBUG #ifdef MALLOCDEBUG
/* memory functions */
void *curl_domalloc(size_t size, int line, char *source); void *curl_domalloc(size_t size, int line, char *source);
void *curl_dorealloc(void *ptr, size_t size, int line, char *source); void *curl_dorealloc(void *ptr, size_t size, int line, char *source);
void curl_dofree(void *ptr, int line, char *source); void curl_dofree(void *ptr, int line, char *source);
char *curl_dostrdup(char *str, int line, char *source); char *curl_dostrdup(char *str, int line, char *source);
void curl_memdebug(char *logname); void curl_memdebug(char *logname);
/* file descriptor manipulators */
int curl_socket(int domain, int type, int protocol, int, char *);
int curl_sclose(int sockfd, int, char *);
/* Set this symbol on the command-line, recompile all lib-sources */ /* Set this symbol on the command-line, recompile all lib-sources */
#define strdup(ptr) curl_dostrdup(ptr, __LINE__, __FILE__) #define strdup(ptr) curl_dostrdup(ptr, __LINE__, __FILE__)
#define malloc(size) curl_domalloc(size, __LINE__, __FILE__) #define malloc(size) curl_domalloc(size, __LINE__, __FILE__)
#define realloc(ptr,size) curl_dorealloc(ptr, size, __LINE__, __FILE__) #define realloc(ptr,size) curl_dorealloc(ptr, size, __LINE__, __FILE__)
#define free(ptr) curl_dofree(ptr, __LINE__, __FILE__) #define free(ptr) curl_dofree(ptr, __LINE__, __FILE__)
#define socket(domain,type,protocol)\
curl_socket(domain,type,protocol,__LINE__,__FILE__)
/* sclose is probably already defined, redefine it! */
#undef sclose
#define sclose(sockfd) curl_sclose(sockfd,__LINE__,__FILE__)
#endif #endif

29
memanalyze.pl
View File

@ -72,6 +72,28 @@ while(<STDIN>) {
print "Not recognized input line: $function\n"; print "Not recognized input line: $function\n";
} }
} }
# FD url.c:1282 socket() = 5
elsif($_ =~ /^FD ([^:]*):(\d*) (.*)/) {
# generic match for the filename+linenumber
$source = $1;
$linenum = $2;
$function = $3;
if($function =~ /socket\(\) = (\d*)/) {
$filedes{$1}=1;
$getfile{$1}="$source:$linenum";
$openfile++;
}
elsif($function =~ /sclose\((\d*)\)/) {
if($filedes{$1} != 1) {
print "Close without open: $line\n";
}
else {
$filedes{$1}=0; # closed now
$openfile--;
}
}
}
else { else {
print "Not recognized prefix line: $line\n"; print "Not recognized prefix line: $line\n";
} }
@ -93,3 +115,10 @@ if($totalmem) {
} }
} }
if($openfile) {
for(keys %filedes) {
if($filedes{$_} == 1) {
print "Open file descriptor created at ".$getfile{$_}."\n";
}
}
}