Date: Fri, 24 Jan 2014 13:36:42 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r261119 - in projects/sendfile: . contrib/bsnmp/lib contrib/jemalloc contrib/jemalloc/doc contrib/jemalloc/include/jemalloc contrib/jemalloc/include/jemalloc/internal contrib/jemalloc/s... Message-ID: <201401241336.s0ODagFV047244@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Fri Jan 24 13:36:41 2014 New Revision: 261119 URL: http://svnweb.freebsd.org/changeset/base/261119 Log: Merge head up to r261118. Added: projects/sendfile/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h - copied unchanged from r261118, head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h - copied unchanged from r261118, head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/public_namespace.h - copied unchanged from r261118, head/contrib/jemalloc/include/jemalloc/internal/public_namespace.h projects/sendfile/sys/x86/include/apicvar.h - copied unchanged from r261118, head/sys/x86/include/apicvar.h projects/sendfile/tests/sys/ - copied from r261118, head/tests/sys/ Deleted: projects/sendfile/contrib/jemalloc/include/jemalloc/jemalloc_defs.h projects/sendfile/sys/amd64/include/apicvar.h projects/sendfile/sys/i386/include/apicvar.h projects/sendfile/sys/pc98/include/apicvar.h projects/sendfile/tools/build/options/WITHOUT_ATF projects/sendfile/tools/regression/sockets/unix_seqpacket/ projects/sendfile/tools/regression/sockets/unix_seqpacket_exercise/ Modified: projects/sendfile/Makefile.inc1 projects/sendfile/contrib/bsnmp/lib/asn1.c projects/sendfile/contrib/jemalloc/COPYING projects/sendfile/contrib/jemalloc/ChangeLog projects/sendfile/contrib/jemalloc/FREEBSD-Xlist projects/sendfile/contrib/jemalloc/FREEBSD-diffs projects/sendfile/contrib/jemalloc/FREEBSD-upgrade projects/sendfile/contrib/jemalloc/VERSION projects/sendfile/contrib/jemalloc/doc/jemalloc.3 projects/sendfile/contrib/jemalloc/include/jemalloc/internal/arena.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/chunk_dss.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/ckh.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/hash.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/huge.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/private_namespace.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/prng.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/prof.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/ql.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/qr.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/rb.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/rtree.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/tcache.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/tsd.h projects/sendfile/contrib/jemalloc/include/jemalloc/internal/util.h projects/sendfile/contrib/jemalloc/include/jemalloc/jemalloc.h projects/sendfile/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h projects/sendfile/contrib/jemalloc/src/arena.c projects/sendfile/contrib/jemalloc/src/bitmap.c projects/sendfile/contrib/jemalloc/src/chunk.c projects/sendfile/contrib/jemalloc/src/chunk_dss.c projects/sendfile/contrib/jemalloc/src/chunk_mmap.c projects/sendfile/contrib/jemalloc/src/ckh.c projects/sendfile/contrib/jemalloc/src/ctl.c projects/sendfile/contrib/jemalloc/src/huge.c projects/sendfile/contrib/jemalloc/src/jemalloc.c projects/sendfile/contrib/jemalloc/src/mutex.c projects/sendfile/contrib/jemalloc/src/prof.c projects/sendfile/contrib/jemalloc/src/quarantine.c projects/sendfile/contrib/jemalloc/src/rtree.c projects/sendfile/contrib/jemalloc/src/stats.c projects/sendfile/contrib/jemalloc/src/tcache.c projects/sendfile/contrib/jemalloc/src/tsd.c projects/sendfile/contrib/jemalloc/src/util.c projects/sendfile/crypto/openssl/CHANGES projects/sendfile/crypto/openssl/Configure projects/sendfile/crypto/openssl/Makefile projects/sendfile/crypto/openssl/Makefile.org projects/sendfile/crypto/openssl/NEWS projects/sendfile/crypto/openssl/README projects/sendfile/crypto/openssl/apps/Makefile projects/sendfile/crypto/openssl/apps/apps.h projects/sendfile/crypto/openssl/apps/openssl.c projects/sendfile/crypto/openssl/apps/pkcs12.c projects/sendfile/crypto/openssl/config projects/sendfile/crypto/openssl/crypto/Makefile projects/sendfile/crypto/openssl/crypto/aes/asm/aes-parisc.pl projects/sendfile/crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl projects/sendfile/crypto/openssl/crypto/armcap.c projects/sendfile/crypto/openssl/crypto/asn1/a_int.c projects/sendfile/crypto/openssl/crypto/bio/bss_dgram.c projects/sendfile/crypto/openssl/crypto/bn/Makefile projects/sendfile/crypto/openssl/crypto/bn/asm/mips-mont.pl projects/sendfile/crypto/openssl/crypto/bn/asm/mips.pl projects/sendfile/crypto/openssl/crypto/bn/asm/parisc-mont.pl projects/sendfile/crypto/openssl/crypto/bn/asm/x86_64-gf2m.pl projects/sendfile/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl projects/sendfile/crypto/openssl/crypto/bn/bn_nist.c projects/sendfile/crypto/openssl/crypto/buffer/buffer.c projects/sendfile/crypto/openssl/crypto/buffer/buffer.h projects/sendfile/crypto/openssl/crypto/ec/ec_ameth.c projects/sendfile/crypto/openssl/crypto/ec/ec_asn1.c projects/sendfile/crypto/openssl/crypto/ec/ec_lib.c projects/sendfile/crypto/openssl/crypto/engine/eng_rdrand.c projects/sendfile/crypto/openssl/crypto/evp/Makefile projects/sendfile/crypto/openssl/crypto/evp/digest.c projects/sendfile/crypto/openssl/crypto/evp/e_aes.c projects/sendfile/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c projects/sendfile/crypto/openssl/crypto/evp/e_des3.c projects/sendfile/crypto/openssl/crypto/evp/p5_crpt2.c projects/sendfile/crypto/openssl/crypto/modes/Makefile projects/sendfile/crypto/openssl/crypto/modes/asm/ghash-parisc.pl projects/sendfile/crypto/openssl/crypto/modes/cbc128.c projects/sendfile/crypto/openssl/crypto/modes/ccm128.c projects/sendfile/crypto/openssl/crypto/modes/cts128.c projects/sendfile/crypto/openssl/crypto/modes/gcm128.c projects/sendfile/crypto/openssl/crypto/modes/modes_lcl.h projects/sendfile/crypto/openssl/crypto/opensslv.h projects/sendfile/crypto/openssl/crypto/pariscid.pl projects/sendfile/crypto/openssl/crypto/pem/pem_info.c projects/sendfile/crypto/openssl/crypto/pkcs12/p12_crt.c projects/sendfile/crypto/openssl/crypto/rand/md_rand.c projects/sendfile/crypto/openssl/crypto/rand/rand.h projects/sendfile/crypto/openssl/crypto/rand/rand_err.c projects/sendfile/crypto/openssl/crypto/rand/rand_lib.c projects/sendfile/crypto/openssl/crypto/rc4/asm/rc4-parisc.pl projects/sendfile/crypto/openssl/crypto/rsa/rsa_ameth.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_chk.c projects/sendfile/crypto/openssl/crypto/rsa/rsa_pmeth.c projects/sendfile/crypto/openssl/crypto/sha/Makefile projects/sendfile/crypto/openssl/crypto/sha/asm/sha1-parisc.pl projects/sendfile/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl projects/sendfile/crypto/openssl/crypto/sha/asm/sha512-mips.pl projects/sendfile/crypto/openssl/crypto/sha/asm/sha512-parisc.pl projects/sendfile/crypto/openssl/crypto/sha/sha512.c projects/sendfile/crypto/openssl/crypto/srp/srp_grps.h projects/sendfile/crypto/openssl/crypto/srp/srp_lib.c projects/sendfile/crypto/openssl/crypto/x509/x509_vfy.c projects/sendfile/crypto/openssl/crypto/x509/x_all.c projects/sendfile/crypto/openssl/crypto/x86cpuid.pl projects/sendfile/crypto/openssl/doc/apps/cms.pod projects/sendfile/crypto/openssl/doc/apps/rsa.pod projects/sendfile/crypto/openssl/doc/apps/smime.pod projects/sendfile/crypto/openssl/doc/crypto/X509_STORE_CTX_get_error.pod projects/sendfile/crypto/openssl/doc/crypto/ecdsa.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_add_session.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_load_verify_locations.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_set_ssl_version.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_CTX_use_psk_identity_hint.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_accept.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_clear.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_connect.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_do_handshake.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_read.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_session_reused.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_set_fd.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_set_session.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_shutdown.pod projects/sendfile/crypto/openssl/doc/ssl/SSL_write.pod projects/sendfile/crypto/openssl/engines/ccgost/gost89.h projects/sendfile/crypto/openssl/ssl/d1_both.c projects/sendfile/crypto/openssl/ssl/d1_clnt.c projects/sendfile/crypto/openssl/ssl/d1_lib.c projects/sendfile/crypto/openssl/ssl/d1_pkt.c projects/sendfile/crypto/openssl/ssl/d1_srvr.c projects/sendfile/crypto/openssl/ssl/s23_clnt.c projects/sendfile/crypto/openssl/ssl/s3_both.c projects/sendfile/crypto/openssl/ssl/s3_clnt.c projects/sendfile/crypto/openssl/ssl/s3_lib.c projects/sendfile/crypto/openssl/ssl/s3_pkt.c projects/sendfile/crypto/openssl/ssl/s3_srvr.c projects/sendfile/crypto/openssl/ssl/ssl.h projects/sendfile/crypto/openssl/ssl/ssl3.h projects/sendfile/crypto/openssl/ssl/ssl_lib.c projects/sendfile/crypto/openssl/ssl/ssl_locl.h projects/sendfile/crypto/openssl/ssl/ssltest.c projects/sendfile/crypto/openssl/ssl/t1_enc.c projects/sendfile/crypto/openssl/ssl/t1_lib.c projects/sendfile/crypto/openssl/util/shlib_wrap.sh projects/sendfile/etc/Makefile projects/sendfile/etc/defaults/periodic.conf projects/sendfile/etc/mtree/BSD.tests.dist projects/sendfile/etc/rc.d/sysctl projects/sendfile/include/malloc_np.h projects/sendfile/lib/libc/gen/tls.c projects/sendfile/lib/libc/stdlib/jemalloc/Makefile.inc projects/sendfile/lib/libc/stdlib/jemalloc/Symbol.map projects/sendfile/lib/libc/sys/posix_fallocate.2 projects/sendfile/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/sendfile/sbin/kldstat/kldstat.8 projects/sendfile/sbin/kldstat/kldstat.c projects/sendfile/secure/lib/libcrypto/Makefile.inc projects/sendfile/secure/lib/libcrypto/amd64/bsaes-x86_64.S projects/sendfile/secure/lib/libcrypto/i386/x86cpuid.s projects/sendfile/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/sendfile/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/sendfile/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/sendfile/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/sendfile/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/sendfile/secure/lib/libcrypto/man/BIO_ctrl.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_base64.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_md.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_null.3 projects/sendfile/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/sendfile/secure/lib/libcrypto/man/BIO_find_type.3 projects/sendfile/secure/lib/libcrypto/man/BIO_new.3 projects/sendfile/secure/lib/libcrypto/man/BIO_new_CMS.3 projects/sendfile/secure/lib/libcrypto/man/BIO_push.3 projects/sendfile/secure/lib/libcrypto/man/BIO_read.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_accept.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_bio.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_connect.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_fd.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_file.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_mem.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_null.3 projects/sendfile/secure/lib/libcrypto/man/BIO_s_socket.3 projects/sendfile/secure/lib/libcrypto/man/BIO_set_callback.3 projects/sendfile/secure/lib/libcrypto/man/BIO_should_retry.3 projects/sendfile/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/sendfile/secure/lib/libcrypto/man/BN_CTX_new.3 projects/sendfile/secure/lib/libcrypto/man/BN_CTX_start.3 projects/sendfile/secure/lib/libcrypto/man/BN_add.3 projects/sendfile/secure/lib/libcrypto/man/BN_add_word.3 projects/sendfile/secure/lib/libcrypto/man/BN_bn2bin.3 projects/sendfile/secure/lib/libcrypto/man/BN_cmp.3 projects/sendfile/secure/lib/libcrypto/man/BN_copy.3 projects/sendfile/secure/lib/libcrypto/man/BN_generate_prime.3 projects/sendfile/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/sendfile/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/sendfile/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/sendfile/secure/lib/libcrypto/man/BN_new.3 projects/sendfile/secure/lib/libcrypto/man/BN_num_bytes.3 projects/sendfile/secure/lib/libcrypto/man/BN_rand.3 projects/sendfile/secure/lib/libcrypto/man/BN_set_bit.3 projects/sendfile/secure/lib/libcrypto/man/BN_swap.3 projects/sendfile/secure/lib/libcrypto/man/BN_zero.3 projects/sendfile/secure/lib/libcrypto/man/CMS_add0_cert.3 projects/sendfile/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 projects/sendfile/secure/lib/libcrypto/man/CMS_compress.3 projects/sendfile/secure/lib/libcrypto/man/CMS_decrypt.3 projects/sendfile/secure/lib/libcrypto/man/CMS_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/CMS_final.3 projects/sendfile/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 projects/sendfile/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 projects/sendfile/secure/lib/libcrypto/man/CMS_get0_type.3 projects/sendfile/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 projects/sendfile/secure/lib/libcrypto/man/CMS_sign.3 projects/sendfile/secure/lib/libcrypto/man/CMS_sign_add1_signer.3 projects/sendfile/secure/lib/libcrypto/man/CMS_sign_receipt.3 projects/sendfile/secure/lib/libcrypto/man/CMS_uncompress.3 projects/sendfile/secure/lib/libcrypto/man/CMS_verify.3 projects/sendfile/secure/lib/libcrypto/man/CMS_verify_receipt.3 projects/sendfile/secure/lib/libcrypto/man/CONF_modules_free.3 projects/sendfile/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/sendfile/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/sendfile/secure/lib/libcrypto/man/DH_generate_key.3 projects/sendfile/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/sendfile/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/sendfile/secure/lib/libcrypto/man/DH_new.3 projects/sendfile/secure/lib/libcrypto/man/DH_set_method.3 projects/sendfile/secure/lib/libcrypto/man/DH_size.3 projects/sendfile/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/sendfile/secure/lib/libcrypto/man/DSA_do_sign.3 projects/sendfile/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/sendfile/secure/lib/libcrypto/man/DSA_generate_key.3 projects/sendfile/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/sendfile/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/sendfile/secure/lib/libcrypto/man/DSA_new.3 projects/sendfile/secure/lib/libcrypto/man/DSA_set_method.3 projects/sendfile/secure/lib/libcrypto/man/DSA_sign.3 projects/sendfile/secure/lib/libcrypto/man/DSA_size.3 projects/sendfile/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/sendfile/secure/lib/libcrypto/man/ERR_clear_error.3 projects/sendfile/secure/lib/libcrypto/man/ERR_error_string.3 projects/sendfile/secure/lib/libcrypto/man/ERR_get_error.3 projects/sendfile/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/sendfile/secure/lib/libcrypto/man/ERR_load_strings.3 projects/sendfile/secure/lib/libcrypto/man/ERR_print_errors.3 projects/sendfile/secure/lib/libcrypto/man/ERR_put_error.3 projects/sendfile/secure/lib/libcrypto/man/ERR_remove_state.3 projects/sendfile/secure/lib/libcrypto/man/ERR_set_mark.3 projects/sendfile/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/sendfile/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_DigestSignInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_derive.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_sign.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_verify.3 projects/sendfile/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 projects/sendfile/secure/lib/libcrypto/man/EVP_SealInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_SignInit.3 projects/sendfile/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/sendfile/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_config.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/sendfile/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/sendfile/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/sendfile/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 projects/sendfile/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 projects/sendfile/secure/lib/libcrypto/man/PKCS12_create.3 projects/sendfile/secure/lib/libcrypto/man/PKCS12_parse.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_sign.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 projects/sendfile/secure/lib/libcrypto/man/PKCS7_verify.3 projects/sendfile/secure/lib/libcrypto/man/RAND_add.3 projects/sendfile/secure/lib/libcrypto/man/RAND_bytes.3 projects/sendfile/secure/lib/libcrypto/man/RAND_cleanup.3 projects/sendfile/secure/lib/libcrypto/man/RAND_egd.3 projects/sendfile/secure/lib/libcrypto/man/RAND_load_file.3 projects/sendfile/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/sendfile/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/sendfile/secure/lib/libcrypto/man/RSA_check_key.3 projects/sendfile/secure/lib/libcrypto/man/RSA_generate_key.3 projects/sendfile/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/sendfile/secure/lib/libcrypto/man/RSA_new.3 projects/sendfile/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/sendfile/secure/lib/libcrypto/man/RSA_print.3 projects/sendfile/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/sendfile/secure/lib/libcrypto/man/RSA_set_method.3 projects/sendfile/secure/lib/libcrypto/man/RSA_sign.3 projects/sendfile/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/sendfile/secure/lib/libcrypto/man/RSA_size.3 projects/sendfile/secure/lib/libcrypto/man/SMIME_read_CMS.3 projects/sendfile/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/sendfile/secure/lib/libcrypto/man/SMIME_write_CMS.3 projects/sendfile/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/sendfile/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/sendfile/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/sendfile/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/sendfile/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 projects/sendfile/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 projects/sendfile/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 projects/sendfile/secure/lib/libcrypto/man/X509_new.3 projects/sendfile/secure/lib/libcrypto/man/X509_verify_cert.3 projects/sendfile/secure/lib/libcrypto/man/bio.3 projects/sendfile/secure/lib/libcrypto/man/blowfish.3 projects/sendfile/secure/lib/libcrypto/man/bn.3 projects/sendfile/secure/lib/libcrypto/man/bn_internal.3 projects/sendfile/secure/lib/libcrypto/man/buffer.3 projects/sendfile/secure/lib/libcrypto/man/crypto.3 projects/sendfile/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/sendfile/secure/lib/libcrypto/man/d2i_DHparams.3 projects/sendfile/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/sendfile/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/sendfile/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/sendfile/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/sendfile/secure/lib/libcrypto/man/des.3 projects/sendfile/secure/lib/libcrypto/man/dh.3 projects/sendfile/secure/lib/libcrypto/man/dsa.3 projects/sendfile/secure/lib/libcrypto/man/ecdsa.3 projects/sendfile/secure/lib/libcrypto/man/engine.3 projects/sendfile/secure/lib/libcrypto/man/err.3 projects/sendfile/secure/lib/libcrypto/man/evp.3 projects/sendfile/secure/lib/libcrypto/man/hmac.3 projects/sendfile/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 projects/sendfile/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 projects/sendfile/secure/lib/libcrypto/man/lh_stats.3 projects/sendfile/secure/lib/libcrypto/man/lhash.3 projects/sendfile/secure/lib/libcrypto/man/md5.3 projects/sendfile/secure/lib/libcrypto/man/mdc2.3 projects/sendfile/secure/lib/libcrypto/man/pem.3 projects/sendfile/secure/lib/libcrypto/man/rand.3 projects/sendfile/secure/lib/libcrypto/man/rc4.3 projects/sendfile/secure/lib/libcrypto/man/ripemd.3 projects/sendfile/secure/lib/libcrypto/man/rsa.3 projects/sendfile/secure/lib/libcrypto/man/sha.3 projects/sendfile/secure/lib/libcrypto/man/threads.3 projects/sendfile/secure/lib/libcrypto/man/ui.3 projects/sendfile/secure/lib/libcrypto/man/ui_compat.3 projects/sendfile/secure/lib/libcrypto/man/x509.3 projects/sendfile/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/sendfile/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_free.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_new.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/sendfile/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 projects/sendfile/secure/lib/libssl/man/SSL_SESSION_free.3 projects/sendfile/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/sendfile/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/sendfile/secure/lib/libssl/man/SSL_accept.3 projects/sendfile/secure/lib/libssl/man/SSL_alert_type_string.3 projects/sendfile/secure/lib/libssl/man/SSL_clear.3 projects/sendfile/secure/lib/libssl/man/SSL_connect.3 projects/sendfile/secure/lib/libssl/man/SSL_do_handshake.3 projects/sendfile/secure/lib/libssl/man/SSL_free.3 projects/sendfile/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/sendfile/secure/lib/libssl/man/SSL_get_ciphers.3 projects/sendfile/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/sendfile/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/sendfile/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/sendfile/secure/lib/libssl/man/SSL_get_error.3 projects/sendfile/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/sendfile/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/sendfile/secure/lib/libssl/man/SSL_get_fd.3 projects/sendfile/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/sendfile/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/sendfile/secure/lib/libssl/man/SSL_get_psk_identity.3 projects/sendfile/secure/lib/libssl/man/SSL_get_rbio.3 projects/sendfile/secure/lib/libssl/man/SSL_get_session.3 projects/sendfile/secure/lib/libssl/man/SSL_get_verify_result.3 projects/sendfile/secure/lib/libssl/man/SSL_get_version.3 projects/sendfile/secure/lib/libssl/man/SSL_library_init.3 projects/sendfile/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/sendfile/secure/lib/libssl/man/SSL_new.3 projects/sendfile/secure/lib/libssl/man/SSL_pending.3 projects/sendfile/secure/lib/libssl/man/SSL_read.3 projects/sendfile/secure/lib/libssl/man/SSL_rstate_string.3 projects/sendfile/secure/lib/libssl/man/SSL_session_reused.3 projects/sendfile/secure/lib/libssl/man/SSL_set_bio.3 projects/sendfile/secure/lib/libssl/man/SSL_set_connect_state.3 projects/sendfile/secure/lib/libssl/man/SSL_set_fd.3 projects/sendfile/secure/lib/libssl/man/SSL_set_session.3 projects/sendfile/secure/lib/libssl/man/SSL_set_shutdown.3 projects/sendfile/secure/lib/libssl/man/SSL_set_verify_result.3 projects/sendfile/secure/lib/libssl/man/SSL_shutdown.3 projects/sendfile/secure/lib/libssl/man/SSL_state_string.3 projects/sendfile/secure/lib/libssl/man/SSL_want.3 projects/sendfile/secure/lib/libssl/man/SSL_write.3 projects/sendfile/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/sendfile/secure/lib/libssl/man/ssl.3 projects/sendfile/secure/usr.bin/openssl/man/CA.pl.1 projects/sendfile/secure/usr.bin/openssl/man/asn1parse.1 projects/sendfile/secure/usr.bin/openssl/man/ca.1 projects/sendfile/secure/usr.bin/openssl/man/ciphers.1 projects/sendfile/secure/usr.bin/openssl/man/cms.1 projects/sendfile/secure/usr.bin/openssl/man/crl.1 projects/sendfile/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/sendfile/secure/usr.bin/openssl/man/dgst.1 projects/sendfile/secure/usr.bin/openssl/man/dhparam.1 projects/sendfile/secure/usr.bin/openssl/man/dsa.1 projects/sendfile/secure/usr.bin/openssl/man/dsaparam.1 projects/sendfile/secure/usr.bin/openssl/man/ec.1 projects/sendfile/secure/usr.bin/openssl/man/ecparam.1 projects/sendfile/secure/usr.bin/openssl/man/enc.1 projects/sendfile/secure/usr.bin/openssl/man/errstr.1 projects/sendfile/secure/usr.bin/openssl/man/gendsa.1 projects/sendfile/secure/usr.bin/openssl/man/genpkey.1 projects/sendfile/secure/usr.bin/openssl/man/genrsa.1 projects/sendfile/secure/usr.bin/openssl/man/nseq.1 projects/sendfile/secure/usr.bin/openssl/man/ocsp.1 projects/sendfile/secure/usr.bin/openssl/man/openssl.1 projects/sendfile/secure/usr.bin/openssl/man/passwd.1 projects/sendfile/secure/usr.bin/openssl/man/pkcs12.1 projects/sendfile/secure/usr.bin/openssl/man/pkcs7.1 projects/sendfile/secure/usr.bin/openssl/man/pkcs8.1 projects/sendfile/secure/usr.bin/openssl/man/pkey.1 projects/sendfile/secure/usr.bin/openssl/man/pkeyparam.1 projects/sendfile/secure/usr.bin/openssl/man/pkeyutl.1 projects/sendfile/secure/usr.bin/openssl/man/rand.1 projects/sendfile/secure/usr.bin/openssl/man/req.1 projects/sendfile/secure/usr.bin/openssl/man/rsa.1 projects/sendfile/secure/usr.bin/openssl/man/rsautl.1 projects/sendfile/secure/usr.bin/openssl/man/s_client.1 projects/sendfile/secure/usr.bin/openssl/man/s_server.1 projects/sendfile/secure/usr.bin/openssl/man/s_time.1 projects/sendfile/secure/usr.bin/openssl/man/sess_id.1 projects/sendfile/secure/usr.bin/openssl/man/smime.1 projects/sendfile/secure/usr.bin/openssl/man/speed.1 projects/sendfile/secure/usr.bin/openssl/man/spkac.1 projects/sendfile/secure/usr.bin/openssl/man/ts.1 projects/sendfile/secure/usr.bin/openssl/man/tsget.1 projects/sendfile/secure/usr.bin/openssl/man/verify.1 projects/sendfile/secure/usr.bin/openssl/man/version.1 projects/sendfile/secure/usr.bin/openssl/man/x509.1 projects/sendfile/secure/usr.bin/openssl/man/x509v3_config.1 projects/sendfile/share/man/man5/src.conf.5 projects/sendfile/share/misc/bsd-family-tree projects/sendfile/share/misc/committers-doc.dot projects/sendfile/share/misc/committers-ports.dot projects/sendfile/share/misc/committers-src.dot projects/sendfile/share/mk/bsd.own.mk projects/sendfile/sys/amd64/amd64/machdep.c projects/sendfile/sys/amd64/amd64/mp_watchdog.c projects/sendfile/sys/amd64/amd64/pmap.c projects/sendfile/sys/amd64/include/smp.h projects/sendfile/sys/amd64/vmm/intel/vmx.c projects/sendfile/sys/amd64/vmm/io/iommu.c projects/sendfile/sys/amd64/vmm/io/ppt.c projects/sendfile/sys/amd64/vmm/io/ppt.h projects/sendfile/sys/amd64/vmm/vmm.c projects/sendfile/sys/amd64/vmm/vmm_ipi.c projects/sendfile/sys/amd64/vmm/vmm_stat.c projects/sendfile/sys/amd64/vmm/vmm_stat.h projects/sendfile/sys/arm/arm/locore.S projects/sendfile/sys/arm/at91/uart_dev_at91usart.c projects/sendfile/sys/arm/conf/HL201 projects/sendfile/sys/arm/conf/NOTES projects/sendfile/sys/boot/i386/libi386/comconsole.c projects/sendfile/sys/boot/pc98/libpc98/comconsole.c projects/sendfile/sys/cam/cam_xpt.c projects/sendfile/sys/cam/scsi/scsi_da.c projects/sendfile/sys/compat/freebsd32/freebsd32_misc.c projects/sendfile/sys/conf/NOTES projects/sendfile/sys/conf/options projects/sendfile/sys/conf/options.arm projects/sendfile/sys/dev/adb/adb_kbd.c projects/sendfile/sys/dev/adb/adb_mouse.c projects/sendfile/sys/dev/fdt/fdt_common.c projects/sendfile/sys/dev/hwpmc/hwpmc_core.c projects/sendfile/sys/dev/hwpmc/hwpmc_piv.c projects/sendfile/sys/dev/hwpmc/hwpmc_ppro.c projects/sendfile/sys/dev/hwpmc/hwpmc_uncore.c projects/sendfile/sys/dev/hwpmc/hwpmc_x86.c projects/sendfile/sys/dev/pci/pci.c projects/sendfile/sys/dev/pci/pci_user.c projects/sendfile/sys/dev/pci/pcivar.h projects/sendfile/sys/dev/uart/uart.h projects/sendfile/sys/dev/uart/uart_bus_fdt.c projects/sendfile/sys/dev/uart/uart_cpu_fdt.c projects/sendfile/sys/dev/usb/controller/ehci.c projects/sendfile/sys/dev/usb/quirk/usb_quirk.c projects/sendfile/sys/dev/usb/usb_freebsd.h projects/sendfile/sys/dev/usb/usb_freebsd_loader.h projects/sendfile/sys/dev/usb/usb_transfer.c projects/sendfile/sys/dev/usb/usbdevs projects/sendfile/sys/dev/usb/wlan/if_run.c projects/sendfile/sys/dev/vt/hw/fb/vt_fb.c projects/sendfile/sys/fs/ext2fs/ext2_bmap.c projects/sendfile/sys/fs/ext2fs/ext2_dinode.h projects/sendfile/sys/fs/ext2fs/ext2_htree.c projects/sendfile/sys/fs/ext2fs/ext2_inode_cnv.c projects/sendfile/sys/fs/ext2fs/ext2_lookup.c projects/sendfile/sys/fs/ext2fs/ext2_subr.c projects/sendfile/sys/fs/ext2fs/ext2_vfsops.c projects/sendfile/sys/fs/ext2fs/ext2_vnops.c projects/sendfile/sys/fs/ext2fs/inode.h projects/sendfile/sys/geom/geom_ctl.c projects/sendfile/sys/i386/i386/machdep.c projects/sendfile/sys/i386/i386/mp_watchdog.c projects/sendfile/sys/i386/i386/pmap.c projects/sendfile/sys/i386/include/smp.h projects/sendfile/sys/i386/xen/mptable.c projects/sendfile/sys/kern/subr_prf.c projects/sendfile/sys/kern/vfs_bio.c projects/sendfile/sys/kern/vfs_syscalls.c projects/sendfile/sys/mips/atheros/ar724xreg.h projects/sendfile/sys/netinet/ip_mroute.c projects/sendfile/sys/netpfil/ipfw/ip_fw2.c projects/sendfile/sys/netpfil/ipfw/ip_fw_private.h projects/sendfile/sys/netpfil/ipfw/ip_fw_sockopt.c projects/sendfile/sys/netpfil/pf/pf.c projects/sendfile/sys/netpfil/pf/pf_ioctl.c projects/sendfile/sys/pc98/pc98/machdep.c projects/sendfile/sys/powerpc/powermac/macio.c projects/sendfile/sys/powerpc/powermac/maciovar.h projects/sendfile/sys/powerpc/powerpc/exec_machdep.c projects/sendfile/sys/sys/pciio.h projects/sendfile/sys/sys/systm.h projects/sendfile/sys/vm/vm_pageout.c projects/sendfile/sys/x86/acpica/madt.c projects/sendfile/sys/x86/acpica/srat.c projects/sendfile/sys/x86/include/legacyvar.h projects/sendfile/sys/x86/pci/pci_bus.c projects/sendfile/sys/x86/pci/qpi.c projects/sendfile/sys/x86/x86/io_apic.c projects/sendfile/sys/x86/x86/local_apic.c projects/sendfile/sys/x86/x86/mca.c projects/sendfile/sys/x86/x86/mptable.c projects/sendfile/sys/x86/x86/mptable_pci.c projects/sendfile/sys/x86/x86/msi.c projects/sendfile/sys/x86/xen/xen_intr.c projects/sendfile/usr.sbin/bhyve/block_if.c projects/sendfile/usr.sbin/bhyve/pci_ahci.c projects/sendfile/usr.sbin/etcupdate/etcupdate.sh projects/sendfile/usr.sbin/mergemaster/mergemaster.sh projects/sendfile/usr.sbin/pciconf/pciconf.8 projects/sendfile/usr.sbin/pciconf/pciconf.c projects/sendfile/usr.sbin/pkg/config.c projects/sendfile/usr.sbin/services_mkdb/extern.h projects/sendfile/usr.sbin/services_mkdb/services_mkdb.8 projects/sendfile/usr.sbin/services_mkdb/services_mkdb.c projects/sendfile/usr.sbin/usbdump/usbdump.c Directory Properties: projects/sendfile/ (props changed) projects/sendfile/crypto/openssl/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/include/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/amd64/vmm/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/usr.sbin/bhyve/ (props changed) Modified: projects/sendfile/Makefile.inc1 ============================================================================== --- projects/sendfile/Makefile.inc1 Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/Makefile.inc1 Fri Jan 24 13:36:41 2014 (r261119) @@ -417,7 +417,7 @@ LIB32WMAKEFLAGS+= \ -DNO_LINT LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \ - -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML + -DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML -DNO_TESTS LIB32IMAKE= ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \ ${IMAKE_INSTALL} .endif @@ -771,7 +771,7 @@ _nmtree_itools= nmtree ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep id install ${_install-info} \ ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \ - rm sed sh sysctl test true uname wc ${_zoneinfo} + rm sed services_mkdb sh sysctl test true uname wc ${_zoneinfo} # # distributeworld Modified: projects/sendfile/contrib/bsnmp/lib/asn1.c ============================================================================== --- projects/sendfile/contrib/bsnmp/lib/asn1.c Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/bsnmp/lib/asn1.c Fri Jan 24 13:36:41 2014 (r261119) @@ -652,7 +652,7 @@ asn_put_objid(struct asn_buf *b, const s err = ASN_ERR_RANGE; } if (oid->subs[0] > 2 || - (oid->subs[0] < 2 && oid->subs[0] >= 40)) { + (oid->subs[0] < 2 && oid->subs[1] >= 40)) { asn_error(NULL, "oid out of range (%u,%u)", oid->subs[0], oid->subs[1]); err = ASN_ERR_RANGE; Modified: projects/sendfile/contrib/jemalloc/COPYING ============================================================================== --- projects/sendfile/contrib/jemalloc/COPYING Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/COPYING Fri Jan 24 13:36:41 2014 (r261119) @@ -1,10 +1,10 @@ Unless otherwise specified, files in the jemalloc source distribution are subject to the following license: -------------------------------------------------------------------------------- -Copyright (C) 2002-2013 Jason Evans <jasone@canonware.com>. +Copyright (C) 2002-2014 Jason Evans <jasone@canonware.com>. All rights reserved. Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved. -Copyright (C) 2009-2013 Facebook, Inc. All rights reserved. +Copyright (C) 2009-2014 Facebook, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Modified: projects/sendfile/contrib/jemalloc/ChangeLog ============================================================================== --- projects/sendfile/contrib/jemalloc/ChangeLog Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/ChangeLog Fri Jan 24 13:36:41 2014 (r261119) @@ -6,6 +6,59 @@ found in the git revision history: http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git git://canonware.com/jemalloc.git +* 3.5.0 (January 22, 2014) + + This version focuses on refactoring and automated testing, though it also + includes some non-trivial heap profiling optimizations not mentioned below. + + New features: + - Add the *allocx() API, which is a successor to the experimental *allocm() + API. The *allocx() functions are slightly simpler to use because they have + fewer parameters, they directly return the results of primary interest, and + mallocx()/rallocx() avoid the strict aliasing pitfall that + allocm()/rallocx() share with posix_memalign(). Note that *allocm() is + slated for removal in the next non-bugfix release. + - Add support for LinuxThreads. + + Bug fixes: + - Unless heap profiling is enabled, disable floating point code and don't link + with libm. This, in combination with e.g. EXTRA_CFLAGS=-mno-sse on x64 + systems, makes it possible to completely disable floating point register + use. Some versions of glibc neglect to save/restore caller-saved floating + point registers during dynamic lazy symbol loading, and the symbol loading + code uses whatever malloc the application happens to have linked/loaded + with, the result being potential floating point register corruption. + - Report ENOMEM rather than EINVAL if an OOM occurs during heap profiling + backtrace creation in imemalign(). This bug impacted posix_memalign() and + aligned_alloc(). + - Fix a file descriptor leak in a prof_dump_maps() error path. + - Fix prof_dump() to close the dump file descriptor for all relevant error + paths. + - Fix rallocm() to use the arena specified by the ALLOCM_ARENA(s) flag for + allocation, not just deallocation. + - Fix a data race for large allocation stats counters. + - Fix a potential infinite loop during thread exit. This bug occurred on + Solaris, and could affect other platforms with similar pthreads TSD + implementations. + - Don't junk-fill reallocations unless usable size changes. This fixes a + violation of the *allocx()/*allocm() semantics. + - Fix growing large reallocation to junk fill new space. + - Fix huge deallocation to junk fill when munmap is disabled. + - Change the default private namespace prefix from empty to je_, and change + --with-private-namespace-prefix so that it prepends an additional prefix + rather than replacing je_. This reduces the likelihood of applications + which statically link jemalloc experiencing symbol name collisions. + - Add missing private namespace mangling (relevant when + --with-private-namespace is specified). + - Add and use JEMALLOC_INLINE_C so that static inline functions are marked as + static even for debug builds. + - Add a missing mutex unlock in a malloc_init_hard() error path. In practice + this error path is never executed. + - Fix numerous bugs in malloc_strotumax() error handling/reporting. These + bugs had no impact except for malformed inputs. + - Fix numerous bugs in malloc_snprintf(). These bugs were not exercised by + existing calls, so they had no impact. + * 3.4.1 (October 20, 2013) Bug fixes: Modified: projects/sendfile/contrib/jemalloc/FREEBSD-Xlist ============================================================================== --- projects/sendfile/contrib/jemalloc/FREEBSD-Xlist Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/FREEBSD-Xlist Fri Jan 24 13:36:41 2014 (r261119) @@ -10,14 +10,35 @@ autom4te.cache/ bin/ config.* configure* +coverage.sh doc/*.in doc/*.xml doc/*.xsl doc/*.html include/jemalloc/internal/jemalloc_internal.h.in +include/jemalloc/internal/jemalloc_internal_defs.h.in +include/jemalloc/internal/private_namespace.sh +include/jemalloc/internal/private_symbols.txt +include/jemalloc/internal/private_unnamespace.h +include/jemalloc/internal/private_unnamespace.sh +include/jemalloc/internal/public_namespace.sh +include/jemalloc/internal/public_symbols.txt +include/jemalloc/internal/public_unnamespace.h +include/jemalloc/internal/public_unnamespace.sh include/jemalloc/internal/size_classes.sh include/jemalloc/jemalloc.h.in +include/jemalloc/jemalloc.sh include/jemalloc/jemalloc_defs.h.in +include/jemalloc/jemalloc_macros.h +include/jemalloc/jemalloc_macros.h.in +include/jemalloc/jemalloc_mangle_jet.h +include/jemalloc/jemalloc_mangle.sh +include/jemalloc/jemalloc_mangle.h +include/jemalloc/jemalloc_protos_jet.h +include/jemalloc/jemalloc_protos.h +include/jemalloc/jemalloc_protos.h.in +include/jemalloc/jemalloc_rename.h +include/jemalloc/jemalloc_rename.sh include/msvc_compat/ install-sh src/zone.c Modified: projects/sendfile/contrib/jemalloc/FREEBSD-diffs ============================================================================== --- projects/sendfile/contrib/jemalloc/FREEBSD-diffs Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/FREEBSD-diffs Fri Jan 24 13:36:41 2014 (r261119) @@ -1,8 +1,8 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in -index abd5e6f..1d7491a 100644 +index c7e2e87..2bd59f0 100644 --- a/doc/jemalloc.xml.in +++ b/doc/jemalloc.xml.in -@@ -51,12 +51,23 @@ +@@ -57,12 +57,23 @@ <para>This manual describes jemalloc @jemalloc_version@. More information can be found at the <ulink url="http://www.canonware.com/jemalloc/">jemalloc website</ulink>.</para> @@ -27,7 +27,7 @@ index abd5e6f..1d7491a 100644 <refsect2> <title>Standard API</title> <funcprototype> -@@ -2180,4 +2191,16 @@ malloc_conf = "lg_chunk:24";]]></programlisting></para> +@@ -2338,4 +2349,19 @@ malloc_conf = "lg_chunk:24";]]></programlisting></para> <para>The <function>posix_memalign<parameter/></function> function conforms to IEEE Std 1003.1-2001 (“POSIX.1”).</para> </refsect1> @@ -42,32 +42,35 @@ index abd5e6f..1d7491a 100644 + <function>mallctl*<parameter/></function>, and + <function>*allocm<parameter/></function> functions first appeared in + FreeBSD 10.0.</para> ++ ++ <para>The <function>*allocx<parameter/></function> functions first appeared ++ in FreeBSD 11.0.</para> + </refsect1> </refentry> diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in -index 53c135c..c547339 100644 +index d24a1fe..d101c3d 100644 --- a/include/jemalloc/internal/jemalloc_internal.h.in +++ b/include/jemalloc/internal/jemalloc_internal.h.in @@ -1,5 +1,8 @@ #ifndef JEMALLOC_INTERNAL_H - #define JEMALLOC_INTERNAL_H + #define JEMALLOC_INTERNAL_H +#include "libc_private.h" +#include "namespace.h" + #include <math.h> #ifdef _WIN32 # include <windows.h> -@@ -54,6 +57,9 @@ typedef intptr_t ssize_t; +@@ -65,6 +68,9 @@ typedef intptr_t ssize_t; + #include <valgrind/memcheck.h> #endif - #include <fcntl.h> +#include "un-namespace.h" +#include "libc_private.h" + #define JEMALLOC_NO_DEMANGLE - #include "../jemalloc@install_suffix@.h" - -@@ -95,13 +101,7 @@ static const bool config_fill = + #ifdef JEMALLOC_JET + # define JEMALLOC_N(n) jet_##n +@@ -99,13 +105,7 @@ static const bool config_fill = false #endif ; @@ -96,36 +99,24 @@ index de44e14..564d604 100644 #endif bool malloc_mutex_init(malloc_mutex_t *mutex); -diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h -index cdb0b0e..2a98d1f 100644 ---- a/include/jemalloc/internal/private_namespace.h -+++ b/include/jemalloc/internal/private_namespace.h -@@ -218,7 +218,6 @@ - #define iralloc JEMALLOC_N(iralloc) - #define irallocx JEMALLOC_N(irallocx) - #define isalloc JEMALLOC_N(isalloc) --#define isthreaded JEMALLOC_N(isthreaded) - #define ivsalloc JEMALLOC_N(ivsalloc) - #define jemalloc_postfork_child JEMALLOC_N(jemalloc_postfork_child) - #define jemalloc_postfork_parent JEMALLOC_N(jemalloc_postfork_parent) -diff --git a/include/jemalloc/jemalloc.h.in b/include/jemalloc/jemalloc.h.in -index 31b1304..c3ef2f5 100644 ---- a/include/jemalloc/jemalloc.h.in -+++ b/include/jemalloc/jemalloc.h.in -@@ -15,6 +15,7 @@ extern "C" { - #define JEMALLOC_VERSION_GID "@jemalloc_version_gid@" - - #include "jemalloc_defs@install_suffix@.h" -+#include "jemalloc_FreeBSD.h" - - #ifdef JEMALLOC_EXPERIMENTAL - #define ALLOCM_LG_ALIGN(la) (la) +diff --git a/include/jemalloc/internal/private_symbols.txt b/include/jemalloc/internal/private_symbols.txt +index 1e64ed5..29ddba3 100644 +--- a/include/jemalloc/internal/private_symbols.txt ++++ b/include/jemalloc/internal/private_symbols.txt +@@ -225,7 +225,6 @@ iralloc + iralloct + iralloct_realign + isalloc +-isthreaded + ivsalloc + ixalloc + jemalloc_postfork_child diff --git a/include/jemalloc/jemalloc_FreeBSD.h b/include/jemalloc/jemalloc_FreeBSD.h new file mode 100644 -index 0000000..e6c8407 +index 0000000..94554bc --- /dev/null +++ b/include/jemalloc/jemalloc_FreeBSD.h -@@ -0,0 +1,117 @@ +@@ -0,0 +1,134 @@ +/* + * Override settings that were generated in jemalloc_defs.h as necessary. + */ @@ -202,6 +193,12 @@ index 0000000..e6c8407 +#undef je_free +#undef je_posix_memalign +#undef je_malloc_usable_size ++#undef je_mallocx ++#undef je_rallocx ++#undef je_xallocx ++#undef je_sallocx ++#undef je_dallocx ++#undef je_nallocx +#undef je_allocm +#undef je_rallocm +#undef je_sallocm @@ -213,6 +210,12 @@ index 0000000..e6c8407 +#define je_free __free +#define je_posix_memalign __posix_memalign +#define je_malloc_usable_size __malloc_usable_size ++#define je_mallocx __mallocx ++#define je_rallocx __rallocx ++#define je_xallocx __xallocx ++#define je_sallocx __sallocx ++#define je_dallocx __dallocx ++#define je_nallocx __nallocx +#define je_allocm __allocm +#define je_rallocm __rallocm +#define je_sallocm __sallocm @@ -236,15 +239,31 @@ index 0000000..e6c8407 +__weak_reference(__free, free); +__weak_reference(__posix_memalign, posix_memalign); +__weak_reference(__malloc_usable_size, malloc_usable_size); ++__weak_reference(__mallocx, mallocx); ++__weak_reference(__rallocx, rallocx); ++__weak_reference(__xallocx, xallocx); ++__weak_reference(__sallocx, sallocx); ++__weak_reference(__dallocx, dallocx); ++__weak_reference(__nallocx, nallocx); +__weak_reference(__allocm, allocm); +__weak_reference(__rallocm, rallocm); +__weak_reference(__sallocm, sallocm); +__weak_reference(__dallocm, dallocm); +__weak_reference(__nallocm, nallocm); +#endif +diff --git a/include/jemalloc/jemalloc_rename.sh b/include/jemalloc/jemalloc_rename.sh +index f943891..47d032c 100755 +--- a/include/jemalloc/jemalloc_rename.sh ++++ b/include/jemalloc/jemalloc_rename.sh +@@ -19,4 +19,6 @@ done + + cat <<EOF + #endif + ++#include "jemalloc_FreeBSD.h" + EOF diff --git a/src/jemalloc.c b/src/jemalloc.c -index ae56db6..1412a5e 100644 +index 563d99f..42f97b4 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL) @@ -258,7 +277,7 @@ index ae56db6..1412a5e 100644 /* Runtime configuration options. */ const char *je_malloc_conf; bool opt_abort = -@@ -471,7 +475,8 @@ malloc_conf_init(void) +@@ -457,7 +461,8 @@ malloc_conf_init(void) #endif ; @@ -269,7 +288,7 @@ index ae56db6..1412a5e 100644 * Do nothing; opts is already initialized to * the value of the MALLOC_CONF environment diff --git a/src/mutex.c b/src/mutex.c -index 55e18c2..6b6f438 100644 +index 788eca3..6f5954e 100644 --- a/src/mutex.c +++ b/src/mutex.c @@ -66,6 +66,17 @@ pthread_create(pthread_t *__restrict thread, @@ -291,7 +310,7 @@ index 55e18c2..6b6f438 100644 bool diff --git a/src/util.c b/src/util.c -index b3a0114..df1c5d5 100644 +index 93a19fd..70b3e45 100644 --- a/src/util.c +++ b/src/util.c @@ -58,6 +58,22 @@ wrtmessage(void *cbopaque, const char *s) Modified: projects/sendfile/contrib/jemalloc/FREEBSD-upgrade ============================================================================== --- projects/sendfile/contrib/jemalloc/FREEBSD-upgrade Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/FREEBSD-upgrade Fri Jan 24 13:36:41 2014 (r261119) @@ -74,7 +74,7 @@ do_extract() { # Generate various files. ./autogen.sh --enable-cc-silence --enable-dss --enable-xmalloc \ --enable-utrace --with-xslroot=/usr/local/share/xsl/docbook \ - --with-private-namespace=__jemalloc_ + --with-private-namespace=__ gmake dist ) } Modified: projects/sendfile/contrib/jemalloc/VERSION ============================================================================== --- projects/sendfile/contrib/jemalloc/VERSION Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/VERSION Fri Jan 24 13:36:41 2014 (r261119) @@ -1 +1 @@ -3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0 +3.5.0-0-gcc47dde16203a6ae7eb685b53e1ae501f3869bc6 Modified: projects/sendfile/contrib/jemalloc/doc/jemalloc.3 ============================================================================== --- projects/sendfile/contrib/jemalloc/doc/jemalloc.3 Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/doc/jemalloc.3 Fri Jan 24 13:36:41 2014 (r261119) @@ -2,12 +2,12 @@ .\" Title: JEMALLOC .\" Author: Jason Evans .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>; -.\" Date: 10/20/2013 +.\" Date: 01/22/2014 .\" Manual: User Manual -.\" Source: jemalloc 3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0 +.\" Source: jemalloc 3.5.0-0-gcc47dde16203a6ae7eb685b53e1ae501f3869bc6 .\" Language: English .\" -.TH "JEMALLOC" "3" "10/20/2013" "jemalloc 3.4.1-0-g0135fb806e41" "User Manual" +.TH "JEMALLOC" "3" "01/22/2014" "jemalloc 3.5.0-0-gcc47dde16203" "User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ jemalloc \- general purpose memory allocation functions .SH "LIBRARY" .PP -This manual describes jemalloc 3\&.4\&.1\-0\-g0135fb806e4137dc9cdf152541926a2bc95e33f0\&. More information can be found at the +This manual describes jemalloc 3\&.5\&.0\-0\-gcc47dde16203a6ae7eb685b53e1ae501f3869bc6\&. More information can be found at the \m[blue]\fBjemalloc website\fR\m[]\&\s-2\u[1]\d\s+2\&. .PP The following configuration options are enabled in libc\*(Aqs built\-in jemalloc: @@ -71,16 +71,28 @@ make variable)\&. .HP \w'void\ free('u .BI "void free(void\ *" "ptr" ");" .SS "Non\-standard API" -.HP \w'size_t\ malloc_usable_size('u -.BI "size_t malloc_usable_size(const\ void\ *" "ptr" ");" -.HP \w'void\ malloc_stats_print('u -.BI "void malloc_stats_print(void\ " "(*write_cb)" "\ (void\ *,\ const\ char\ *), void\ *" "cbopaque" ", const\ char\ *" "opts" ");" +.HP \w'void\ *mallocx('u +.BI "void *mallocx(size_t\ " "size" ", int\ " "flags" ");" +.HP \w'void\ *rallocx('u +.BI "void *rallocx(void\ *" "ptr" ", size_t\ " "size" ", int\ " "flags" ");" +.HP \w'size_t\ xallocx('u +.BI "size_t xallocx(void\ *" "ptr" ", size_t\ " "size" ", size_t\ " "extra" ", int\ " "flags" ");" +.HP \w'size_t\ sallocx('u +.BI "size_t sallocx(void\ *" "ptr" ", int\ " "flags" ");" +.HP \w'void\ dallocx('u +.BI "void dallocx(void\ *" "ptr" ", int\ " "flags" ");" +.HP \w'size_t\ nallocx('u +.BI "size_t nallocx(size_t\ " "size" ", int\ " "flags" ");" .HP \w'int\ mallctl('u .BI "int mallctl(const\ char\ *" "name" ", void\ *" "oldp" ", size_t\ *" "oldlenp" ", void\ *" "newp" ", size_t\ " "newlen" ");" .HP \w'int\ mallctlnametomib('u .BI "int mallctlnametomib(const\ char\ *" "name" ", size_t\ *" "mibp" ", size_t\ *" "miblenp" ");" .HP \w'int\ mallctlbymib('u .BI "int mallctlbymib(const\ size_t\ *" "mib" ", size_t\ " "miblen" ", void\ *" "oldp" ", size_t\ *" "oldlenp" ", void\ *" "newp" ", size_t\ " "newlen" ");" +.HP \w'void\ malloc_stats_print('u +.BI "void malloc_stats_print(void\ " "(*write_cb)" "\ (void\ *,\ const\ char\ *), void\ *" "cbopaque" ", const\ char\ *" "opts" ");" +.HP \w'size_t\ malloc_usable_size('u +.BI "size_t malloc_usable_size(const\ void\ *" "ptr" ");" .HP \w'void\ (*malloc_message)('u .BI "void (*malloc_message)(void\ *" "cbopaque" ", const\ char\ *" "s" ");" .PP @@ -172,36 +184,105 @@ is .SS "Non\-standard API" .PP The -\fBmalloc_usable_size\fR\fB\fR -function returns the usable size of the allocation pointed to by -\fIptr\fR\&. The return value may be larger than the size that was requested during allocation\&. The -\fBmalloc_usable_size\fR\fB\fR -function is not a mechanism for in\-place -\fBrealloc\fR\fB\fR; rather it is provided solely as a tool for introspection purposes\&. Any discrepancy between the requested allocation size and the size reported by -\fBmalloc_usable_size\fR\fB\fR -should not be depended on, since such behavior is entirely implementation\-dependent\&. +\fBmallocx\fR\fB\fR, +\fBrallocx\fR\fB\fR, +\fBxallocx\fR\fB\fR, +\fBsallocx\fR\fB\fR, +\fBdallocx\fR\fB\fR, and +\fBnallocx\fR\fB\fR +functions all have a +\fIflags\fR +argument that can be used to specify options\&. The functions only check the options that are contextually relevant\&. Use bitwise or (|) operations to specify one or more of the following: +.PP +\fBMALLOCX_LG_ALIGN(\fR\fB\fIla\fR\fR\fB) \fR +.RS 4 +Align the memory allocation to start at an address that is a multiple of +(1 << \fIla\fR)\&. This macro does not validate that +\fIla\fR +is within the valid range\&. +.RE +.PP +\fBMALLOCX_ALIGN(\fR\fB\fIa\fR\fR\fB) \fR +.RS 4 +Align the memory allocation to start at an address that is a multiple of +\fIa\fR, where +\fIa\fR +is a power of two\&. This macro does not validate that +\fIa\fR +is a power of 2\&. +.RE +.PP +\fBMALLOCX_ZERO\fR +.RS 4 +Initialize newly allocated memory to contain zero bytes\&. In the growing reallocation case, the real size prior to reallocation defines the boundary between untouched bytes and those that are initialized to contain zero bytes\&. If this macro is absent, newly allocated memory is uninitialized\&. +.RE +.PP +\fBMALLOCX_ARENA(\fR\fB\fIa\fR\fR\fB) \fR +.RS 4 +Use the arena specified by the index +\fIa\fR +(and by necessity bypass the thread cache)\&. This macro has no effect for huge regions, nor for regions that were allocated via an arena other than the one specified\&. This macro does not validate that +\fIa\fR +specifies an arena index in the valid range\&. +.RE .PP The -\fBmalloc_stats_print\fR\fB\fR -function writes human\-readable summary statistics via the -\fIwrite_cb\fR -callback function pointer and -\fIcbopaque\fR -data passed to -\fIwrite_cb\fR, or -\fBmalloc_message\fR\fB\fR -if -\fIwrite_cb\fR +\fBmallocx\fR\fB\fR +function allocates at least +\fIsize\fR +bytes of memory, and returns a pointer to the base address of the allocation\&. Behavior is undefined if +\fIsize\fR is -\fBNULL\fR\&. This function can be called repeatedly\&. General information that never changes during execution can be omitted by specifying "g" as a character within the -\fIopts\fR -string\&. Note that -\fBmalloc_message\fR\fB\fR -uses the -\fBmallctl*\fR\fB\fR -functions internally, so inconsistent statistics can be reported if multiple threads use these functions simultaneously\&. If -\fB\-\-enable\-stats\fR -is specified during configuration, \(lqm\(rq and \(lqa\(rq can be specified to omit merged arena and per arena statistics, respectively; \(lqb\(rq and \(lql\(rq can be specified to omit per size class statistics for bins and large objects, respectively\&. Unrecognized characters are silently ignored\&. Note that thread caching may prevent some statistics from being completely up to date, since extra locking would be required to merge counters that track thread cache operations\&. +\fB0\fR, or if request size overflows due to size class and/or alignment constraints\&. +.PP +The +\fBrallocx\fR\fB\fR +function resizes the allocation at +\fIptr\fR +to be at least +\fIsize\fR +bytes, and returns a pointer to the base address of the resulting allocation, which may or may not have moved from its original location\&. Behavior is undefined if +\fIsize\fR +is +\fB0\fR, or if request size overflows due to size class and/or alignment constraints\&. +.PP +The +\fBxallocx\fR\fB\fR +function resizes the allocation at +\fIptr\fR +in place to be at least +\fIsize\fR +bytes, and returns the real size of the allocation\&. If +\fIextra\fR +is non\-zero, an attempt is made to resize the allocation to be at least +(\fIsize\fR + \fIextra\fR) +bytes, though inability to allocate the extra byte(s) will not by itself result in failure to resize\&. Behavior is undefined if +\fIsize\fR +is +\fB0\fR, or if +(\fIsize\fR + \fIextra\fR > \fBSIZE_T_MAX\fR)\&. +.PP +The +\fBsallocx\fR\fB\fR +function returns the real size of the allocation at +\fIptr\fR\&. +.PP +The +\fBdallocx\fR\fB\fR +function causes the memory referenced by +\fIptr\fR +to be made available for future allocations\&. +.PP +The +\fBnallocx\fR\fB\fR +function allocates no memory, but it performs the same size computation as the +\fBmallocx\fR\fB\fR +function, and returns the real size of the allocation that would result from the equivalent +\fBmallocx\fR\fB\fR +function call\&. Behavior is undefined if +\fIsize\fR +is +\fB0\fR, or if request size overflows due to size class and/or alignment constraints\&. .PP The \fBmallctl\fR\fB\fR @@ -245,15 +326,14 @@ that is smaller than the number of perio .\} .nf unsigned nbins, i; - -int mib[4]; +size_t mib[4]; size_t len, miblen; len = sizeof(nbins); mallctl("arenas\&.nbins", &nbins, &len, NULL, 0); miblen = 4; -mallnametomib("arenas\&.bin\&.0\&.size", mib, &miblen); +mallctlnametomib("arenas\&.bin\&.0\&.size", mib, &miblen); for (i = 0; i < nbins; i++) { size_t bin_size; @@ -266,6 +346,38 @@ for (i = 0; i < nbins; i++) { .if n \{\ .RE .\} +.PP +The +\fBmalloc_stats_print\fR\fB\fR +function writes human\-readable summary statistics via the +\fIwrite_cb\fR +callback function pointer and +\fIcbopaque\fR +data passed to +\fIwrite_cb\fR, or +\fBmalloc_message\fR\fB\fR +if +\fIwrite_cb\fR +is +\fBNULL\fR\&. This function can be called repeatedly\&. General information that never changes during execution can be omitted by specifying "g" as a character within the +\fIopts\fR +string\&. Note that +\fBmalloc_message\fR\fB\fR +uses the +\fBmallctl*\fR\fB\fR +functions internally, so inconsistent statistics can be reported if multiple threads use these functions simultaneously\&. If +\fB\-\-enable\-stats\fR +is specified during configuration, \(lqm\(rq and \(lqa\(rq can be specified to omit merged arena and per arena statistics, respectively; \(lqb\(rq and \(lql\(rq can be specified to omit per size class statistics for bins and large objects, respectively\&. Unrecognized characters are silently ignored\&. Note that thread caching may prevent some statistics from being completely up to date, since extra locking would be required to merge counters that track thread cache operations\&. +.PP +The +\fBmalloc_usable_size\fR\fB\fR +function returns the usable size of the allocation pointed to by +\fIptr\fR\&. The return value may be larger than the size that was requested during allocation\&. The +\fBmalloc_usable_size\fR\fB\fR +function is not a mechanism for in\-place +\fBrealloc\fR\fB\fR; rather it is provided solely as a tool for introspection purposes\&. Any discrepancy between the requested allocation size and the size reported by +\fBmalloc_usable_size\fR\fB\fR +should not be depended on, since such behavior is entirely implementation\-dependent\&. .SS "Experimental API" .PP The experimental API is subject to change or removal without regard for backward compatibility\&. If @@ -302,7 +414,7 @@ is a power of 2\&. .PP \fBALLOCM_ZERO\fR .RS 4 -Initialize newly allocated memory to contain zero bytes\&. In the growing reallocation case, the real size prior to reallocation defines the boundary between untouched bytes and those that are initialized to contain zero bytes\&. If this option is absent, newly allocated memory is uninitialized\&. +Initialize newly allocated memory to contain zero bytes\&. In the growing reallocation case, the real size prior to reallocation defines the boundary between untouched bytes and those that are initialized to contain zero bytes\&. If this macro is absent, newly allocated memory is uninitialized\&. .RE .PP \fBALLOCM_NO_MOVE\fR @@ -313,9 +425,10 @@ For reallocation, fail rather than movin \fBALLOCM_ARENA(\fR\fB\fIa\fR\fR\fB) \fR .RS 4 Use the arena specified by the index -\fIa\fR\&. This macro does not validate that \fIa\fR -specifies an arena in the valid range\&. +(and by necessity bypass the thread cache)\&. This macro has no effect for huge regions, nor for regions that were allocated via an arena other than the one specified\&. This macro does not validate that +\fIa\fR +specifies an arena index in the valid range\&. .RE .PP The @@ -332,7 +445,7 @@ is not \fBNULL\fR\&. Behavior is undefined if \fIsize\fR is -\fB0\fR\&. +\fB0\fR, or if request size overflows due to size class and/or alignment constraints\&. .PP The \fBrallocm\fR\fB\fR @@ -350,11 +463,11 @@ is not \fBNULL\fR\&. If \fIextra\fR is non\-zero, an attempt is made to resize the allocation to be at least -\fIsize\fR + \fIextra\fR) +(\fIsize\fR + \fIextra\fR) bytes, though inability to allocate the extra byte(s) will not by itself result in failure\&. Behavior is undefined if \fIsize\fR is -\fB0\fR, or if +\fB0\fR, if request size overflows due to size class and/or alignment constraints, or if (\fIsize\fR + \fIextra\fR > \fBSIZE_T_MAX\fR)\&. .PP The @@ -384,7 +497,7 @@ to the real size of the allocation that function call\&. Behavior is undefined if \fIsize\fR is -\fB0\fR\&. +\fB0\fR, or if request size overflows due to size class and/or alignment constraints\&. .SH "TUNING" .PP Once, when the first call is made to one of the memory allocation routines, the allocator initializes its internals based in part on various options that can be specified at compile\- or run\-time\&. @@ -662,16 +775,18 @@ in these cases\&. This option is disable is specified during configuration, in which case it is enabled by default\&. .RE .PP -"opt\&.lg_chunk" (\fBsize_t\fR) r\- -.RS 4 -Virtual memory chunk size (log base 2)\&. If a chunk size outside the supported size range is specified, the size is silently clipped to the minimum/maximum supported size\&. The default chunk size is 4 MiB (2^22)\&. -.RE -.PP "opt\&.dss" (\fBconst char *\fR) r\- .RS 4 dss (\fBsbrk\fR(2)) allocation precedence as related to \fBmmap\fR(2) -allocation\&. The following settings are supported: \(lqdisabled\(rq, \(lqprimary\(rq, and \(lqsecondary\(rq (default)\&. +allocation\&. The following settings are supported: \(lqdisabled\(rq, \(lqprimary\(rq, and \(lqsecondary\(rq\&. The default is \(lqsecondary\(rq if +"config\&.dss" +is true, \(lqdisabled\(rq otherwise\&. +.RE +.PP +"opt\&.lg_chunk" (\fBsize_t\fR) r\- +.RS 4 +Virtual memory chunk size (log base 2)\&. If a chunk size outside the supported size range is specified, the size is silently clipped to the minimum/maximum supported size\&. The default chunk size is 4 MiB (2^22)\&. .RE .PP "opt\&.narenas" (\fBsize_t\fR) r\- @@ -726,7 +841,8 @@ option is enabled, the redzones are chec "opt\&.zero" (\fBbool\fR) r\- [\fB\-\-enable\-fill\fR] .RS 4 Zero filling enabled/disabled\&. If enabled, each byte of uninitialized allocated memory will be initialized to 0\&. Note that this initialization only happens once for each byte, so -\fBrealloc\fR\fB\fR +\fBrealloc\fR\fB\fR, +\fBrallocx\fR\fB\fR and \fBrallocm\fR\fB\fR calls do not zero memory that was previously allocated\&. This is intended for debugging and will impact performance negatively\&. This option is disabled by default\&. @@ -804,7 +920,7 @@ Filename prefix for profile dumps\&. If jeprof\&. .RE .PP -"opt\&.prof_active" (\fBbool\fR) r\- [\fB\-\-enable\-prof\fR] +"opt\&.prof_active" (\fBbool\fR) rw [\fB\-\-enable\-prof\fR] .RS 4 Profiling activated/deactivated\&. This is a secondary control mechanism that makes it possible to start the application with profiling enabled (see the "opt\&.prof" @@ -1119,7 +1235,7 @@ Number of or similar calls made to purge dirty pages\&. .RE .PP -"stats\&.arenas\&.<i>\&.npurged" (\fBuint64_t\fR) r\- [\fB\-\-enable\-stats\fR] +"stats\&.arenas\&.<i>\&.purged" (\fBuint64_t\fR) r\- [\fB\-\-enable\-stats\fR] .RS 4 Number of pages purged\&. .RE @@ -1342,11 +1458,32 @@ function returns no value\&. .SS "Non\-standard API" .PP The -\fBmalloc_usable_size\fR\fB\fR -function returns the usable size of the allocation pointed to by +\fBmallocx\fR\fB\fR +and +\fBrallocx\fR\fB\fR +functions return a pointer to the allocated memory if successful; otherwise a +\fBNULL\fR +pointer is returned to indicate insufficient contiguous memory was available to service the allocation request\&. +.PP +The +\fBxallocx\fR\fB\fR +function returns the real size of the resulting resized allocation pointed to by +\fIptr\fR, which is a value less than +\fIsize\fR +if the allocation could not be adequately grown in place\&. +.PP +The +\fBsallocx\fR\fB\fR +function returns the real size of the allocation pointed to by \fIptr\fR\&. .PP The +\fBnallocx\fR\fB\fR +returns the real size that would result from a successful equivalent +\fBmallocx\fR\fB\fR +function call, or zero if insufficient memory is available to perform the size computation\&. +.PP +The \fBmallctl\fR\fB\fR, \fBmallctlnametomib\fR\fB\fR, and \fBmallctlbymib\fR\fB\fR @@ -1363,12 +1500,6 @@ is too large or too small\&. Alternative is too large or too small; in this case as much data as possible are read despite the error\&. .RE .PP -ENOMEM -.RS 4 -\fI*oldlenp\fR -is too short to hold the requested value\&. -.RE -.PP ENOENT .RS 4 \fIname\fR @@ -1393,6 +1524,11 @@ An interface with side effects failed in \fBmallctl*\fR\fB\fR read/write processing\&. .RE +.PP +The +\fBmalloc_usable_size\fR\fB\fR +function returns the usable size of the allocation pointed to by +\fIptr\fR\&. .SS "Experimental API" .PP The @@ -1501,6 +1637,10 @@ The \fBmallctl*\fR\fB\fR, and \fB*allocm\fR\fB\fR functions first appeared in FreeBSD 10\&.0\&. +.PP +The +\fB*allocx\fR\fB\fR +functions first appeared in FreeBSD 11\&.0\&. .SH "AUTHOR" .PP \fBJason Evans\fR Modified: projects/sendfile/contrib/jemalloc/include/jemalloc/internal/arena.h ============================================================================== --- projects/sendfile/contrib/jemalloc/include/jemalloc/internal/arena.h Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/include/jemalloc/internal/arena.h Fri Jan 24 13:36:41 2014 (r261119) @@ -158,6 +158,7 @@ struct arena_chunk_map_s { }; typedef rb_tree(arena_chunk_map_t) arena_avail_tree_t; typedef rb_tree(arena_chunk_map_t) arena_run_tree_t; +typedef ql_head(arena_chunk_map_t) arena_chunk_mapelms_t; /* Arena chunk header. */ struct arena_chunk_s { @@ -174,11 +175,12 @@ struct arena_chunk_s { size_t nruns_avail; /* - * Number of available run adjacencies. Clean and dirty available runs - * are not coalesced, which causes virtual memory fragmentation. The - * ratio of (nruns_avail-nruns_adjac):nruns_adjac is used for tracking - * this fragmentation. - * */ + * Number of available run adjacencies that purging could coalesce. + * Clean and dirty available runs are not coalesced, which causes + * virtual memory fragmentation. The ratio of + * (nruns_avail-nruns_adjac):nruns_adjac is used for tracking this + * fragmentation. + */ size_t nruns_adjac; /* @@ -404,7 +406,16 @@ void arena_tcache_fill_small(arena_t *ar size_t binind, uint64_t prof_accumbytes); void arena_alloc_junk_small(void *ptr, arena_bin_info_t *bin_info, bool zero); +#ifdef JEMALLOC_JET +typedef void (arena_redzone_corruption_t)(void *, size_t, bool, size_t, + uint8_t); +extern arena_redzone_corruption_t *arena_redzone_corruption; +typedef void (arena_dalloc_junk_small_t)(void *, arena_bin_info_t *); +extern arena_dalloc_junk_small_t *arena_dalloc_junk_small; +#else void arena_dalloc_junk_small(void *ptr, arena_bin_info_t *bin_info); +#endif +void arena_quarantine_junk_small(void *ptr, size_t usize); void *arena_malloc_small(arena_t *arena, size_t size, bool zero); void *arena_malloc_large(arena_t *arena, size_t size, bool zero); void *arena_palloc(arena_t *arena, size_t size, size_t alignment, bool zero); @@ -415,10 +426,18 @@ void arena_dalloc_bin(arena_t *arena, ar size_t pageind, arena_chunk_map_t *mapelm); void arena_dalloc_small(arena_t *arena, arena_chunk_t *chunk, void *ptr, size_t pageind); +#ifdef JEMALLOC_JET +typedef void (arena_dalloc_junk_large_t)(void *, size_t); +extern arena_dalloc_junk_large_t *arena_dalloc_junk_large; +#endif void arena_dalloc_large_locked(arena_t *arena, arena_chunk_t *chunk, void *ptr); void arena_dalloc_large(arena_t *arena, arena_chunk_t *chunk, void *ptr); -void *arena_ralloc_no_move(void *ptr, size_t oldsize, size_t size, +#ifdef JEMALLOC_JET +typedef void (arena_ralloc_junk_large_t)(void *, size_t, size_t); +extern arena_ralloc_junk_large_t *arena_ralloc_junk_large; +#endif +bool arena_ralloc_no_move(void *ptr, size_t oldsize, size_t size, size_t extra, bool zero); void *arena_ralloc(arena_t *arena, void *ptr, size_t oldsize, size_t size, size_t extra, size_t alignment, bool zero, bool try_tcache_alloc, @@ -473,7 +492,7 @@ size_t arena_bin_index(arena_t *arena, a unsigned arena_run_regind(arena_run_t *run, arena_bin_info_t *bin_info, const void *ptr); prof_ctx_t *arena_prof_ctx_get(const void *ptr); -void arena_prof_ctx_set(const void *ptr, prof_ctx_t *ctx); +void arena_prof_ctx_set(const void *ptr, size_t usize, prof_ctx_t *ctx); void *arena_malloc(arena_t *arena, size_t size, bool zero, bool try_tcache); size_t arena_salloc(const void *ptr, bool demote); void arena_dalloc(arena_t *arena, arena_chunk_t *chunk, void *ptr, @@ -885,10 +904,10 @@ arena_prof_ctx_get(const void *ptr) } JEMALLOC_INLINE void -arena_prof_ctx_set(const void *ptr, prof_ctx_t *ctx) +arena_prof_ctx_set(const void *ptr, size_t usize, prof_ctx_t *ctx) { arena_chunk_t *chunk; - size_t pageind, mapbits; + size_t pageind; cassert(config_prof); assert(ptr != NULL); @@ -896,10 +915,17 @@ arena_prof_ctx_set(const void *ptr, prof chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(ptr); pageind = ((uintptr_t)ptr - (uintptr_t)chunk) >> LG_PAGE; - mapbits = arena_mapbits_get(chunk, pageind); - assert((mapbits & CHUNK_MAP_ALLOCATED) != 0); - if ((mapbits & CHUNK_MAP_LARGE) == 0) { + assert(arena_mapbits_allocated_get(chunk, pageind) != 0); + + if (usize > SMALL_MAXCLASS || (prof_promote && + ((uintptr_t)ctx != (uintptr_t)1U || arena_mapbits_large_get(chunk, + pageind) != 0))) { + assert(arena_mapbits_large_get(chunk, pageind) != 0); + arena_mapp_get(chunk, pageind)->prof_ctx = ctx; + } else { + assert(arena_mapbits_large_get(chunk, pageind) == 0); if (prof_promote == false) { + size_t mapbits = arena_mapbits_get(chunk, pageind); arena_run_t *run = (arena_run_t *)((uintptr_t)chunk + (uintptr_t)((pageind - (mapbits >> LG_PAGE)) << LG_PAGE)); @@ -911,12 +937,11 @@ arena_prof_ctx_set(const void *ptr, prof bin_info = &arena_bin_info[binind]; regind = arena_run_regind(run, bin_info, ptr); - *((prof_ctx_t **)((uintptr_t)run + bin_info->ctx0_offset - + (regind * sizeof(prof_ctx_t *)))) = ctx; - } else - assert((uintptr_t)ctx == (uintptr_t)1U); - } else - arena_mapp_get(chunk, pageind)->prof_ctx = ctx; + *((prof_ctx_t **)((uintptr_t)run + + bin_info->ctx0_offset + (regind * sizeof(prof_ctx_t + *)))) = ctx; + } + } } JEMALLOC_ALWAYS_INLINE void * Modified: projects/sendfile/contrib/jemalloc/include/jemalloc/internal/chunk_dss.h ============================================================================== --- projects/sendfile/contrib/jemalloc/include/jemalloc/internal/chunk_dss.h Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/include/jemalloc/internal/chunk_dss.h Fri Jan 24 13:36:41 2014 (r261119) @@ -7,7 +7,7 @@ typedef enum { dss_prec_secondary = 2, dss_prec_limit = 3 -} dss_prec_t ; +} dss_prec_t; #define DSS_PREC_DEFAULT dss_prec_secondary #define DSS_DEFAULT "secondary" Modified: projects/sendfile/contrib/jemalloc/include/jemalloc/internal/ckh.h ============================================================================== --- projects/sendfile/contrib/jemalloc/include/jemalloc/internal/ckh.h Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/include/jemalloc/internal/ckh.h Fri Jan 24 13:36:41 2014 (r261119) @@ -17,7 +17,7 @@ typedef bool ckh_keycomp_t (const void * * There are 2^LG_CKH_BUCKET_CELLS cells in each hash table bucket. Try to fit * one bucket per L1 cache line. */ -#define LG_CKH_BUCKET_CELLS (LG_CACHELINE - LG_SIZEOF_PTR - 1) +#define LG_CKH_BUCKET_CELLS (LG_CACHELINE - LG_SIZEOF_PTR - 1) #endif /* JEMALLOC_H_TYPES */ /******************************************************************************/ Modified: projects/sendfile/contrib/jemalloc/include/jemalloc/internal/hash.h ============================================================================== --- projects/sendfile/contrib/jemalloc/include/jemalloc/internal/hash.h Fri Jan 24 09:17:29 2014 (r261118) +++ projects/sendfile/contrib/jemalloc/include/jemalloc/internal/hash.h Fri Jan 24 13:36:41 2014 (r261119) @@ -19,6 +19,11 @@ #ifdef JEMALLOC_H_INLINES #ifndef JEMALLOC_ENABLE_INLINE +uint32_t hash_x86_32(const void *key, int len, uint32_t seed); +void hash_x86_128(const void *key, const int len, uint32_t seed, + uint64_t r_out[2]); +void hash_x64_128(const void *key, const int len, const uint32_t seed, + uint64_t r_out[2]); void hash(const void *key, size_t len, const uint32_t seed, size_t r_hash[2]); #endif @@ -43,14 +48,14 @@ JEMALLOC_INLINE uint32_t hash_get_block_32(const uint32_t *p, int i) { - return p[i]; + return (p[i]); } JEMALLOC_INLINE uint64_t hash_get_block_64(const uint64_t *p, int i) { - return p[i]; + return (p[i]); } JEMALLOC_INLINE uint32_t @@ -63,7 +68,7 @@ hash_fmix_32(uint32_t h) h *= 0xc2b2ae35; h ^= h >> 16; - return h; + return (h); } JEMALLOC_INLINE uint64_t @@ -76,7 +81,7 @@ hash_fmix_64(uint64_t k) k *= QU(0xc4ceb9fe1a85ec53LLU); k ^= k >> 33; - return k; + return (k); } JEMALLOC_INLINE uint32_t @@ -127,12 +132,12 @@ hash_x86_32(const void *key, int len, ui h1 = hash_fmix_32(h1); - return h1; + return (h1); } UNUSED JEMALLOC_INLINE void hash_x86_128(const void *key, const int len, uint32_t seed, - uint64_t r_out[2]) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401241336.s0ODagFV047244>