mirror of
https://github.com/curl/curl.git
synced 2024-12-27 06:59:43 +08:00
3f8fc25720
Aka "jumbo" or "amalgamation" builds. It means to compile all sources per target as a single C source. This is experimental. You can enable it by passing `-DCMAKE_UNITY_BUILD=ON` to cmake. It requires CMake 3.16 or newer. It makes builds (much) faster, allows for better optimizations and tends to promote less ambiguous code. Also add a new AppVeyor CI job and convert an existing one to use "unity" mode (one MSVC, one MinGW), and enable it for one macOS CI job. Fix related issues: - add missing include guard to `easy_lock.h`. - rename static variables and functions (and a macro) with names reused across sources, or shadowed by local variables. - add an `#undef` after use. - add a missing `#undef` before use. - move internal definitions from `ftp.h` to `ftp.c`. - `curl_memory.h` fixes to make it work when included repeatedly. - stop building/linking curlx bits twice for a static-mode curl tool. These caused doubly defined symbols in unity builds. - silence missing extern declarations compiler warning for ` _CRT_glob`. - fix extern declarations for `tool_freq` and `tool_isVistaOrGreater`. - fix colliding static symbols in debug mode: `debugtime()` and `statename`. - rename `ssl_backend_data` structure to unique names for each TLS-backend, along with the `ssl_connect_data` struct member referencing them. This required adding casts for each access. - add workaround for missing `[P]UNICODE_STRING` types in certain Windows builds when compiling `lib/ldap.c`. To support "unity" builds, we had to enable `SCHANNEL_USE_BLACKLISTS` for Schannel (a Windows `schannel.h` option) _globally_. This caused an indirect inclusion of Windows `schannel.h` from `ldap.c` via `winldap.h` to have it enabled as well. This requires `[P]UNICODE_STRING` types, which is apperantly not defined automatically (as seen with both MSVS and mingw-w64). This patch includes `<subauth.h>` to fix it. Ref: https://github.com/curl/curl/runs/13987772013 Ref: https://dev.azure.com/daniel0244/curl/_build/results?buildId=15827&view=logs&jobId=2c9f582d-e278-56b6-4354-f38a4d851906&j=2c9f582d-e278-56b6-4354-f38a4d851906&t=90509b00-34fa-5a81-35d7-5ed9569d331c - tweak unity builds to compile `lib/memdebug.c` separately in memory trace builds to avoid PP confusion. - force-disable unity for test programs. - do not compile and link libcurl sources to libtests _twice_ when libcurl is built in static mode. KNOWN ISSUES: - running tests with unity builds may fail in cases. - some build configurations/env may not compile in unity mode. E.g.: https://ci.appveyor.com/project/curlorg/curl/builds/47230972/job/51wfesgnfuauwl8q#L250 Ref: https://github.com/libssh2/libssh2/issues/1034 Ref: https://cmake.org/cmake/help/latest/prop_tgt/UNITY_BUILD.html Ref: https://en.wikipedia.org/wiki/Unity_build Closes #11095
438 lines
9.4 KiB
C
438 lines
9.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(__INTEL_COMPILER) && defined(__unix__)
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
# include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
# include <arpa/inet.h>
|
|
#endif
|
|
|
|
#endif /* __INTEL_COMPILER && __unix__ */
|
|
|
|
#include "warnless.h"
|
|
|
|
#ifdef WIN32
|
|
#undef read
|
|
#undef write
|
|
#endif
|
|
|
|
#include <limits.h>
|
|
|
|
#define CURL_MASK_UCHAR ((unsigned char)~0)
|
|
#define CURL_MASK_SCHAR (CURL_MASK_UCHAR >> 1)
|
|
|
|
#define CURL_MASK_USHORT ((unsigned short)~0)
|
|
#define CURL_MASK_SSHORT (CURL_MASK_USHORT >> 1)
|
|
|
|
#define CURL_MASK_UINT ((unsigned int)~0)
|
|
#define CURL_MASK_SINT (CURL_MASK_UINT >> 1)
|
|
|
|
#define CURL_MASK_ULONG ((unsigned long)~0)
|
|
#define CURL_MASK_SLONG (CURL_MASK_ULONG >> 1)
|
|
|
|
#define CURL_MASK_UCOFFT ((unsigned CURL_TYPEOF_CURL_OFF_T)~0)
|
|
#define CURL_MASK_SCOFFT (CURL_MASK_UCOFFT >> 1)
|
|
|
|
#define CURL_MASK_USIZE_T ((size_t)~0)
|
|
#define CURL_MASK_SSIZE_T (CURL_MASK_USIZE_T >> 1)
|
|
|
|
/*
|
|
** unsigned long to unsigned short
|
|
*/
|
|
|
|
unsigned short curlx_ultous(unsigned long ulnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(ulnum <= (unsigned long) CURL_MASK_USHORT);
|
|
return (unsigned short)(ulnum & (unsigned long) CURL_MASK_USHORT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** unsigned long to unsigned char
|
|
*/
|
|
|
|
unsigned char curlx_ultouc(unsigned long ulnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(ulnum <= (unsigned long) CURL_MASK_UCHAR);
|
|
return (unsigned char)(ulnum & (unsigned long) CURL_MASK_UCHAR);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** unsigned size_t to signed curl_off_t
|
|
*/
|
|
|
|
curl_off_t curlx_uztoso(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#elif defined(_MSC_VER)
|
|
# pragma warning(push)
|
|
# pragma warning(disable:4310) /* cast truncates constant value */
|
|
#endif
|
|
|
|
DEBUGASSERT(uznum <= (size_t) CURL_MASK_SCOFFT);
|
|
return (curl_off_t)(uznum & (size_t) CURL_MASK_SCOFFT);
|
|
|
|
#if defined(__INTEL_COMPILER) || defined(_MSC_VER)
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** unsigned size_t to signed int
|
|
*/
|
|
|
|
int curlx_uztosi(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(uznum <= (size_t) CURL_MASK_SINT);
|
|
return (int)(uznum & (size_t) CURL_MASK_SINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** unsigned size_t to unsigned long
|
|
*/
|
|
|
|
unsigned long curlx_uztoul(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
#if ULONG_MAX < SIZE_T_MAX
|
|
DEBUGASSERT(uznum <= (size_t) CURL_MASK_ULONG);
|
|
#endif
|
|
return (unsigned long)(uznum & (size_t) CURL_MASK_ULONG);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** unsigned size_t to unsigned int
|
|
*/
|
|
|
|
unsigned int curlx_uztoui(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
#if UINT_MAX < SIZE_T_MAX
|
|
DEBUGASSERT(uznum <= (size_t) CURL_MASK_UINT);
|
|
#endif
|
|
return (unsigned int)(uznum & (size_t) CURL_MASK_UINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** signed long to signed int
|
|
*/
|
|
|
|
int curlx_sltosi(long slnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(slnum >= 0);
|
|
#if INT_MAX < LONG_MAX
|
|
DEBUGASSERT((unsigned long) slnum <= (unsigned long) CURL_MASK_SINT);
|
|
#endif
|
|
return (int)(slnum & (long) CURL_MASK_SINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** signed long to unsigned int
|
|
*/
|
|
|
|
unsigned int curlx_sltoui(long slnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(slnum >= 0);
|
|
#if UINT_MAX < LONG_MAX
|
|
DEBUGASSERT((unsigned long) slnum <= (unsigned long) CURL_MASK_UINT);
|
|
#endif
|
|
return (unsigned int)(slnum & (long) CURL_MASK_UINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** signed long to unsigned short
|
|
*/
|
|
|
|
unsigned short curlx_sltous(long slnum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(slnum >= 0);
|
|
DEBUGASSERT((unsigned long) slnum <= (unsigned long) CURL_MASK_USHORT);
|
|
return (unsigned short)(slnum & (long) CURL_MASK_USHORT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** unsigned size_t to signed ssize_t
|
|
*/
|
|
|
|
ssize_t curlx_uztosz(size_t uznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(uznum <= (size_t) CURL_MASK_SSIZE_T);
|
|
return (ssize_t)(uznum & (size_t) CURL_MASK_SSIZE_T);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** signed curl_off_t to unsigned size_t
|
|
*/
|
|
|
|
size_t curlx_sotouz(curl_off_t sonum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(sonum >= 0);
|
|
return (size_t)(sonum & (curl_off_t) CURL_MASK_USIZE_T);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** signed ssize_t to signed int
|
|
*/
|
|
|
|
int curlx_sztosi(ssize_t sznum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(sznum >= 0);
|
|
#if INT_MAX < SSIZE_T_MAX
|
|
DEBUGASSERT((size_t) sznum <= (size_t) CURL_MASK_SINT);
|
|
#endif
|
|
return (int)(sznum & (ssize_t) CURL_MASK_SINT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** unsigned int to unsigned short
|
|
*/
|
|
|
|
unsigned short curlx_uitous(unsigned int uinum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(uinum <= (unsigned int) CURL_MASK_USHORT);
|
|
return (unsigned short) (uinum & (unsigned int) CURL_MASK_USHORT);
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
** signed int to unsigned size_t
|
|
*/
|
|
|
|
size_t curlx_sitouz(int sinum)
|
|
{
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(push)
|
|
# pragma warning(disable:810) /* conversion may lose significant bits */
|
|
#endif
|
|
|
|
DEBUGASSERT(sinum >= 0);
|
|
return (size_t) sinum;
|
|
|
|
#ifdef __INTEL_COMPILER
|
|
# pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
#ifdef USE_WINSOCK
|
|
|
|
/*
|
|
** curl_socket_t to signed int
|
|
*/
|
|
|
|
int curlx_sktosi(curl_socket_t s)
|
|
{
|
|
return (int)((ssize_t) s);
|
|
}
|
|
|
|
/*
|
|
** signed int to curl_socket_t
|
|
*/
|
|
|
|
curl_socket_t curlx_sitosk(int i)
|
|
{
|
|
return (curl_socket_t)((ssize_t) i);
|
|
}
|
|
|
|
#endif /* USE_WINSOCK */
|
|
|
|
#if defined(WIN32)
|
|
|
|
ssize_t curlx_read(int fd, void *buf, size_t count)
|
|
{
|
|
return (ssize_t)read(fd, buf, curlx_uztoui(count));
|
|
}
|
|
|
|
ssize_t curlx_write(int fd, const void *buf, size_t count)
|
|
{
|
|
return (ssize_t)write(fd, buf, curlx_uztoui(count));
|
|
}
|
|
|
|
/* Ensure that warnless.h continues to have an effect in "unity" builds. */
|
|
#undef HEADER_CURL_WARNLESS_H
|
|
|
|
#endif /* WIN32 */
|
|
|
|
#if defined(__INTEL_COMPILER) && defined(__unix__)
|
|
|
|
int curlx_FD_ISSET(int fd, fd_set *fdset)
|
|
{
|
|
#pragma warning(push)
|
|
#pragma warning(disable:1469) /* clobber ignored */
|
|
return FD_ISSET(fd, fdset);
|
|
#pragma warning(pop)
|
|
}
|
|
|
|
void curlx_FD_SET(int fd, fd_set *fdset)
|
|
{
|
|
#pragma warning(push)
|
|
#pragma warning(disable:1469) /* clobber ignored */
|
|
FD_SET(fd, fdset);
|
|
#pragma warning(pop)
|
|
}
|
|
|
|
void curlx_FD_ZERO(fd_set *fdset)
|
|
{
|
|
#pragma warning(push)
|
|
#pragma warning(disable:593) /* variable was set but never used */
|
|
FD_ZERO(fdset);
|
|
#pragma warning(pop)
|
|
}
|
|
|
|
unsigned short curlx_htons(unsigned short usnum)
|
|
{
|
|
#if (__INTEL_COMPILER == 910) && defined(__i386__)
|
|
return (unsigned short)(((usnum << 8) & 0xFF00) | ((usnum >> 8) & 0x00FF));
|
|
#else
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
return htons(usnum);
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
unsigned short curlx_ntohs(unsigned short usnum)
|
|
{
|
|
#if (__INTEL_COMPILER == 910) && defined(__i386__)
|
|
return (unsigned short)(((usnum << 8) & 0xFF00) | ((usnum >> 8) & 0x00FF));
|
|
#else
|
|
#pragma warning(push)
|
|
#pragma warning(disable:810) /* conversion may lose significant bits */
|
|
return ntohs(usnum);
|
|
#pragma warning(pop)
|
|
#endif
|
|
}
|
|
|
|
#endif /* __INTEL_COMPILER && __unix__ */
|