Repository: trafficserver Updated Branches: refs/heads/master 1554fac66 -> 90fa51d51
TS-3420 Remove duplication of TS_RES_MEM_PATH Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/90fa51d5 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/90fa51d5 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/90fa51d5 Branch: refs/heads/master Commit: 90fa51d512698d33d31c16d31e9e17804b1d461f Parents: 1554fac Author: Leif Hedstrom <[email protected]> Authored: Sat Feb 28 07:55:26 2015 -0500 Committer: Leif Hedstrom <[email protected]> Committed: Sat Feb 28 07:55:26 2015 -0500 ---------------------------------------------------------------------- CHANGES | 2 ++ lib/ts/apidefs.h.in | 11 +++++++---- mgmt/api/include/mgmtapi.h | 5 +---- 3 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/90fa51d5/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 22f5886..15a32db 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.3.0 + *) [TS-3420] Remove duplication of TS_RES_MEM_PATH, which is in apidefs.h. + *) [TS-3405] Memory use after free in HTTP/2. *) [TS-3409] Add metric to track number of SSL connections from ATS to http://git-wip-us.apache.org/repos/asf/trafficserver/blob/90fa51d5/lib/ts/apidefs.h.in ---------------------------------------------------------------------- diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in index be3a580..2b8ed76 100644 --- a/lib/ts/apidefs.h.in +++ b/lib/ts/apidefs.h.in @@ -83,16 +83,19 @@ extern "C" #define TS_HTTP_VERSION(a,b) ((((a) & 0xFFFF) << 16) | ((b) & 0xFFFF)) #define TS_HTTP_MINOR(v) ((v) & 0xFFFF) #define TS_HTTP_MAJOR(v) (((v) >> 16) & 0xFFFF) -#define __TS_RES_PATH(x) #x -#define _TS_RES_PATH(x) __TS_RES_PATH (x) -#define TS_RES_PATH(x) x __FILE__ ":" _TS_RES_PATH (__LINE__) -#define TS_RES_MEM_PATH TS_RES_PATH ("memory/") + #define TS_MAX_USER_NAME_LEN 256 #ifndef TS_DEPRECATED #define TS_DEPRECATED __attribute__ ((deprecated)) #endif +/* This is for memory debugging with TSmalloc() and family */ +#define __TS_RES_PATH(x) #x +#define _TS_RES_PATH(x) __TS_RES_PATH (x) +#define TS_RES_PATH(x) x __FILE__ ":" _TS_RES_PATH (__LINE__) +#define TS_RES_MEM_PATH TS_RES_PATH ("memory/") + /** The following struct is used by TSPluginRegister(). It stores registration information about the plugin. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/90fa51d5/mgmt/api/include/mgmtapi.h ---------------------------------------------------------------------- diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h index a04bb11..39155d6 100644 --- a/mgmt/api/include/mgmtapi.h +++ b/mgmt/api/include/mgmtapi.h @@ -30,6 +30,7 @@ #include <stdbool.h> #include <stdint.h> +#include <ts/apidefs.h> /*************************************************************************** * System Specific Items @@ -44,10 +45,6 @@ extern "C" { #endif /* __cplusplus */ -#define __TS_RES_PATH(x) #x -#define _TS_RES_PATH(x) __TS_RES_PATH (x) -#define TS_RES_PATH(x) x __FILE__ ":" _TS_RES_PATH (__LINE__) -#define TS_RES_MEM_PATH TS_RES_PATH ("memory/") /*************************************************************************** * Error and Return Values
