Commit f1a9afa9 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Ben Walker
Browse files

assert.h: split UNREACHABLE into internal header 



The definition of SPDK_UNREACHABLE uses the build-time DEBUG definition,
which is not available in the public API.

Change-Id: I1862c99fa5c85ccd3483f94e9c35de531da57f3c
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent c2d38ee8

include/spdk/assert.h

+0 −7
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ extern "C" { 
#endif



#include <assert.h>

#include <stdlib.h>



#ifdef static_assert

#define SPDK_STATIC_ASSERT(cond, msg) static_assert(cond, msg)
@@ -51,12 +50,6 @@ extern "C" { 
#define SPDK_STATIC_ASSERT(cond, msg)

#endif



#if !defined(DEBUG) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))

#define SPDK_UNREACHABLE() __builtin_unreachable()

#else

#define SPDK_UNREACHABLE() abort()

#endif



#ifdef __cplusplus

}

#endif

include/spdk_internal/assert.h

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*-

 *   BSD LICENSE

 *

 *   Copyright (c) Intel Corporation.

 *   All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions

 *   are met:

 *

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in

 *       the documentation and/or other materials provided with the

 *       distribution.

 *     * Neither the name of Intel Corporation nor the names of its

 *       contributors may be used to endorse or promote products derived

 *       from this software without specific prior written permission.

 *

 *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#ifndef SPDK_INTERNAL_ASSERT_H

#define SPDK_INTERNAL_ASSERT_H



#ifdef __cplusplus

extern "C" {

#endif



#include "spdk/assert.h"



#include <stdlib.h>



#if !defined(DEBUG) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))

#define SPDK_UNREACHABLE() __builtin_unreachable()

#else

#define SPDK_UNREACHABLE() abort()

#endif



#ifdef __cplusplus

}

#endif



#endif /* SPDK_INTERNAL_ASSERT_H */

lib/nvme/nvme_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include "spdk/nvme_intel.h"

#include "spdk/nvmf_spec.h"



#include "spdk_internal/assert.h"

#include "spdk_internal/log.h"



/*