d0bbfa8327
Change 75830fb836 to fix _nres
initialization to be thread safe accidentally introduced a behavior
change whereby res_init() became a no-op. It also failed to remove all
direct accesses to _nres.
Move the file over to C++ so we can let RAII ensure we're always holding
a lock while using the global state, make all callers access the global
state via this class, and restore the previous behavior of res_init().
Test: atest DnsResolverTest
Bug: 166235340
Change-Id: Ib390a7eac063bc0ff5eeba755e8c74ef1383004e
48 lines
1.7 KiB
C
48 lines
1.7 KiB
C
/*
|
|
* Copyright (C) 2012 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#define _BSD_SOURCE
|
|
#define _GNU_SOURCE 1
|
|
|
|
// NetBSD uses _DIAGASSERT to null-check arguments and the like,
|
|
// but it's clear from the number of mistakes in their assertions
|
|
// that they don't actually test or ship with this.
|
|
#define _DIAGASSERT(e) /* nothing */
|
|
|
|
/*
|
|
* The following macro is used to remove const cast-away warnings
|
|
* from gcc -Wcast-qual; it should be used with caution because it
|
|
* can hide valid errors; in particular most valid uses are in
|
|
* situations where the API requires it, not to cast away string
|
|
* constants. We don't use *intptr_t on purpose here and we are
|
|
* explicit about unsigned long so that we don't have additional
|
|
* dependencies.
|
|
*/
|
|
#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a))
|
|
|
|
// TODO: we don't yet have thread-safe environment variables.
|
|
#define __readlockenv() 0
|
|
#define __unlockenv() 0
|
|
|
|
#include <sys/cdefs.h>
|
|
#include <stddef.h>
|
|
int reallocarr(void*, size_t, size_t);
|
|
|
|
/* Use appropriate shell depending on process's executable. */
|
|
__LIBC_HIDDEN__ extern const char* __bionic_get_shell_path();
|
|
#define _PATH_BSHELL __bionic_get_shell_path()
|