Datasets:

parvezmrobin

/

MCMD

like 2

mmm a / tensorflow / compiler / xla / service / cpu_transfer_manager . cc <nl> ppp b / tensorflow / compiler / xla / service / cpu_transfer_manager . cc <nl> Status CpuTransferManager : : TransferLiteralToInfeed ( se : : StreamExecutor * executor , <nl> ShapeUtil : : HumanString ( literal . shape ( ) ) . c_str ( ) ) ; <nl> } <nl> <nl> - cpu : : runtime : : InfeedManager * infeed_manager = <nl> - cpu : : runtime : : GetInfeedManager ( ) ; <nl> - <nl> int64 size = GetByteSizeRequirement ( shape ) ; <nl> if ( size > std : : numeric_limits < int32 > : : max ( ) ) { <nl> return Unimplemented ( " Infeed shape is too large : % s needs % lld bytes " , <nl> ShapeUtil : : HumanString ( literal . shape ( ) ) . c_str ( ) , size ) ; <nl> } <nl> + <nl> + return TransferBufferToInfeed ( executor , size , <nl> + LiteralUtil : : InternalData ( literal ) ) ; <nl> + } <nl> + <nl> + Status CpuTransferManager : : TransferBufferToInfeed ( se : : StreamExecutor * executor , <nl> + int64 size , <nl> + const void * source ) { <nl> int32 size_32 = static_cast < int32 > ( size ) ; <nl> CpuInfeedBuffer * queued_buffer = new CpuInfeedBuffer ( size_32 ) ; <nl> - TF_RETURN_IF_ERROR ( TransferBufferToDevice ( <nl> - executor , / * size = * / size , / * source = * / LiteralUtil : : InternalData ( literal ) , <nl> - queued_buffer - > device_memory ( ) ) ) ; <nl> + TF_RETURN_IF_ERROR ( TransferBufferToDevice ( executor , / * size = * / size , <nl> + / * source = * / source , <nl> + queued_buffer - > device_memory ( ) ) ) ; <nl> <nl> + cpu : : runtime : : InfeedManager * infeed_manager = <nl> + cpu : : runtime : : GetInfeedManager ( ) ; <nl> infeed_manager - > EnqueueBuffer ( queued_buffer ) ; <nl> <nl> return Status : : OK ( ) ; <nl> mmm a / tensorflow / compiler / xla / service / cpu_transfer_manager . h <nl> ppp b / tensorflow / compiler / xla / service / cpu_transfer_manager . h <nl> class CpuTransferManager : public GenericTransferManager { <nl> <nl> Status TransferLiteralToInfeed ( perftools : : gputools : : StreamExecutor * executor , <nl> const Literal & literal ) override ; <nl> + Status TransferBufferToInfeed ( perftools : : gputools : : StreamExecutor * executor , <nl> + int64 size , const void * source ) override ; <nl> <nl> private : <nl> TF_DISALLOW_COPY_AND_ASSIGN ( CpuTransferManager ) ; <nl> mmm a / tensorflow / compiler / xla / service / generic_transfer_manager . cc <nl> ppp b / tensorflow / compiler / xla / service / generic_transfer_manager . cc <nl> Status GenericTransferManager : : TransferLiteralToDevice ( <nl> <nl> Status GenericTransferManager : : TransferLiteralToInfeed ( <nl> se : : StreamExecutor * executor , const Literal & literal ) { <nl> - return Unimplemented ( " Infeed is not supported on GPU ( b / 30467474 ) " ) ; <nl> + return Unimplemented ( " Generic transfer to Infeed " ) ; <nl> + } <nl> + <nl> + Status GenericTransferManager : : TransferBufferToInfeed ( <nl> + perftools : : gputools : : StreamExecutor * executor , int64 size , <nl> + const void * source ) { <nl> + return Unimplemented ( " Generic transfer to Infeed " ) ; <nl> } <nl> <nl> Status GenericTransferManager : : TransferLiteralFromOutfeed ( <nl> mmm a / tensorflow / compiler / xla / service / generic_transfer_manager . h <nl> ppp b / tensorflow / compiler / xla / service / generic_transfer_manager . h <nl> class GenericTransferManager : public TransferManager { <nl> <nl> Status TransferLiteralToInfeed ( perftools : : gputools : : StreamExecutor * executor , <nl> const Literal & literal ) override ; <nl> + Status TransferBufferToInfeed ( perftools : : gputools : : StreamExecutor * executor , <nl> + int64 size , const void * source ) override ; <nl> <nl> Status TransferLiteralFromOutfeed ( <nl> perftools : : gputools : : StreamExecutor * executor , const Shape & literal_shape , <nl> mmm a / tensorflow / compiler / xla / service / gpu_transfer_manager . cc <nl> ppp b / tensorflow / compiler / xla / service / gpu_transfer_manager . cc <nl> Status GpuTransferManager : : TransferLiteralToInfeed ( se : : StreamExecutor * executor , <nl> return Status : : OK ( ) ; <nl> } <nl> <nl> + Status GpuTransferManager : : TransferBufferToInfeed ( se : : StreamExecutor * executor , <nl> + int64 size , <nl> + const void * source ) { <nl> + return TransferBufferToInfeedInternal ( executor , size , source ) . status ( ) ; <nl> + } <nl> + <nl> StatusOr < gpu : : InfeedBuffer * > <nl> GpuTransferManager : : TransferLiteralToInfeedInternal ( <nl> se : : StreamExecutor * executor , const Literal & literal ) { <nl> GpuTransferManager : : TransferLiteralToInfeedInternal ( <nl> ShapeUtil : : HumanString ( literal . shape ( ) ) . c_str ( ) ) ; <nl> } <nl> <nl> + return TransferBufferToInfeedInternal ( executor , size , <nl> + LiteralUtil : : InternalData ( literal ) ) ; <nl> + } <nl> + <nl> + StatusOr < gpu : : InfeedBuffer * > GpuTransferManager : : TransferBufferToInfeedInternal ( <nl> + se : : StreamExecutor * executor , int64 size , const void * source ) { <nl> gpu : : InfeedManager * infeed_manager = gpu : : GetOrCreateInfeedManager ( ) ; <nl> se : : Stream * stream = infeed_manager - > GetStream ( executor ) ; <nl> if ( stream = = nullptr ) { <nl> GpuTransferManager : : TransferLiteralToInfeedInternal ( <nl> } <nl> <nl> gpu : : InfeedBuffer * buffer = new gpu : : InfeedBuffer ( executor , size ) ; <nl> - stream - > ThenMemcpy ( buffer - > device_memory ( ) , <nl> - LiteralUtil : : InternalData ( literal ) , size ) ; <nl> + stream - > ThenMemcpy ( buffer - > device_memory ( ) , source , size ) ; <nl> <nl> VLOG ( 2 ) < < " Queued infeed data on stream " < < stream ; <nl> <nl> mmm a / tensorflow / compiler / xla / service / gpu_transfer_manager . h <nl> ppp b / tensorflow / compiler / xla / service / gpu_transfer_manager . h <nl> class GpuTransferManager : public GenericTransferManager { <nl> <nl> Status TransferLiteralToInfeed ( perftools : : gputools : : StreamExecutor * executor , <nl> const Literal & literal ) override ; <nl> + Status TransferBufferToInfeed ( perftools : : gputools : : StreamExecutor * executor , <nl> + int64 size , const void * source ) override ; <nl> <nl> private : <nl> / / Internal helper function for TransferLiteralToInfeed ( ) . Input <nl> class GpuTransferManager : public GenericTransferManager { <nl> StatusOr < gpu : : InfeedBuffer * > TransferLiteralToInfeedInternal ( <nl> perftools : : gputools : : StreamExecutor * executor , const Literal & literal ) ; <nl> <nl> + / / Internal helper function for TransferLiteralToInfeed ( ) . <nl> + StatusOr < gpu : : InfeedBuffer * > TransferBufferToInfeedInternal ( <nl> + perftools : : gputools : : StreamExecutor * executor , int64 size , <nl> + const void * source ) ; <nl> + <nl> TF_DISALLOW_COPY_AND_ASSIGN ( GpuTransferManager ) ; <nl> } ; <nl> <nl> mmm a / tensorflow / compiler / xla / service / transfer_manager . h <nl> ppp b / tensorflow / compiler / xla / service / transfer_manager . h <nl> class TransferManager { <nl> perftools : : gputools : : StreamExecutor * executor , <nl> const Literal & literal ) = 0 ; <nl> <nl> + / / Transfer a memory block of the given size from ' source ' buffer to the <nl> + / / Infeed interface of the device using the given executor . <nl> + / / <nl> + / / size is the size to transfer from source in bytes . <nl> + / / <nl> + / / source is the source data that must be in the target - dependent layout that <nl> + / / the Infeed HLO used in the computation expects . <nl> + virtual Status TransferBufferToInfeed ( <nl> + perftools : : gputools : : StreamExecutor * executor , int64 size , <nl> + const void * source ) = 0 ; <nl> + <nl> / / Transfers the given literal from the Outfeed interface of the device , <nl> / / using the given executor . <nl> virtual Status TransferLiteralFromOutfeed ( <nl>

[ XLA ] Add transfer buffer to infeed .

tensorflow/tensorflow

b52debb4e63cce1e0733d6d34975d4efb9934680

2017-06-15T21:20:48Z

mmm a / scripts / filter_planning . sh <nl> ppp b / scripts / filter_planning . sh <nl> perception_topic = " topic = = ' / apollo / perception / obstacles ' \ <nl> perfect_control_topic = " $ perception_topic \ <nl> or $ routing_topic \ <nl> or topic = = ' / apollo / perception / obstacles ' \ <nl> + or topic = = ' / apollo / prediction ' \ <nl> or topic = = ' / apollo / perception / traffic_light ' " <nl> <nl> planning_deps = " $ perfect_control_topic \ <nl> for bag in $ @ ; do <nl> fi <nl> filter $ bag $ folder <nl> done <nl> - <nl>

script : add prediction topic into filter_planning . sh

ApolloAuto/apollo

e8cc84d98b81a8cc2158f36652cc67ce6aed4d38

2017-12-27T19:48:40Z

mmm a / include / LightGBM / bin . h <nl> ppp b / include / LightGBM / bin . h <nl> class BinMapper { <nl> / * ! <nl> * \ brief Get bin info <nl> * / <nl> - inline std : : string bin_info ( ) const { <nl> + inline std : : string bin_info_string ( ) const { <nl> if ( bin_type_ = = BinType : : CategoricalBin ) { <nl> return Common : : Join ( bin_2_categorical_ , " : " ) ; <nl> } else { <nl> mmm a / include / LightGBM / dataset . h <nl> ppp b / include / LightGBM / dataset . h <nl> class Dataset { <nl> <nl> inline std : : vector < std : : string > feature_infos ( ) const { <nl> std : : vector < std : : string > bufs ; <nl> - for ( int i = 0 ; i < num_total_features_ ; i + + ) { <nl> + for ( int i = 0 ; i < num_total_features_ ; + + i ) { <nl> int fidx = used_feature_map_ [ i ] ; <nl> - if ( fidx = = - 1 ) { <nl> + if ( fidx < 0 ) { <nl> bufs . push_back ( " none " ) ; <nl> } else { <nl> const auto bin_mapper = FeatureBinMapper ( fidx ) ; <nl> - bufs . push_back ( bin_mapper - > bin_info ( ) ) ; <nl> + bufs . push_back ( bin_mapper - > bin_info_string ( ) ) ; <nl> } <nl> } <nl> return bufs ; <nl> mmm a / include / LightGBM / utils / array_args . h <nl> ppp b / include / LightGBM / utils / array_args . h <nl> class ArrayArgs { <nl> } / / namespace LightGBM <nl> <nl> # endif / / LightGBM_UTILS_ARRAY_AGRS_H_ <nl> - <nl> mmm a / src / boosting / gbdt_model_text . cpp <nl> ppp b / src / boosting / gbdt_model_text . cpp <nl> <nl> # include < LightGBM / config . h > <nl> # include < LightGBM / metric . h > <nl> # include < LightGBM / objective_function . h > <nl> + # include < LightGBM / utils / array_args . h > <nl> # include < LightGBM / utils / common . h > <nl> <nl> # include < string > <nl> std : : string GBDT : : DumpModel ( int start_iteration , int num_iteration ) const { <nl> str_buf < < " \ " monotone_constraints \ " : [ " <nl> < < Common : : Join ( monotone_constraints_ , " , " ) < < " ] , " < < ' \ n ' ; <nl> <nl> + str_buf < < " \ " feature_infos \ " : " < < " { " ; <nl> + bool first_obj = true ; <nl> + for ( size_t i = 0 ; i < feature_infos_ . size ( ) ; + + i ) { <nl> + std : : stringstream json_str_buf ; <nl> + auto strs = Common : : Split ( feature_infos_ [ i ] . c_str ( ) , " : " ) ; <nl> + if ( strs [ 0 ] [ 0 ] = = ' [ ' ) { <nl> + strs [ 0 ] . erase ( 0 , 1 ) ; / / remove ' [ ' <nl> + strs [ 1 ] . erase ( strs [ 1 ] . size ( ) - 1 ) ; / / remove ' ] ' <nl> + json_str_buf < < " { \ " min_value \ " : " < < strs [ 0 ] < < " , " ; <nl> + json_str_buf < < " \ " max_value \ " : " < < strs [ 1 ] < < " , " ; <nl> + json_str_buf < < " \ " values \ " : [ ] } " ; <nl> + } else if ( strs [ 0 ] ! = " none " ) { / / categorical feature <nl> + auto vals = Common : : StringToArray < int > ( feature_infos_ [ i ] , ' : ' ) ; <nl> + auto max_idx = ArrayArgs < int > : : ArgMax ( vals ) ; <nl> + auto min_idx = ArrayArgs < int > : : ArgMin ( vals ) ; <nl> + json_str_buf < < " { \ " min_value \ " : " < < vals [ min_idx ] < < " , " ; <nl> + json_str_buf < < " \ " max_value \ " : " < < vals [ max_idx ] < < " , " ; <nl> + json_str_buf < < " \ " values \ " : [ " < < Common : : Join ( vals , " , " ) < < " ] } " ; <nl> + } else { / / unused feature <nl> + continue ; <nl> + } <nl> + if ( ! first_obj ) { <nl> + str_buf < < " , " ; <nl> + } <nl> + str_buf < < " \ " " < < feature_names_ [ i ] < < " \ " : " ; <nl> + str_buf < < json_str_buf . str ( ) ; <nl> + first_obj = false ; <nl> + } <nl> + str_buf < < " } , " < < ' \ n ' ; <nl> + <nl> str_buf < < " \ " tree_info \ " : [ " ; <nl> int num_used_model = static_cast < int > ( models_ . size ( ) ) ; <nl> int total_iteration = num_used_model / num_tree_per_iteration_ ; <nl> std : : string GBDT : : DumpModel ( int start_iteration , int num_iteration ) const { <nl> } <nl> } <nl> str_buf < < ' \ n ' < < " \ " feature_importances \ " : " < < " { " ; <nl> - if ( ! pairs . empty ( ) ) { <nl> - str_buf < < " \ " " < < pairs [ 0 ] . second < < " \ " : " < < std : : to_string ( pairs [ 0 ] . first ) ; <nl> - for ( size_t i = 1 ; i < pairs . size ( ) ; + + i ) { <nl> + for ( size_t i = 0 ; i < pairs . size ( ) ; + + i ) { <nl> + if ( i > 0 ) { <nl> str_buf < < " , " ; <nl> - str_buf < < " \ " " < < pairs [ i ] . second < < " \ " : " < < std : : to_string ( pairs [ i ] . first ) ; <nl> } <nl> + str_buf < < " \ " " < < pairs [ i ] . second < < " \ " : " < < std : : to_string ( pairs [ i ] . first ) ; <nl> } <nl> str_buf < < " } " < < ' \ n ' ; <nl> <nl>

added feature infos to JSON dump ( )

microsoft/LightGBM

c4a7ab81702d0119de55d74f9d848f62435f3a1d

2020-02-20T05:51:05Z

mmm a / tensorflow / tools / compatibility / ast_edits . py <nl> ppp b / tensorflow / tools / compatibility / ast_edits . py <nl> class APIChangeSpec ( object ) : <nl> * ` function_warnings ` : maps full names of functions to warnings that will be <nl> printed out if the function is used . ( e . g . tf . nn . convolution ( ) ) <nl> * ` function_transformers ` : maps function names to custom handlers <nl> - * ` leftover_warnings ` : These warnings are printed if a matching Attribute <nl> - still exists after all other transformations have run . <nl> + * ` module_deprecations ` : maps module names to warnings that will be printed <nl> + if the module is still used after all other transformations have run <nl> <nl> For an example , see ` TFAPIChangeSpec ` . <nl> " " " <nl> mmm a / tensorflow / tools / compatibility / tf_upgrade_v2 . py <nl> ppp b / tensorflow / tools / compatibility / tf_upgrade_v2 . py <nl> def __init__ ( self ) : <nl> " the required code . " <nl> ) <nl> <nl> + flags_warning = ( <nl> + ast_edits . ERROR , <nl> + " tf . flags has been removed , please use the argparse or absl " <nl> + " modules if you need command line parsing . " ) <nl> + <nl> decay_function_comment = ( <nl> ast_edits . INFO , <nl> " To use learning rate decay schedules with TensorFlow 2 . 0 , switch to " <nl> def __init__ ( self ) : <nl> assert_rank_comment , <nl> " tf . debugging . assert_rank_in " : <nl> assert_rank_comment , <nl> - " tf . flags " : ( <nl> - ast_edits . ERROR , <nl> - " tf . flags has been removed , please use the argparse or absl " <nl> - " modules if you need command line parsing . " ) , <nl> " tf . train . exponential_decay " : <nl> decay_function_comment , <nl> " tf . train . piecewise_constant_decay " : <nl> def __init__ ( self ) : <nl> <nl> self . module_deprecations = { <nl> " tf . contrib " : contrib_warning , <nl> + " tf . flags " : flags_warning , <nl> } <nl> <nl> <nl> mmm a / tensorflow / tools / compatibility / tf_upgrade_v2_test . py <nl> ppp b / tensorflow / tools / compatibility / tf_upgrade_v2_test . py <nl> def test_contrib_framework_argsort ( self ) : <nl> _ , _ , _ , new_text = self . _upgrade ( text ) <nl> self . assertEqual ( expected , new_text ) <nl> <nl> + def test_flags_bare ( self ) : <nl> + _ , _ , errors , _ = self . _upgrade ( " tf . flags " ) <nl> + self . assertIn ( " tf . flags has been removed " , errors [ 0 ] ) <nl> + <nl> + def test_flags_flags ( self ) : <nl> + _ , _ , errors , _ = self . _upgrade ( " tf . flags . FLAGS " ) <nl> + self . assertIn ( " tf . flags has been removed " , errors [ 0 ] ) <nl> + <nl> <nl> class TestUpgradeFiles ( test_util . TensorFlowTestCase ) : <nl> <nl>

Make converter handle tf . flags as a module deprecation warning

tensorflow/tensorflow

f291fa19e7d9a3e73c7895a073a6acbf2dd7e15d

2019-02-01T20:14:25Z

mmm a / modules / gdscript / gdscript_parser . cpp <nl> ppp b / modules / gdscript / gdscript_parser . cpp <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> member . line = tokenizer - > get_token_line ( ) ; <nl> member . usages = 0 ; <nl> member . rpc_mode = rpc_mode ; <nl> - # ifdef TOOLS_ENABLED <nl> - Variant : : CallError ce ; <nl> - member . default_value = Variant : : construct ( member . _export . type , NULL , 0 , ce ) ; <nl> - # endif <nl> <nl> if ( current_class - > constant_expressions . has ( member . identifier ) ) { <nl> _set_error ( " A constant named \ " " + String ( member . identifier ) + " \ " already exists in this class ( at line : " + <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> } <nl> } <nl> <nl> + if ( autoexport & & member . data_type . has_type ) { <nl> + if ( member . data_type . kind = = DataType : : BUILTIN ) { <nl> + member . _export . type = member . data_type . builtin_type ; <nl> + } else if ( member . data_type . kind = = DataType : : NATIVE ) { <nl> + if ( ClassDB : : is_parent_class ( member . data_type . native_type , " Resource " ) ) { <nl> + member . _export . type = Variant : : OBJECT ; <nl> + member . _export . hint = PROPERTY_HINT_RESOURCE_TYPE ; <nl> + member . _export . usage | = PROPERTY_USAGE_SCRIPT_VARIABLE ; <nl> + member . _export . hint_string = member . data_type . native_type ; <nl> + member . _export . class_name = member . data_type . native_type ; <nl> + } else { <nl> + _set_error ( " Invalid export type . Only built - in and native resource types can be exported . " , member . line ) ; <nl> + return ; <nl> + } <nl> + <nl> + } else { <nl> + _set_error ( " Invalid export type . Only built - in and native resource types can be exported . " , member . line ) ; <nl> + return ; <nl> + } <nl> + } <nl> + <nl> + # ifdef TOOLS_ENABLED <nl> + Variant : : CallError ce ; <nl> + member . default_value = Variant : : construct ( member . _export . type , NULL , 0 , ce ) ; <nl> + # endif <nl> + <nl> if ( tokenizer - > get_token ( ) = = GDScriptTokenizer : : TK_OP_ASSIGN ) { <nl> <nl> # ifdef DEBUG_ENABLED <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> member . initial_assignment = op ; <nl> } <nl> <nl> - if ( autoexport & & member . data_type . has_type ) { <nl> - if ( member . data_type . kind = = DataType : : BUILTIN ) { <nl> - member . _export . type = member . data_type . builtin_type ; <nl> - } else if ( member . data_type . kind = = DataType : : NATIVE ) { <nl> - if ( ClassDB : : is_parent_class ( member . data_type . native_type , " Resource " ) ) { <nl> - member . _export . type = Variant : : OBJECT ; <nl> - member . _export . hint = PROPERTY_HINT_RESOURCE_TYPE ; <nl> - member . _export . usage | = PROPERTY_USAGE_SCRIPT_VARIABLE ; <nl> - member . _export . hint_string = member . data_type . native_type ; <nl> - member . _export . class_name = member . data_type . native_type ; <nl> - } else { <nl> - _set_error ( " Invalid export type . Only built - in and native resource types can be exported . " , member . line ) ; <nl> - return ; <nl> - } <nl> - <nl> - } else { <nl> - _set_error ( " Invalid export type . Only built - in and native resource types can be exported . " , member . line ) ; <nl> - return ; <nl> - } <nl> - } <nl> - <nl> if ( tokenizer - > get_token ( ) = = GDScriptTokenizer : : TK_PR_SETGET ) { <nl> <nl> tokenizer - > advance ( ) ; <nl>

Merge pull request from bojidar - bg / 27575 - poolarrayexport - default

godotengine/godot

9986f3804caf32dc092ac7f094381745dc3ae8f8

2020-01-16T13:58:06Z

mmm a / torch / _torch_docs . py <nl> ppp b / torch / _torch_docs . py <nl> def merge_dicts ( * dicts ) : <nl> See : meth : ` ~ torch . svd ` for more details . <nl> <nl> Arguments : <nl> - input ( Tensor ) : The input 2D tensor of dimensions : math : ` m \ times n ` <nl> + input ( Tensor ) : The input tensor of size : math : ` ( * , m , n ) ` where : math : ` * ` is zero or more batch dimensions <nl> rcond ( float ) : A floating point value to determine the cutoff for small singular values . <nl> Default : 1e - 15 <nl> <nl> Returns : <nl> - The pseudo - inverse of : attr : ` input ` of dimensions : math : ` n \ times m ` <nl> + The pseudo - inverse of : attr : ` input ` of dimensions : math : ` ( * , n , m ) ` <nl> <nl> Example : : <nl> <nl> def merge_dicts ( * dicts ) : <nl> [ - 0 . 7124 , - 0 . 1631 , - 0 . 2272 ] , <nl> [ 0 . 1356 , 0 . 3933 , - 0 . 5023 ] , <nl> [ - 0 . 0308 , - 0 . 1725 , - 0 . 5216 ] ] ) <nl> + > > > # Batched pinverse example <nl> + > > > a = torch . randn ( 2 , 6 , 3 ) <nl> + > > > b = torch . pinverse ( a ) <nl> + > > > torch . matmul ( b , a ) <nl> + tensor ( [ [ [ 1 . 0000e + 00 , 1 . 6391e - 07 , - 1 . 1548e - 07 ] , <nl> + [ 8 . 3121e - 08 , 1 . 0000e + 00 , - 2 . 7567e - 07 ] , <nl> + [ 3 . 5390e - 08 , 1 . 4901e - 08 , 1 . 0000e + 00 ] ] , <nl> + <nl> + [ [ 1 . 0000e + 00 , - 8 . 9407e - 08 , 2 . 9802e - 08 ] , <nl> + [ - 2 . 2352e - 07 , 1 . 0000e + 00 , 1 . 1921e - 07 ] , <nl> + [ 0 . 0000e + 00 , 8 . 9407e - 08 , 1 . 0000e + 00 ] ] ] ) <nl> <nl> . . _Moore - Penrose inverse : https : / / en . wikipedia . org / wiki / Moore % E2 % 80 % 93Penrose_inverse <nl> <nl>

Update pinverse doc for recent commit

pytorch/pytorch

1dcf1b8938fa0cf70373fb84a853c51517db46cc

2019-10-31T14:36:35Z

mmm a / Docker / Dockerfile <nl> ppp b / Docker / Dockerfile <nl> RUN git clone - b $ branch https : / / github . com / EOSIO / eos . git - - recursive \ <nl> & & cd eos & & echo " $ branch : $ ( git rev - parse HEAD ) " > / etc / eosio - version \ <nl> & & cmake - H . - B " / tmp / build " - GNinja - DCMAKE_BUILD_TYPE = Release - DWASM_ROOT = / opt / wasm - DCMAKE_CXX_COMPILER = clang + + \ <nl> - DCMAKE_C_COMPILER = clang - DCMAKE_INSTALL_PREFIX = / tmp / build - DSecp256k1_ROOT_DIR = / usr / local - DBUILD_MONGO_DB_PLUGIN = true \ <nl> - & & cmake - - build / tmp / build - - target install <nl> + & & cmake - - build / tmp / build - - target install & & rm / tmp / build / bin / eosiocpp <nl> <nl> <nl> FROM ubuntu : 18 . 04 <nl>

remove eosiocpp from eosio / eos

EOSIO/eos

d3c78bc1e6bb3d7f4c114a4008bdb459656d88cf

2018-05-17T16:52:19Z

mmm a / include / gmock / gmock - matchers . h <nl> ppp b / include / gmock / gmock - matchers . h <nl> class GTEST_API_ Matcher < internal : : string > <nl> Matcher ( const char * s ) ; / / NOLINT <nl> } ; <nl> <nl> + # if GTEST_HAS_STRING_PIECE_ <nl> + / / The following two specializations allow the user to write str <nl> + / / instead of Eq ( str ) and " foo " instead of Eq ( " foo " ) when a StringPiece <nl> + / / matcher is expected . <nl> + template < > <nl> + class GTEST_API_ Matcher < const StringPiece & > <nl> + : public internal : : MatcherBase < const StringPiece & > { <nl> + public : <nl> + Matcher ( ) { } <nl> + <nl> + explicit Matcher ( const MatcherInterface < const StringPiece & > * impl ) <nl> + : internal : : MatcherBase < const StringPiece & > ( impl ) { } <nl> + <nl> + / / Allows the user to write str instead of Eq ( str ) sometimes , where <nl> + / / str is a string object . <nl> + Matcher ( const internal : : string & s ) ; / / NOLINT <nl> + <nl> + / / Allows the user to write " foo " instead of Eq ( " foo " ) sometimes . <nl> + Matcher ( const char * s ) ; / / NOLINT <nl> + <nl> + / / Allows the user to pass StringPieces directly . <nl> + Matcher ( StringPiece s ) ; / / NOLINT <nl> + } ; <nl> + <nl> + template < > <nl> + class GTEST_API_ Matcher < StringPiece > <nl> + : public internal : : MatcherBase < StringPiece > { <nl> + public : <nl> + Matcher ( ) { } <nl> + <nl> + explicit Matcher ( const MatcherInterface < StringPiece > * impl ) <nl> + : internal : : MatcherBase < StringPiece > ( impl ) { } <nl> + <nl> + / / Allows the user to write str instead of Eq ( str ) sometimes , where <nl> + / / str is a string object . <nl> + Matcher ( const internal : : string & s ) ; / / NOLINT <nl> + <nl> + / / Allows the user to write " foo " instead of Eq ( " foo " ) sometimes . <nl> + Matcher ( const char * s ) ; / / NOLINT <nl> + <nl> + / / Allows the user to pass StringPieces directly . <nl> + Matcher ( StringPiece s ) ; / / NOLINT <nl> + } ; <nl> + # endif / / GTEST_HAS_STRING_PIECE_ <nl> + <nl> / / The PolymorphicMatcher class template makes it easy to implement a <nl> / / polymorphic matcher ( i . e . a matcher that can match values of more <nl> / / than one type , e . g . Eq ( n ) and NotNull ( ) ) . <nl> mmm a / src / gmock - matchers . cc <nl> ppp b / src / gmock - matchers . cc <nl> Matcher < internal : : string > : : Matcher ( const char * s ) { <nl> * this = Eq ( internal : : string ( s ) ) ; <nl> } <nl> <nl> + # if GTEST_HAS_STRING_PIECE_ <nl> + / / Constructs a matcher that matches a const StringPiece & whose value is <nl> + / / equal to s . <nl> + Matcher < const StringPiece & > : : Matcher ( const internal : : string & s ) { <nl> + * this = Eq ( s ) ; <nl> + } <nl> + <nl> + / / Constructs a matcher that matches a const StringPiece & whose value is <nl> + / / equal to s . <nl> + Matcher < const StringPiece & > : : Matcher ( const char * s ) { <nl> + * this = Eq ( internal : : string ( s ) ) ; <nl> + } <nl> + <nl> + / / Constructs a matcher that matches a const StringPiece & whose value is <nl> + / / equal to s . <nl> + Matcher < const StringPiece & > : : Matcher ( StringPiece s ) { <nl> + * this = Eq ( s . ToString ( ) ) ; <nl> + } <nl> + <nl> + / / Constructs a matcher that matches a StringPiece whose value is equal to s . <nl> + Matcher < StringPiece > : : Matcher ( const internal : : string & s ) { <nl> + * this = Eq ( s ) ; <nl> + } <nl> + <nl> + / / Constructs a matcher that matches a StringPiece whose value is equal to s . <nl> + Matcher < StringPiece > : : Matcher ( const char * s ) { <nl> + * this = Eq ( internal : : string ( s ) ) ; <nl> + } <nl> + <nl> + / / Constructs a matcher that matches a StringPiece whose value is equal to s . <nl> + Matcher < StringPiece > : : Matcher ( StringPiece s ) { <nl> + * this = Eq ( s . ToString ( ) ) ; <nl> + } <nl> + # endif / / GTEST_HAS_STRING_PIECE_ <nl> + <nl> namespace internal { <nl> <nl> / / Joins a vector of strings as if they are fields of a tuple ; returns <nl> mmm a / test / gmock - matchers_test . cc <nl> ppp b / test / gmock - matchers_test . cc <nl> TEST ( StringMatcherTest , CanBeImplicitlyConstructedFromString ) { <nl> EXPECT_FALSE ( m2 . Matches ( " hello " ) ) ; <nl> } <nl> <nl> + # if GTEST_HAS_STRING_PIECE_ <nl> + / / Tests that a C - string literal can be implicitly converted to a <nl> + / / Matcher < StringPiece > or Matcher < const StringPiece & > . <nl> + TEST ( StringPieceMatcherTest , CanBeImplicitlyConstructedFromCStringLiteral ) { <nl> + Matcher < StringPiece > m1 = " cats " ; <nl> + EXPECT_TRUE ( m1 . Matches ( " cats " ) ) ; <nl> + EXPECT_FALSE ( m1 . Matches ( " dogs " ) ) ; <nl> + <nl> + Matcher < const StringPiece & > m2 = " cats " ; <nl> + EXPECT_TRUE ( m2 . Matches ( " cats " ) ) ; <nl> + EXPECT_FALSE ( m2 . Matches ( " dogs " ) ) ; <nl> + } <nl> + <nl> + / / Tests that a string object can be implicitly converted to a <nl> + / / Matcher < StringPiece > or Matcher < const StringPiece & > . <nl> + TEST ( StringPieceMatcherTest , CanBeImplicitlyConstructedFromString ) { <nl> + Matcher < StringPiece > m1 = string ( " cats " ) ; <nl> + EXPECT_TRUE ( m1 . Matches ( " cats " ) ) ; <nl> + EXPECT_FALSE ( m1 . Matches ( " dogs " ) ) ; <nl> + <nl> + Matcher < const StringPiece & > m2 = string ( " cats " ) ; <nl> + EXPECT_TRUE ( m2 . Matches ( " cats " ) ) ; <nl> + EXPECT_FALSE ( m2 . Matches ( " dogs " ) ) ; <nl> + } <nl> + <nl> + / / Tests that a StringPiece object can be implicitly converted to a <nl> + / / Matcher < StringPiece > or Matcher < const StringPiece & > . <nl> + TEST ( StringPieceMatcherTest , CanBeImplicitlyConstructedFromStringPiece ) { <nl> + Matcher < StringPiece > m1 = StringPiece ( " cats " ) ; <nl> + EXPECT_TRUE ( m1 . Matches ( " cats " ) ) ; <nl> + EXPECT_FALSE ( m1 . Matches ( " dogs " ) ) ; <nl> + <nl> + Matcher < const StringPiece & > m2 = StringPiece ( " cats " ) ; <nl> + EXPECT_TRUE ( m2 . Matches ( " cats " ) ) ; <nl> + EXPECT_FALSE ( m2 . Matches ( " dogs " ) ) ; <nl> + } <nl> + # endif / / GTEST_HAS_STRING_PIECE_ <nl> + <nl> / / Tests that MakeMatcher ( ) constructs a Matcher < T > from a <nl> / / MatcherInterface * without requiring the user to explicitly <nl> / / write the type . <nl>

Adds special support for matching StringPiece . Pulls in gtest r646 .

google/googletest

1f122a06e6aad4d234123d2d8c1e352029ce0742

2013-03-25T16:27:03Z

mmm a / tensorflow / compiler / jit / xla_device_context . cc <nl> ppp b / tensorflow / compiler / jit / xla_device_context . cc <nl> void XlaDeviceAllocator : : DeallocateRaw ( void * ptr ) { <nl> delete XlaTensor : : FromOpaquePointer ( ptr ) ; <nl> } <nl> <nl> - AllocatorStats XlaDeviceAllocator : : GetStats ( ) { <nl> - stream_executor : : AllocatorStats se_stats = <nl> + absl : : optional < AllocatorStats > XlaDeviceAllocator : : GetStats ( ) { <nl> + absl : : optional < stream_executor : : AllocatorStats > se_stats = <nl> stream_executor_ - > GetAllocatorStats ( ) ; <nl> + if ( ! se_stats ) { <nl> + return absl : : nullopt ; <nl> + } <nl> <nl> tensorflow : : AllocatorStats tf_stats ; <nl> - tf_stats . num_allocs = se_stats . num_allocs ; <nl> - tf_stats . bytes_in_use = se_stats . bytes_in_use ; <nl> - tf_stats . peak_bytes_in_use = se_stats . peak_bytes_in_use ; <nl> - tf_stats . largest_alloc_size = se_stats . largest_alloc_size ; <nl> - tf_stats . bytes_limit = se_stats . bytes_limit ; <nl> + tf_stats . num_allocs = se_stats - > num_allocs ; <nl> + tf_stats . bytes_in_use = se_stats - > bytes_in_use ; <nl> + tf_stats . peak_bytes_in_use = se_stats - > peak_bytes_in_use ; <nl> + tf_stats . largest_alloc_size = se_stats - > largest_alloc_size ; <nl> + tf_stats . bytes_limit = se_stats - > bytes_limit ; <nl> return tf_stats ; <nl> } <nl> <nl> mmm a / tensorflow / compiler / jit / xla_device_context . h <nl> ppp b / tensorflow / compiler / jit / xla_device_context . h <nl> class XlaDeviceAllocator : public Allocator { <nl> <nl> void * AllocateRaw ( size_t alignment , size_t num_bytes ) override ; <nl> void DeallocateRaw ( void * ptr ) override ; <nl> - AllocatorStats GetStats ( ) override ; <nl> + absl : : optional < AllocatorStats > GetStats ( ) override ; <nl> <nl> private : <nl> / / The stream executor of the device . <nl> mmm a / tensorflow / contrib / memory_stats / kernels / memory_stats_ops . cc <nl> ppp b / tensorflow / contrib / memory_stats / kernels / memory_stats_ops . cc <nl> class MemoryStatsOp : public OpKernel { <nl> void Compute ( OpKernelContext * context ) override { <nl> Allocator * allocator = <nl> context - > device ( ) - > GetAllocator ( AllocatorAttributes ( ) ) ; <nl> - AllocatorStats allocator_stats = allocator - > GetStats ( ) ; <nl> + absl : : optional < AllocatorStats > allocator_stats = allocator - > GetStats ( ) ; <nl> + if ( ! allocator_stats ) { <nl> + * allocator_stats = AllocatorStats ( ) ; <nl> + } <nl> <nl> Tensor * output_tensor = nullptr ; <nl> OP_REQUIRES_OK ( <nl> context , context - > allocate_output ( 0 , TensorShape ( { } ) , & output_tensor ) ) ; <nl> - output_tensor - > scalar < int64 > ( ) ( ) = ExtractAllocatorStats ( allocator_stats ) ; <nl> + output_tensor - > scalar < int64 > ( ) ( ) = ExtractAllocatorStats ( * allocator_stats ) ; <nl> } <nl> <nl> protected : <nl> class BytesLimitOp : public MemoryStatsOp { <nl> private : <nl> int64 ExtractAllocatorStats ( <nl> const AllocatorStats & allocator_stats ) const override { <nl> - return allocator_stats . bytes_limit ; <nl> + return allocator_stats . bytes_limit ? * allocator_stats . bytes_limit : - 1 ; <nl> } <nl> } ; <nl> <nl> mmm a / tensorflow / core / common_runtime / bfc_allocator . cc <nl> ppp b / tensorflow / core / common_runtime / bfc_allocator . cc <nl> void BFCAllocator : : DumpMemoryLog ( size_t num_bytes ) { <nl> LOG ( INFO ) < < " Stats : \ n " < < stats_ . DebugString ( ) ; <nl> } <nl> <nl> - AllocatorStats BFCAllocator : : GetStats ( ) { <nl> + absl : : optional < AllocatorStats > BFCAllocator : : GetStats ( ) { <nl> mutex_lock l ( lock_ ) ; <nl> return stats_ ; <nl> } <nl> mmm a / tensorflow / core / common_runtime / bfc_allocator . h <nl> ppp b / tensorflow / core / common_runtime / bfc_allocator . h <nl> class BFCAllocator : public Allocator { <nl> <nl> int64 AllocationId ( const void * ptr ) override ; <nl> <nl> - AllocatorStats GetStats ( ) override ; <nl> + absl : : optional < AllocatorStats > GetStats ( ) override ; <nl> <nl> void ClearStats ( ) override ; <nl> <nl> mmm a / tensorflow / core / common_runtime / eager / kernel_and_device . cc <nl> ppp b / tensorflow / core / common_runtime / eager / kernel_and_device . cc <nl> void UpdateStats ( OpKernelContext * context , <nl> memory - > set_peak_bytes ( std : : get < 1 > ( sizes ) ) ; <nl> memory - > set_live_bytes ( std : : get < 2 > ( sizes ) ) ; <nl> <nl> - AllocatorStats allocator_stats = allocator_pair . first - > GetStats ( ) ; <nl> - memory - > set_allocator_bytes_in_use ( allocator_stats . bytes_in_use ) ; <nl> + absl : : optional < AllocatorStats > allocator_stats = <nl> + allocator_pair . first - > GetStats ( ) ; <nl> + if ( stats ) { <nl> + memory - > set_allocator_bytes_in_use ( allocator_stats - > bytes_in_use ) ; <nl> + } <nl> allocator_pair . second - > GetRecordsAndUnRef ( ) ; <nl> } <nl> auto * ms = stats - > mutable_memory_stats ( ) ; <nl> mmm a / tensorflow / core / common_runtime / gpu / gpu_bfc_allocator_test . cc <nl> ppp b / tensorflow / core / common_runtime / gpu / gpu_bfc_allocator_test . cc <nl> namespace { <nl> <nl> static void CheckStats ( Allocator * a , int64 num_allocs , int64 bytes_in_use , <nl> int64 peak_bytes_in_use , int64 largest_alloc_size ) { <nl> - AllocatorStats stats = a - > GetStats ( ) ; <nl> - LOG ( INFO ) < < " Alloc stats : " < < std : : endl < < stats . DebugString ( ) ; <nl> - EXPECT_EQ ( stats . bytes_in_use , bytes_in_use ) ; <nl> - EXPECT_EQ ( stats . peak_bytes_in_use , peak_bytes_in_use ) ; <nl> - EXPECT_EQ ( stats . num_allocs , num_allocs ) ; <nl> - EXPECT_EQ ( stats . largest_alloc_size , largest_alloc_size ) ; <nl> + absl : : optional < AllocatorStats > stats = a - > GetStats ( ) ; <nl> + EXPECT_TRUE ( stats ) ; <nl> + if ( ! stats ) { <nl> + return ; <nl> + } <nl> + LOG ( INFO ) < < " Alloc stats : " < < std : : endl < < stats - > DebugString ( ) ; <nl> + EXPECT_EQ ( stats - > bytes_in_use , bytes_in_use ) ; <nl> + EXPECT_EQ ( stats - > peak_bytes_in_use , peak_bytes_in_use ) ; <nl> + EXPECT_EQ ( stats - > num_allocs , num_allocs ) ; <nl> + EXPECT_EQ ( stats - > largest_alloc_size , largest_alloc_size ) ; <nl> } <nl> <nl> TEST ( GPUBFCAllocatorTest , NoDups ) { <nl> TEST ( GPUBFCAllocatorTest , AllocationsAndDeallocationsWithGrowth ) { <nl> a . DeallocateRaw ( existing_ptrs [ i ] ) ; <nl> } <nl> <nl> - AllocatorStats stats = a . GetStats ( ) ; <nl> - LOG ( INFO ) < < " Alloc stats : \ n " < < stats . DebugString ( ) ; <nl> + absl : : optional < AllocatorStats > stats = a . GetStats ( ) ; <nl> + if ( stats ) { <nl> + LOG ( INFO ) < < " Alloc stats : \ n " < < stats - > DebugString ( ) ; <nl> + } <nl> } <nl> <nl> TEST ( GPUBFCAllocatorTest , DISABLED_AllocatorReceivesZeroMemory ) { <nl> mmm a / tensorflow / core / common_runtime / gpu / gpu_debug_allocator . cc <nl> ppp b / tensorflow / core / common_runtime / gpu / gpu_debug_allocator . cc <nl> int64 GPUDebugAllocator : : AllocationId ( const void * ptr ) { <nl> MASK_BYTES ) ; <nl> } <nl> <nl> - AllocatorStats GPUDebugAllocator : : GetStats ( ) { <nl> + absl : : optional < AllocatorStats > GPUDebugAllocator : : GetStats ( ) { <nl> return base_allocator_ - > GetStats ( ) ; <nl> } <nl> <nl> size_t GPUNanResetAllocator : : AllocatedSize ( const void * ptr ) { <nl> return base_allocator_ - > AllocatedSize ( ptr ) ; <nl> } <nl> <nl> - AllocatorStats GPUNanResetAllocator : : GetStats ( ) { <nl> + absl : : optional < AllocatorStats > GPUNanResetAllocator : : GetStats ( ) { <nl> return base_allocator_ - > GetStats ( ) ; <nl> } <nl> <nl> mmm a / tensorflow / core / common_runtime / gpu / gpu_debug_allocator . h <nl> ppp b / tensorflow / core / common_runtime / gpu / gpu_debug_allocator . h <nl> class GPUDebugAllocator : public Allocator { <nl> size_t RequestedSize ( const void * ptr ) override ; <nl> size_t AllocatedSize ( const void * ptr ) override ; <nl> int64 AllocationId ( const void * ptr ) override ; <nl> - AllocatorStats GetStats ( ) override ; <nl> + absl : : optional < AllocatorStats > GetStats ( ) override ; <nl> void ClearStats ( ) override ; <nl> <nl> / / For testing . <nl> class GPUNanResetAllocator : public Allocator { <nl> void DeallocateRaw ( void * ptr ) override ; <nl> size_t RequestedSize ( const void * ptr ) override ; <nl> size_t AllocatedSize ( const void * ptr ) override ; <nl> - AllocatorStats GetStats ( ) override ; <nl> + absl : : optional < AllocatorStats > GetStats ( ) override ; <nl> void ClearStats ( ) override ; <nl> <nl> private : <nl> mmm a / tensorflow / core / common_runtime / gpu / gpu_device . cc <nl> ppp b / tensorflow / core / common_runtime / gpu / gpu_device . cc <nl> Status BaseGPUDeviceFactory : : CreateGPUDevice ( <nl> tf_gpu_id . value ( ) , " with " , memory_limit , <nl> " bytes of memory . " ) ; <nl> } <nl> - AllocatorStats stats = gpu_allocator - > GetStats ( ) ; <nl> + absl : : optional < AllocatorStats > stats = gpu_allocator - > GetStats ( ) ; <nl> + if ( ! stats ) { <nl> + return errors : : Internal ( " No allocator statistics " ) ; <nl> + } <nl> / / ' memory_limit ' is the required memory size , but if the allocator with given <nl> / / tf_gpu_id was created before , we ' ll use it instead of creating a new one <nl> / / ( as TF gpu device is a shared resource ) , in which case the actual memory <nl> Status BaseGPUDeviceFactory : : CreateGPUDevice ( <nl> / / different ( which should be an error ) . <nl> / / <nl> / / TODO ( laigd ) : report error if memory_limit doesn ' t match stats - > bytes_limit . <nl> - int64 bytes_limit = stats . bytes_limit ; <nl> + int64 bytes_limit = stats - > bytes_limit ? * stats - > bytes_limit : 0 ; <nl> std : : unique_ptr < BaseGPUDevice > gpu_device = CreateGPUDevice ( <nl> options , device_name , static_cast < Bytes > ( bytes_limit ) , dev_locality , <nl> tf_gpu_id , GetShortDeviceDescription ( platform_gpu_id , desc ) , <nl> mmm a / tensorflow / core / common_runtime / process_state . h <nl> ppp b / tensorflow / core / common_runtime / process_state . h <nl> class RecordingAllocator : public Allocator { <nl> bool TracksAllocationSizes ( ) override { return a_ - > TracksAllocationSizes ( ) ; } <nl> size_t RequestedSize ( const void * p ) override { return a_ - > RequestedSize ( p ) ; } <nl> size_t AllocatedSize ( const void * p ) override { return a_ - > AllocatedSize ( p ) ; } <nl> - AllocatorStats GetStats ( ) override { return a_ - > GetStats ( ) ; } <nl> + absl : : optional < AllocatorStats > GetStats ( ) override { return a_ - > GetStats ( ) ; } <nl> void ClearStats ( ) override { a_ - > ClearStats ( ) ; } <nl> ProcessState : : MDMap * mm_ ; / / not owned <nl> Allocator * a_ ; / / not owned <nl> mmm a / tensorflow / core / common_runtime / step_stats_collector . cc <nl> ppp b / tensorflow / core / common_runtime / step_stats_collector . cc <nl> void NodeExecStatsWrapper : : AddAllocation ( <nl> memory - > set_peak_bytes ( std : : get < 1 > ( sizes ) ) ; <nl> memory - > set_live_bytes ( std : : get < 2 > ( sizes ) ) ; <nl> <nl> - AllocatorStats stats = allocator - > GetStats ( ) ; <nl> - memory - > set_allocator_bytes_in_use ( stats . bytes_in_use ) ; <nl> + absl : : optional < AllocatorStats > stats = allocator - > GetStats ( ) ; <nl> + if ( stats ) { <nl> + memory - > set_allocator_bytes_in_use ( stats - > bytes_in_use ) ; <nl> + } <nl> allocations_ . push_back ( std : : make_pair ( memory , tracking_allocator ) ) ; <nl> } <nl> <nl> mmm a / tensorflow / core / framework / allocator . cc <nl> ppp b / tensorflow / core / framework / allocator . cc <nl> string AllocatorStats : : DebugString ( ) const { <nl> " MaxInUse : % 20lld \ n " <nl> " NumAllocs : % 20lld \ n " <nl> " MaxAllocSize : % 20lld \ n " , <nl> - this - > bytes_limit , this - > bytes_in_use , this - > peak_bytes_in_use , <nl> - this - > num_allocs , this - > largest_alloc_size ) ; <nl> + this - > bytes_limit ? * this - > bytes_limit : 0 , this - > bytes_in_use , <nl> + this - > peak_bytes_in_use , this - > num_allocs , this - > largest_alloc_size ) ; <nl> } <nl> <nl> constexpr size_t Allocator : : kAllocatorAlignment ; <nl> class CPUAllocator : public Allocator { <nl> port : : AlignedFree ( ptr ) ; <nl> } <nl> <nl> - AllocatorStats GetStats ( ) override { <nl> + absl : : optional < AllocatorStats > GetStats ( ) override { <nl> mutex_lock l ( mu_ ) ; <nl> return stats_ ; <nl> } <nl> mmm a / tensorflow / core / framework / allocator . h <nl> ppp b / tensorflow / core / framework / allocator . h <nl> limitations under the License . <nl> <nl> # include < limits > <nl> <nl> + # include " absl / strings / string_view . h " <nl> + # include " absl / types / optional . h " <nl> # include " tensorflow / core / framework / numeric_types . h " <nl> # include " tensorflow / core / framework / resource_handle . h " <nl> # include " tensorflow / core / framework / type_traits . h " <nl> struct AllocatorStats { <nl> int64 largest_alloc_size ; / / The largest single allocation seen . <nl> <nl> / / The upper limit of bytes of user allocatable device memory , if such a limit <nl> - / / is known . Certain allocators may return 0 to indicate the limit is unknown . <nl> - int64 bytes_limit ; <nl> + / / is known . <nl> + absl : : optional < int64 > bytes_limit ; <nl> <nl> AllocatorStats ( ) <nl> : num_allocs ( 0 ) , <nl> bytes_in_use ( 0 ) , <nl> peak_bytes_in_use ( 0 ) , <nl> - largest_alloc_size ( 0 ) , <nl> - bytes_limit ( 0 ) { } <nl> + largest_alloc_size ( 0 ) { } <nl> <nl> string DebugString ( ) const ; <nl> } ; <nl> class Allocator { <nl> } <nl> <nl> / / Fills in ' stats ' with statistics collected by this allocator . <nl> - virtual AllocatorStats GetStats ( ) { return AllocatorStats ( ) ; } <nl> + virtual absl : : optional < AllocatorStats > GetStats ( ) { return absl : : nullopt ; } <nl> <nl> / / Clears the internal stats except for the ` in_use ` field . <nl> virtual void ClearStats ( ) { } <nl> mmm a / tensorflow / core / framework / allocator_test . cc <nl> ppp b / tensorflow / core / framework / allocator_test . cc <nl> namespace tensorflow { <nl> <nl> static void CheckStats ( Allocator * a , int64 num_allocs , int64 bytes_in_use , <nl> int64 peak_bytes_in_use , int64 largest_alloc_size ) { <nl> - AllocatorStats stats = a - > GetStats ( ) ; <nl> - LOG ( INFO ) < < " Alloc stats : \ n " < < stats . DebugString ( ) ; <nl> + absl : : optional < AllocatorStats > stats = a - > GetStats ( ) ; <nl> + EXPECT_TRUE ( stats ) ; <nl> + if ( ! stats ) { <nl> + return ; <nl> + } <nl> + LOG ( INFO ) < < " Alloc stats : \ n " < < stats - > DebugString ( ) ; <nl> # if defined ( PLATFORM_GOOGLE ) & & defined ( NDEBUG ) <nl> / / NOTE : allocator stats expectation depends on the system malloc , <nl> / / and can vary as that changes . <nl> static const int64 kSlop = 5 * 1024 ; <nl> - EXPECT_GT ( stats . bytes_in_use , bytes_in_use - kSlop ) ; <nl> - EXPECT_LT ( stats . bytes_in_use , bytes_in_use + kSlop ) ; <nl> - EXPECT_GT ( stats . peak_bytes_in_use , peak_bytes_in_use - kSlop ) ; <nl> - EXPECT_LT ( stats . peak_bytes_in_use , peak_bytes_in_use + kSlop ) ; <nl> - EXPECT_EQ ( stats . num_allocs , num_allocs ) ; <nl> - EXPECT_EQ ( stats . largest_alloc_size , largest_alloc_size ) ; <nl> + EXPECT_GT ( stats - > bytes_in_use , bytes_in_use - kSlop ) ; <nl> + EXPECT_LT ( stats - > bytes_in_use , bytes_in_use + kSlop ) ; <nl> + EXPECT_GT ( stats - > peak_bytes_in_use , peak_bytes_in_use - kSlop ) ; <nl> + EXPECT_LT ( stats - > peak_bytes_in_use , peak_bytes_in_use + kSlop ) ; <nl> + EXPECT_EQ ( stats - > num_allocs , num_allocs ) ; <nl> + EXPECT_EQ ( stats - > largest_alloc_size , largest_alloc_size ) ; <nl> # endif <nl> } <nl> <nl> mmm a / tensorflow / core / framework / tracking_allocator . cc <nl> ppp b / tensorflow / core / framework / tracking_allocator . cc <nl> int64 TrackingAllocator : : AllocationId ( const void * ptr ) { <nl> } <nl> } <nl> <nl> - AllocatorStats TrackingAllocator : : GetStats ( ) { return allocator_ - > GetStats ( ) ; } <nl> + absl : : optional < AllocatorStats > TrackingAllocator : : GetStats ( ) { <nl> + return allocator_ - > GetStats ( ) ; <nl> + } <nl> <nl> void TrackingAllocator : : ClearStats ( ) { allocator_ - > ClearStats ( ) ; } <nl> <nl> mmm a / tensorflow / core / framework / tracking_allocator . h <nl> ppp b / tensorflow / core / framework / tracking_allocator . h <nl> class TrackingAllocator : public Allocator { <nl> size_t RequestedSize ( const void * ptr ) override ; <nl> size_t AllocatedSize ( const void * ptr ) override ; <nl> int64 AllocationId ( const void * ptr ) override ; <nl> - AllocatorStats GetStats ( ) override ; <nl> + absl : : optional < AllocatorStats > GetStats ( ) override ; <nl> void ClearStats ( ) override ; <nl> <nl> / / If the underlying allocator tracks allocation sizes , this returns <nl> mmm a / tensorflow / core / framework / tracking_allocator_test . cc <nl> ppp b / tensorflow / core / framework / tracking_allocator_test . cc <nl> class TestableSizeTrackingAllocator : public Allocator { <nl> EXPECT_NE ( size_map_ . end ( ) , iter ) ; <nl> return iter - > second ; <nl> } <nl> + absl : : optional < AllocatorStats > GetStats ( ) override { return absl : : nullopt ; } <nl> <nl> private : <nl> std : : unordered_map < const void * , size_t > size_map_ ; <nl> class NoMemoryAllocator : public Allocator { <nl> } <nl> void DeallocateRaw ( void * ptr ) override { } <nl> bool TracksAllocationSizes ( ) override { return true ; } <nl> + absl : : optional < AllocatorStats > GetStats ( ) override { return absl : : nullopt ; } <nl> } ; <nl> <nl> TEST ( TrackingAllocatorTest , SimpleNoTracking ) { <nl> mmm a / tensorflow / core / grappler / clusters / single_machine . cc <nl> ppp b / tensorflow / core / grappler / clusters / single_machine . cc <nl> Status SingleMachine : : GetPeakMemoryUsage ( <nl> return Status ( error : : INVALID_ARGUMENT , <nl> " Tracking allocation is not enabled . " ) ; <nl> } <nl> - AllocatorStats stats = allocator - > GetStats ( ) ; <nl> - ( * device_peak_memory ) [ device - > name ( ) ] = stats . peak_bytes_in_use ; <nl> + absl : : optional < AllocatorStats > stats = allocator - > GetStats ( ) ; <nl> + ( * device_peak_memory ) [ device - > name ( ) ] = <nl> + ( stats ? stats - > peak_bytes_in_use : 0 ) ; <nl> } <nl> <nl> return Status : : OK ( ) ; <nl> mmm a / tensorflow / core / kernels / stack . cc <nl> ppp b / tensorflow / core / kernels / stack . cc <nl> void StackPushOp : : ComputeAsync ( OpKernelContext * ctx , DoneCallback done ) { <nl> DeviceContext * device_ctxt = ctx - > op_device_context ( ) ; <nl> auto device = static_cast < tensorflow : : Device * > ( ctx - > device ( ) ) ; <nl> Allocator * allocator = device - > GetAllocator ( alloc_attrs ) ; <nl> - AllocatorStats stats = allocator - > GetStats ( ) ; <nl> - if ( stats . bytes_limit & & <nl> - stats . bytes_in_use > ( stats . bytes_limit * kOccupancy ) ) { <nl> + absl : : optional < AllocatorStats > stats = allocator - > GetStats ( ) ; <nl> + if ( stats & & * stats - > bytes_limit & & <nl> + stats - > bytes_in_use > ( * stats - > bytes_limit * kOccupancy ) ) { <nl> / / Asynchronously copy the tensor from GPU to CPU memory . <nl> / / TODO ( yuanbyu ) : Swap the oldest tensor first . <nl> AllocatorAttributes host_alloc_attrs ; <nl> mmm a / tensorflow / stream_executor / BUILD <nl> ppp b / tensorflow / stream_executor / BUILD <nl> cc_library ( <nl> " / / tensorflow / core : lib " , <nl> " / / tensorflow / stream_executor / lib " , <nl> " / / tensorflow / stream_executor / platform " , <nl> + " @ com_google_absl / / absl / base : core_headers " , <nl> " @ com_google_absl / / absl / types : optional " , <nl> " @ com_google_absl / / absl / types : span " , <nl> ] , <nl> cc_library ( <nl> " / / tensorflow / stream_executor / platform " , <nl> " @ com_google_absl / / absl / base : core_headers " , <nl> " @ com_google_absl / / absl / strings " , <nl> + " @ com_google_absl / / absl / types : optional " , <nl> ] , <nl> ) <nl> <nl> cc_library ( <nl> deps = [ <nl> " / / tensorflow / stream_executor / platform " , <nl> " @ com_google_absl / / absl / strings : str_format " , <nl> + " @ com_google_absl / / absl / types : optional " , <nl> ] , <nl> ) <nl> <nl> mmm a / tensorflow / stream_executor / allocator_stats . cc <nl> ppp b / tensorflow / stream_executor / allocator_stats . cc <nl> string AllocatorStats : : DebugString ( ) const { <nl> " MaxInUse : % 20lld \ n " <nl> " NumAllocs : % 20lld \ n " <nl> " MaxAllocSize : % 20lld \ n " , <nl> - this - > bytes_limit , this - > bytes_in_use , this - > peak_bytes_in_use , <nl> - this - > num_allocs , this - > largest_alloc_size ) ; <nl> + this - > bytes_limit ? * this - > bytes_limit : 0 , this - > bytes_in_use , <nl> + this - > peak_bytes_in_use , this - > num_allocs , this - > largest_alloc_size ) ; <nl> } <nl> <nl> } / / namespace stream_executor <nl> mmm a / tensorflow / stream_executor / allocator_stats . h <nl> ppp b / tensorflow / stream_executor / allocator_stats . h <nl> limitations under the License . <nl> <nl> # include < string > <nl> <nl> + # include " absl / types / optional . h " <nl> # include " tensorflow / stream_executor / platform / port . h " <nl> <nl> namespace stream_executor { <nl> struct AllocatorStats { <nl> int64 largest_alloc_size ; / / The largest single allocation seen . <nl> <nl> / / The upper limit of bytes of user allocatable device memory , if such a limit <nl> - / / is known . Certain allocators may return 0 to indicate the limit is unknown . <nl> - int64 bytes_limit ; <nl> + / / is known . <nl> + absl : : optional < int64 > bytes_limit ; <nl> <nl> AllocatorStats ( ) <nl> : num_allocs ( 0 ) , <nl> bytes_in_use ( 0 ) , <nl> peak_bytes_in_use ( 0 ) , <nl> - largest_alloc_size ( 0 ) , <nl> - bytes_limit ( 0 ) { } <nl> + largest_alloc_size ( 0 ) { } <nl> <nl> string DebugString ( ) const ; <nl> } ; <nl> mmm a / tensorflow / stream_executor / stream_executor_internal . h <nl> ppp b / tensorflow / stream_executor / stream_executor_internal . h <nl> class StreamExecutorInterface { <nl> virtual void * GpuContextHack ( ) { return nullptr ; } <nl> <nl> / / Return allocator statistics . <nl> - virtual AllocatorStats GetAllocatorStats ( ) { return AllocatorStats ( ) ; } <nl> + virtual absl : : optional < AllocatorStats > GetAllocatorStats ( ) { <nl> + return absl : : nullopt ; <nl> + } <nl> <nl> private : <nl> SE_DISALLOW_COPY_AND_ASSIGN ( StreamExecutorInterface ) ; <nl> mmm a / tensorflow / stream_executor / stream_executor_pimpl . cc <nl> ppp b / tensorflow / stream_executor / stream_executor_pimpl . cc <nl> bool StreamExecutor : : UnregisterTraceListener ( TraceListener * listener ) { <nl> return true ; <nl> } <nl> <nl> - AllocatorStats StreamExecutor : : GetAllocatorStats ( ) { <nl> + absl : : optional < AllocatorStats > StreamExecutor : : GetAllocatorStats ( ) { <nl> return implementation_ - > GetAllocatorStats ( ) ; <nl> } <nl> <nl> mmm a / tensorflow / stream_executor / stream_executor_pimpl . h <nl> ppp b / tensorflow / stream_executor / stream_executor_pimpl . h <nl> limitations under the License . <nl> # include < vector > <nl> <nl> # include " absl / base / macros . h " <nl> + # include " absl / types / optional . h " <nl> # include " tensorflow / stream_executor / lib / status . h " <nl> # include " tensorflow / stream_executor / lib / statusor . h " <nl> # include " tensorflow / stream_executor / lib / threadpool . h " <nl> class StreamExecutor { <nl> bool UnregisterTraceListener ( TraceListener * listener ) ; <nl> <nl> / / Return allocator statistics . <nl> - AllocatorStats GetAllocatorStats ( ) ; <nl> + absl : : optional < AllocatorStats > GetAllocatorStats ( ) ; <nl> <nl> private : <nl> template < typename BeginCallT , typename CompleteCallT , <nl>

Automated rollback of commit 9ca8321d68b74ce4f30756366919c80282ca2b68

tensorflow/tensorflow

d10b88cd4a487624221d5960657bc15cf8a0e2d3

2019-02-24T22:58:49Z

mmm a / cocos / platform / android / jni / JniHelper . cpp <nl> ppp b / cocos / platform / android / jni / JniHelper . cpp <nl> THE SOFTWARE . <nl> <nl> # define LOG_TAG " JniHelper " <nl> # define LOGD ( . . . ) __android_log_print ( ANDROID_LOG_DEBUG , LOG_TAG , __VA_ARGS__ ) <nl> + # define LOGE ( . . . ) __android_log_print ( ANDROID_LOG_ERROR , LOG_TAG , __VA_ARGS__ ) <nl> <nl> static pthread_key_t g_key ; <nl> <nl> jclass _getClassID ( const char * className ) { <nl> _jstrClassName ) ; <nl> <nl> if ( NULL = = _clazz ) { <nl> - LOGD ( " Classloader failed to find class of % s " , className ) ; <nl> + LOGE ( " Classloader failed to find class of % s " , className ) ; <nl> + env - > ExceptionClear ( ) ; <nl> } <nl> <nl> env - > DeleteLocalRef ( _jstrClassName ) ; <nl> namespace cocos2d { <nl> <nl> if ( jvm - > AttachCurrentThread ( & _env , NULL ) < 0 ) <nl> { <nl> - LOGD ( " Failed to get the environment using AttachCurrentThread ( ) " ) ; <nl> + LOGE ( " Failed to get the environment using AttachCurrentThread ( ) " ) ; <nl> <nl> return NULL ; <nl> } else { <nl> namespace cocos2d { <nl> <nl> case JNI_EVERSION : <nl> / / Cannot recover from this error <nl> - LOGD ( " JNI interface version 1 . 4 not supported " ) ; <nl> + LOGE ( " JNI interface version 1 . 4 not supported " ) ; <nl> default : <nl> - LOGD ( " Failed to get the environment using GetEnv ( ) " ) ; <nl> + LOGE ( " Failed to get the environment using GetEnv ( ) " ) ; <nl> return NULL ; <nl> } <nl> } <nl> namespace cocos2d { <nl> <nl> JNIEnv * pEnv = JniHelper : : getEnv ( ) ; <nl> if ( ! pEnv ) { <nl> - LOGD ( " Failed to get JNIEnv " ) ; <nl> + LOGE ( " Failed to get JNIEnv " ) ; <nl> return false ; <nl> } <nl> <nl> jclass classID = _getClassID ( className ) ; <nl> if ( ! classID ) { <nl> - LOGD ( " Failed to find class % s " , className ) ; <nl> + LOGE ( " Failed to find class % s " , className ) ; <nl> + pEnv - > ExceptionClear ( ) ; <nl> return false ; <nl> } <nl> <nl> jmethodID methodID = pEnv - > GetStaticMethodID ( classID , methodName , paramCode ) ; <nl> if ( ! methodID ) { <nl> - LOGD ( " Failed to find static method id of % s " , methodName ) ; <nl> + LOGE ( " Failed to find static method id of % s " , methodName ) ; <nl> + pEnv - > ExceptionClear ( ) ; <nl> return false ; <nl> } <nl> <nl> namespace cocos2d { <nl> <nl> jclass classID = pEnv - > FindClass ( className ) ; <nl> if ( ! classID ) { <nl> - LOGD ( " Failed to find class % s " , className ) ; <nl> + LOGE ( " Failed to find class % s " , className ) ; <nl> + pEnv - > ExceptionClear ( ) ; <nl> return false ; <nl> } <nl> <nl> jmethodID methodID = pEnv - > GetMethodID ( classID , methodName , paramCode ) ; <nl> if ( ! methodID ) { <nl> - LOGD ( " Failed to find method id of % s " , methodName ) ; <nl> + LOGE ( " Failed to find method id of % s " , methodName ) ; <nl> + pEnv - > ExceptionClear ( ) ; <nl> return false ; <nl> } <nl> <nl> namespace cocos2d { <nl> <nl> jclass classID = _getClassID ( className ) ; <nl> if ( ! classID ) { <nl> - LOGD ( " Failed to find class % s " , className ) ; <nl> + LOGE ( " Failed to find class % s " , className ) ; <nl> pEnv - > ExceptionClear ( ) ; <nl> return false ; <nl> } <nl> <nl> jmethodID methodID = pEnv - > GetMethodID ( classID , methodName , paramCode ) ; <nl> if ( ! methodID ) { <nl> - LOGD ( " Failed to find method id of % s " , methodName ) ; <nl> + LOGE ( " Failed to find method id of % s " , methodName ) ; <nl> pEnv - > ExceptionClear ( ) ; <nl> return false ; <nl> } <nl>

android uni error clear & more readable log

cocos2d/cocos2d-x

cd892abc7781e1c46fabaf1c19528b1a4e3b647b

2014-05-20T10:52:21Z

new file mode 100644 <nl> index 0000000000 . . 066774d5bf <nl> mmm / dev / null <nl> ppp b / java / src / main / java / com / google / protobuf / nano / ExtendableMessageNano . java <nl> <nl> + / / Protocol Buffers - Google ' s data interchange format <nl> + / / Copyright 2013 Google Inc . All rights reserved . <nl> + / / http : / / code . google . com / p / protobuf / <nl> + / / <nl> + / / Redistribution and use in source and binary forms , with or without <nl> + / / modification , are permitted provided that the following conditions are <nl> + / / met : <nl> + / / <nl> + / / * Redistributions of source code must retain the above copyright <nl> + / / notice , this list of conditions and the following disclaimer . <nl> + / / * Redistributions in binary form must reproduce the above <nl> + / / copyright notice , this list of conditions and the following disclaimer <nl> + / / in the documentation and / or other materials provided with the <nl> + / / distribution . <nl> + / / * Neither the name of Google Inc . nor the names of its <nl> + / / contributors may be used to endorse or promote products derived from <nl> + / / this software without specific prior written permission . <nl> + / / <nl> + / / THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS <nl> + / / " AS IS " AND ANY EXPRESS OR IMPLIED WARRANTIES , INCLUDING , BUT NOT <nl> + / / LIMITED TO , THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR <nl> + / / A PARTICULAR PURPOSE ARE DISCLAIMED . IN NO EVENT SHALL THE COPYRIGHT <nl> + / / OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT , INDIRECT , INCIDENTAL , <nl> + / / SPECIAL , EXEMPLARY , OR CONSEQUENTIAL DAMAGES ( INCLUDING , BUT NOT <nl> + / / LIMITED TO , PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ; LOSS OF USE , <nl> + / / DATA , OR PROFITS ; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY <nl> + / / THEORY OF LIABILITY , WHETHER IN CONTRACT , STRICT LIABILITY , OR TORT <nl> + / / ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE <nl> + / / OF THIS SOFTWARE , EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE . <nl> + <nl> + package com . google . protobuf . nano ; <nl> + <nl> + import java . util . ArrayList ; <nl> + import java . util . List ; <nl> + <nl> + / * * <nl> + * Base class of those Protocol Buffer messages that need to store unknown fields , <nl> + * such as extensions . <nl> + * / <nl> + public abstract class ExtendableMessageNano extends MessageNano { <nl> + / * * <nl> + * A container for fields unknown to the message , including extensions . Extension fields can <nl> + * can be accessed through the { @ link getExtension ( ) } and { @ link setExtension ( ) } methods . <nl> + * / <nl> + protected List < UnknownFieldData > unknownFieldData ; <nl> + <nl> + @ Override <nl> + public int getSerializedSize ( ) { <nl> + int size = WireFormatNano . computeWireSize ( unknownFieldData ) ; <nl> + cachedSize = size ; <nl> + return size ; <nl> + } <nl> + <nl> + / * * <nl> + * Gets the value stored in the specified extension of this message . <nl> + * / <nl> + public < T > T getExtension ( Extension < T > extension ) { <nl> + return WireFormatNano . getExtension ( extension , unknownFieldData ) ; <nl> + } <nl> + <nl> + / * * <nl> + * Sets the value of the specified extension of this message . <nl> + * / <nl> + public < T > void setExtension ( Extension < T > extension , T value ) { <nl> + if ( unknownFieldData = = null ) { <nl> + unknownFieldData = new ArrayList < UnknownFieldData > ( ) ; <nl> + } <nl> + WireFormatNano . setExtension ( extension , value , unknownFieldData ) ; <nl> + } <nl> + } <nl> \ No newline at end of file <nl> mmm a / java / src / main / java / com / google / protobuf / nano / MessageNano . java <nl> ppp b / java / src / main / java / com / google / protobuf / nano / MessageNano . java <nl> <nl> * @ author wink @ google . com Wink Saville <nl> * / <nl> public abstract class MessageNano { <nl> + protected int cachedSize = - 1 ; <nl> + <nl> / * * <nl> * Get the number of bytes required to encode this message . <nl> * Returns the cached size or calls getSerializedSize which <nl> <nl> * so the size is only computed once . If a member is modified <nl> * then this could be stale call getSerializedSize if in doubt . <nl> * / <nl> - abstract public int getCachedSize ( ) ; <nl> + public int getCachedSize ( ) { <nl> + if ( cachedSize < 0 ) { <nl> + / / getSerializedSize sets cachedSize <nl> + getSerializedSize ( ) ; <nl> + } <nl> + return cachedSize ; <nl> + } <nl> <nl> / * * <nl> * Computes the number of bytes required to encode this message . <nl> * The size is cached and the cached result can be retrieved <nl> * using getCachedSize ( ) . <nl> * / <nl> - abstract public int getSerializedSize ( ) ; <nl> + public int getSerializedSize ( ) { <nl> + / / This is overridden if the generated message has serialized fields . <nl> + cachedSize = 0 ; <nl> + return 0 ; <nl> + } <nl> <nl> / * * <nl> * Serializes the message and writes it to { @ code output } . This does not <nl> mmm a / src / google / protobuf / compiler / javanano / javanano_file . cc <nl> ppp b / src / google / protobuf / compiler / javanano / javanano_file . cc <nl> void FileGenerator : : Generate ( io : : Printer * printer ) { <nl> printer - > Print ( <nl> " \ n " <nl> " @ SuppressWarnings ( \ " hiding \ " ) \ n " <nl> - " public final class $ classname $ { \ n " <nl> - " \ n " <nl> - " private $ classname $ ( ) { } \ n " , <nl> + " public interface $ classname $ { \ n " , <nl> " classname " , classname_ ) ; <nl> printer - > Indent ( ) ; <nl> <nl> mmm a / src / google / protobuf / compiler / javanano / javanano_message . cc <nl> ppp b / src / google / protobuf / compiler / javanano / javanano_message . cc <nl> void MessageGenerator : : Generate ( io : : Printer * printer ) { <nl> printer - > Print ( <nl> " \ n " <nl> " @ SuppressWarnings ( \ " hiding \ " ) \ n " <nl> - " public final class $ classname $ extends \ n " <nl> - " com . google . protobuf . nano . MessageNano { \ n " , <nl> + " public final class $ classname $ extends \ n " , <nl> " classname " , descriptor_ - > name ( ) ) ; <nl> } else { <nl> printer - > Print ( <nl> " \ n " <nl> - " public static final class $ classname $ extends \ n " <nl> - " com . google . protobuf . nano . MessageNano { \ n " , <nl> + " public static final class $ classname $ extends \ n " , <nl> " classname " , descriptor_ - > name ( ) ) ; <nl> } <nl> + if ( params_ . store_unknown_fields ( ) ) { <nl> + printer - > Print ( <nl> + " com . google . protobuf . nano . ExtendableMessageNano { \ n " ) ; <nl> + } else { <nl> + printer - > Print ( <nl> + " com . google . protobuf . nano . MessageNano { \ n " ) ; <nl> + } <nl> printer - > Indent ( ) ; <nl> printer - > Print ( <nl> " \ n " <nl> void MessageGenerator : : Generate ( io : : Printer * printer ) { <nl> " } \ n " , <nl> " classname " , descriptor_ - > name ( ) ) ; <nl> <nl> - if ( params_ . store_unknown_fields ( ) ) { <nl> - printer - > Print ( <nl> - " \ n " <nl> - " private java . util . List < com . google . protobuf . nano . UnknownFieldData > \ n " <nl> - " unknownFieldData ; \ n " ) ; <nl> - } <nl> - <nl> / / Nested types and extensions <nl> for ( int i = 0 ; i < descriptor_ - > extension_count ( ) ; i + + ) { <nl> ExtensionGenerator ( descriptor_ - > extension ( i ) , params_ ) . Generate ( printer ) ; <nl> void MessageGenerator : : Generate ( io : : Printer * printer ) { <nl> GenerateHashCode ( printer ) ; <nl> } <nl> <nl> - / / If we have an extension range , generate accessors for extensions . <nl> - if ( params_ . store_unknown_fields ( ) <nl> - & & descriptor_ - > extension_range_count ( ) > 0 ) { <nl> - printer - > Print ( <nl> - " \ n " <nl> - " public < T > T getExtension ( com . google . protobuf . nano . Extension < T > extension ) { \ n " <nl> - " return com . google . protobuf . nano . WireFormatNano . getExtension ( \ n " <nl> - " extension , unknownFieldData ) ; \ n " <nl> - " } \ n " <nl> - " \ n " <nl> - " public < T > void setExtension ( com . google . protobuf . nano . Extension < T > extension , T value ) { \ n " <nl> - " if ( unknownFieldData = = null ) { \ n " <nl> - " unknownFieldData = \ n " <nl> - " new java . util . ArrayList < com . google . protobuf . nano . UnknownFieldData > ( ) ; \ n " <nl> - " } \ n " <nl> - " com . google . protobuf . nano . WireFormatNano . setExtension ( \ n " <nl> - " extension , value , unknownFieldData ) ; \ n " <nl> - " } \ n " ) ; <nl> - } <nl> GenerateMessageSerializationMethods ( printer ) ; <nl> GenerateMergeFromMethods ( printer ) ; <nl> GenerateParseFromMethods ( printer ) ; <nl> GenerateMessageSerializationMethods ( io : : Printer * printer ) { <nl> } <nl> <nl> printer - > Outdent ( ) ; <nl> - printer - > Print ( <nl> - " } \ n " <nl> - " \ n " <nl> - " private int cachedSize ; \ n " <nl> - " @ Override \ n " <nl> - " public int getCachedSize ( ) { \ n " <nl> - " if ( cachedSize < 0 ) { \ n " <nl> - " / / getSerializedSize sets cachedSize \ n " <nl> - " getSerializedSize ( ) ; \ n " <nl> - " } \ n " <nl> - " return cachedSize ; \ n " <nl> - " } \ n " <nl> - " \ n " <nl> - " @ Override \ n " <nl> - " public int getSerializedSize ( ) { \ n " <nl> - " int size = 0 ; \ n " ) ; <nl> - printer - > Indent ( ) ; <nl> + printer - > Print ( " } \ n " ) ; <nl> <nl> - for ( int i = 0 ; i < descriptor_ - > field_count ( ) ; i + + ) { <nl> - field_generators_ . get ( sorted_fields [ i ] ) . GenerateSerializedSizeCode ( printer ) ; <nl> - } <nl> + / / Rely on the parent implementation of getSerializedSize if there are no fields to <nl> + / / serialize in this MessageNano . <nl> + if ( descriptor_ - > field_count ( ) ! = 0 ) { <nl> + printer - > Print ( <nl> + " \ n " <nl> + " @ Override \ n " <nl> + " public int getSerializedSize ( ) { \ n " <nl> + " int size = super . getSerializedSize ( ) ; \ n " ) ; <nl> + printer - > Indent ( ) ; <nl> <nl> - if ( params_ . store_unknown_fields ( ) ) { <nl> + for ( int i = 0 ; i < descriptor_ - > field_count ( ) ; i + + ) { <nl> + field_generators_ . get ( sorted_fields [ i ] ) . GenerateSerializedSizeCode ( printer ) ; <nl> + } <nl> + <nl> + printer - > Outdent ( ) ; <nl> printer - > Print ( <nl> - " size + = com . google . protobuf . nano . WireFormatNano . computeWireSize ( unknownFieldData ) ; \ n " ) ; <nl> + " cachedSize = size ; \ n " <nl> + " return size ; \ n " <nl> + " } \ n " ) ; <nl> } <nl> - <nl> - printer - > Outdent ( ) ; <nl> - printer - > Print ( <nl> - " cachedSize = size ; \ n " <nl> - " return size ; \ n " <nl> - " } \ n " ) ; <nl> } <nl> <nl> void MessageGenerator : : GenerateMergeFromMethods ( io : : Printer * printer ) { <nl>

am ac8e2e15 : Merge " Minimize method count for nanoproto . "

protocolbuffers/protobuf

1bca0c0cb9d3c3fce8c67d77c65e9711a9f1a27a

2013-11-12T17:15:57Z

mmm a / dbms / src / Functions / FunctionsURL . cpp <nl> ppp b / dbms / src / Functions / FunctionsURL . cpp <nl> void DecodeURLComponentImpl : : vector ( const ColumnString : : Chars_t & data , const Co <nl> void DecodeURLComponentImpl : : constant ( const std : : string & str , <nl> std : : string & res_data ) <nl> { <nl> - res_data . resize ( str . size ( ) + 15 ) ; / / / This is needed for memcpySmallAllowReadWriteOverflow15 function , that is used inside decodeURL . <nl> - size_t len = decodeURL ( str . data ( ) , str . size ( ) , & res_data [ 0 ] ) ; <nl> - res_data . resize ( len ) ; <nl> + ColumnString src ; <nl> + ColumnString dst ; <nl> + src . insert ( str ) ; <nl> + <nl> + vector ( src . getChars ( ) , src . getOffsets ( ) , dst . getChars ( ) , dst . getOffsets ( ) ) ; <nl> + <nl> + res_data = dst [ 0 ] . get < String > ( ) ; <nl> } <nl> <nl> <nl>

Fixed error ( tnx . artpaul ) [ # METR - 23793 ] .

ClickHouse/ClickHouse

989d542f6605b2aefe9c64a5fe7a1a799ee0ef4e

2016-12-15T20:33:35Z

mmm a / src / random . h <nl> ppp b / src / random . h <nl> <nl> # include < uint256 . h > <nl> <nl> # include < stdint . h > <nl> + # include < limits > <nl> <nl> / * Seed OpenSSL PRNG with additional entropy data * / <nl> void RandAddSeed ( ) ; <nl> class FastRandomContext { <nl> <nl> / * * Generate a random boolean . * / <nl> bool randbool ( ) { return randbits ( 1 ) ; } <nl> + <nl> + / / Compatibility with the C + + 11 UniformRandomBitGenerator concept <nl> + typedef uint64_t result_type ; <nl> + static constexpr uint64_t min ( ) { return 0 ; } <nl> + static constexpr uint64_t max ( ) { return std : : numeric_limits < uint64_t > : : max ( ) ; } <nl> + inline uint64_t operator ( ) ( ) { return rand64 ( ) ; } <nl> } ; <nl> <nl> / * Number of random bytes returned by GetOSRand . <nl> mmm a / src / test / random_tests . cpp <nl> ppp b / src / test / random_tests . cpp <nl> <nl> <nl> # include < boost / test / unit_test . hpp > <nl> <nl> + # include < random > <nl> + # include < algorithm > <nl> + <nl> BOOST_FIXTURE_TEST_SUITE ( random_tests , BasicTestingSetup ) <nl> <nl> BOOST_AUTO_TEST_CASE ( osrandom_tests ) <nl> BOOST_AUTO_TEST_CASE ( fastrandom_randbits ) <nl> } <nl> } <nl> <nl> + / * * Does - it - compile test for compatibility with standard C + + 11 RNG interface . * / <nl> + BOOST_AUTO_TEST_CASE ( stdrandom_test ) <nl> + { <nl> + FastRandomContext ctx ; <nl> + std : : uniform_int_distribution < int > distribution ( 3 , 9 ) ; <nl> + for ( int i = 0 ; i < 100 ; + + i ) { <nl> + int x = distribution ( ctx ) ; <nl> + BOOST_CHECK ( x > = 3 ) ; <nl> + BOOST_CHECK ( x < = 9 ) ; <nl> + <nl> + std : : vector < int > test { 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 } ; <nl> + std : : shuffle ( test . begin ( ) , test . end ( ) , ctx ) ; <nl> + for ( int j = 1 ; j < = 10 ; + + j ) { <nl> + BOOST_CHECK ( std : : find ( test . begin ( ) , test . end ( ) , j ) ! = test . end ( ) ) ; <nl> + } <nl> + } <nl> + <nl> + } <nl> + <nl> BOOST_AUTO_TEST_SUITE_END ( ) <nl>

Merge : Make FastRandomContext support standard C + + 11 RNG interface

bitcoin/bitcoin

f686002a8eba820a40ac2f34a6e8f57b2b5cc54c

2018-03-22T16:21:46Z

mmm a / tools / sil - opt / SILOpt . cpp <nl> ppp b / tools / sil - opt / SILOpt . cpp <nl> SDKPath ( " sdk " , llvm : : cl : : desc ( " The path to the SDK for use with the clang " <nl> llvm : : cl : : init ( " " ) ) ; <nl> <nl> static llvm : : cl : : opt < std : : string > <nl> - Target ( " target " , llvm : : cl : : desc ( " target triple " ) ) ; <nl> + Target ( " target " , llvm : : cl : : desc ( " target triple " ) , <nl> + llvm : : cl : : init ( llvm : : sys : : getDefaultTargetTriple ( ) ) ) ; <nl> <nl> static llvm : : cl : : opt < OptGroup > OptimizationGroup ( <nl> llvm : : cl : : desc ( " Predefined optimization groups : " ) , <nl>

Merge remote - tracking branch ' origin / master ' into master - next

apple/swift

ca428a00ef5d5872e7bb59c65db050e782f18c3b

2018-01-06T02:29:43Z

mmm a / Marlin / Conditionals_LCD . h <nl> ppp b / Marlin / Conditionals_LCD . h <nl> <nl> # define LCD_STR_SPECIAL_MAX ' \ x09 ' <nl> / / Maximum here is 0x1f because 0x20 is ' ' ( space ) and the normal charsets begin . <nl> / / Better stay below 0x10 because DISPLAY_CHARSET_HD44780_WESTERN begins here . <nl> + <nl> + / / Symbol characters <nl> + # define LCD_STR_FILAM_DIA " \ xf8 " <nl> + # define LCD_STR_FILAM_MUL " \ xa4 " <nl> # else <nl> / * Custom characters defined in the first 8 characters of the LCD * / <nl> # define LCD_STR_BEDTEMP " \ x00 " / / Print only as a char . This will have ' unexpected ' results when used in a string ! <nl> mmm a / Marlin / ultralcd . cpp <nl> ppp b / Marlin / ultralcd . cpp <nl> extern float zprobe_zoffset ; <nl> <nl> int lcd_preheat_hotend_temp [ 2 ] , lcd_preheat_bed_temp [ 2 ] , lcd_preheat_fan_speed [ 2 ] ; <nl> <nl> - # if ENABLED ( FILAMENT_LCD_DISPLAY ) <nl> + # if ENABLED ( FILAMENT_LCD_DISPLAY ) & & ENABLED ( SDSUPPORT ) <nl> millis_t previous_lcd_status_ms = 0 ; <nl> # endif <nl> <nl> void lcd_status_screen ( ) { <nl> # if ENABLED ( ULTIPANEL ) <nl> <nl> if ( lcd_clicked ) { <nl> - # if ENABLED ( FILAMENT_LCD_DISPLAY ) <nl> + # if ENABLED ( FILAMENT_LCD_DISPLAY ) & & ENABLED ( SDSUPPORT ) <nl> previous_lcd_status_ms = millis ( ) ; / / get status message to show up for a while <nl> # endif <nl> lcd_implementation_init ( / / to maybe revive the LCD if static electricity killed it . <nl> void lcd_finishstatus ( bool persist = false ) { <nl> # endif <nl> lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW ; <nl> <nl> - # if ENABLED ( FILAMENT_LCD_DISPLAY ) <nl> + # if ENABLED ( FILAMENT_LCD_DISPLAY ) & & ENABLED ( SDSUPPORT ) <nl> previous_lcd_status_ms = millis ( ) ; / / get status message to show up for a while <nl> # endif <nl> } <nl> mmm a / Marlin / ultralcd . h <nl> ppp b / Marlin / ultralcd . h <nl> <nl> <nl> # endif <nl> <nl> - # if ENABLED ( FILAMENT_LCD_DISPLAY ) <nl> + # if ENABLED ( FILAMENT_LCD_DISPLAY ) & & ENABLED ( SDSUPPORT ) <nl> extern millis_t previous_lcd_status_ms ; <nl> # endif <nl> <nl> mmm a / Marlin / ultralcd_impl_DOGM . h <nl> ppp b / Marlin / ultralcd_impl_DOGM . h <nl> static void lcd_implementation_status_screen ( ) { <nl> / / When everything is ok you see a constant ' X ' . <nl> <nl> static char xstring [ 5 ] , ystring [ 5 ] , zstring [ 7 ] ; <nl> + # if ENABLED ( FILAMENT_LCD_DISPLAY ) & & DISABLED ( SDSUPPORT ) <nl> + static char wstring [ 5 ] , mstring [ 4 ] ; <nl> + # endif <nl> <nl> / / At the first page , regenerate the XYZ strings <nl> if ( page . page = = 0 ) { <nl> strcpy ( xstring , ftostr4sign ( current_position [ X_AXIS ] ) ) ; <nl> strcpy ( ystring , ftostr4sign ( current_position [ Y_AXIS ] ) ) ; <nl> strcpy ( zstring , ftostr52sp ( current_position [ Z_AXIS ] + 0 . 00001 ) ) ; <nl> + # if ENABLED ( FILAMENT_LCD_DISPLAY ) & & DISABLED ( SDSUPPORT ) <nl> + strcpy ( wstring , ftostr12ns ( filament_width_meas ) ) ; <nl> + strcpy ( mstring , itostr3 ( 100 . 0 * volumetric_multiplier [ FILAMENT_SENSOR_EXTRUDER_NUM ] ) ) ; <nl> + # endif <nl> } <nl> <nl> if ( PAGE_CONTAINS ( XYZ_FRAME_TOP , XYZ_FRAME_TOP + XYZ_FRAME_HEIGHT - 1 ) ) { <nl> static void lcd_implementation_status_screen ( ) { <nl> u8g . setPrintPos ( 12 , 50 ) ; <nl> lcd_print ( itostr3 ( feedrate_percentage ) ) ; <nl> u8g . print ( ' % ' ) ; <nl> + <nl> + / / <nl> + / / Filament sensor display if SD is disabled <nl> + / / <nl> + # if DISABLED ( SDSUPPORT ) & & ENABLED ( FILAMENT_LCD_DISPLAY ) <nl> + u8g . setPrintPos ( 56 , 50 ) ; <nl> + lcd_print ( wstring ) ; <nl> + u8g . setPrintPos ( 102 , 50 ) ; <nl> + lcd_print ( mstring ) ; <nl> + u8g . print ( ' % ' ) ; <nl> + lcd_setFont ( FONT_MENU ) ; <nl> + u8g . setPrintPos ( 47 , 50 ) ; <nl> + lcd_print ( LCD_STR_FILAM_DIA ) ; <nl> + u8g . setPrintPos ( 93 , 50 ) ; <nl> + lcd_print ( LCD_STR_FILAM_MUL ) ; <nl> + # endif <nl> } <nl> <nl> / / <nl> static void lcd_implementation_status_screen ( ) { <nl> if ( PAGE_CONTAINS ( STATUS_BASELINE + 1 - INFO_FONT_HEIGHT , STATUS_BASELINE ) ) { <nl> u8g . setPrintPos ( 0 , STATUS_BASELINE ) ; <nl> <nl> - # if DISABLED ( FILAMENT_LCD_DISPLAY ) <nl> - lcd_print ( lcd_status_message ) ; <nl> - # else <nl> + # if ENABLED ( FILAMENT_LCD_DISPLAY ) & & ENABLED ( SDSUPPORT ) <nl> if ( PENDING ( millis ( ) , previous_lcd_status_ms + 5000UL ) ) { / / Display both Status message line and Filament display on the last line <nl> lcd_print ( lcd_status_message ) ; <nl> } <nl> else { <nl> - lcd_printPGM ( PSTR ( " dia : " ) ) ; <nl> + lcd_printPGM ( PSTR ( LCD_STR_FILAM_DIA ) ) ; <nl> + u8g . print ( ' : ' ) ; <nl> lcd_print ( ftostr12ns ( filament_width_meas ) ) ; <nl> - lcd_printPGM ( PSTR ( " factor : " ) ) ; <nl> + lcd_printPGM ( PSTR ( " " LCD_STR_FILAM_MUL ) ) ; <nl> + u8g . print ( ' : ' ) ; <nl> lcd_print ( itostr3 ( 100 . 0 * volumetric_multiplier [ FILAMENT_SENSOR_EXTRUDER_NUM ] ) ) ; <nl> u8g . print ( ' % ' ) ; <nl> } <nl> + # else <nl> + lcd_print ( lcd_status_message ) ; <nl> # endif <nl> } <nl> } <nl> mmm a / Marlin / ultralcd_impl_HD44780 . h <nl> ppp b / Marlin / ultralcd_impl_HD44780 . h <nl> void lcd_print ( char c ) { charset_mapper ( c ) ; } <nl> void lcd_erase_line ( const int line ) { <nl> lcd . setCursor ( 0 , line ) ; <nl> for ( uint8_t i = LCD_WIDTH + 1 ; - - i ; ) <nl> - lcd_print ( ' ' ) ; <nl> + lcd . print ( ' ' ) ; <nl> } <nl> <nl> / / Scroll the PSTR ' text ' in a ' len ' wide field for ' time ' milliseconds at position col , line <nl> static void lcd_implementation_status_screen ( ) { <nl> <nl> # if ENABLED ( LCD_PROGRESS_BAR ) <nl> <nl> - if ( card . isFileOpen ( ) ) { <nl> - / / Draw the progress bar if the message has shown long enough <nl> - / / or if there is no message set . <nl> - if ( ELAPSED ( millis ( ) , progress_bar_ms + PROGRESS_BAR_MSG_TIME ) | | ! lcd_status_message [ 0 ] ) <nl> - return lcd_draw_progress_bar ( card . percentDone ( ) ) ; <nl> - } / / card . isFileOpen <nl> + / / Draw the progress bar if the message has shown long enough <nl> + / / or if there is no message set . <nl> + if ( card . isFileOpen ( ) & & ELAPSED ( millis ( ) , progress_bar_ms + PROGRESS_BAR_MSG_TIME ) | | ! lcd_status_message [ 0 ] ) <nl> + return lcd_draw_progress_bar ( card . percentDone ( ) ) ; <nl> <nl> - # elif ENABLED ( FILAMENT_LCD_DISPLAY ) <nl> + # elif ENABLED ( FILAMENT_LCD_DISPLAY ) & & ENABLED ( SDSUPPORT ) <nl> <nl> / / Show Filament Diameter and Volumetric Multiplier % <nl> / / After allowing lcd_status_message to show for 5 seconds <nl> static void lcd_implementation_status_screen ( ) { <nl> return ; <nl> } <nl> <nl> - # endif / / FILAMENT_LCD_DISPLAY <nl> + # endif / / FILAMENT_LCD_DISPLAY & & SDSUPPORT <nl> <nl> lcd_print ( lcd_status_message ) ; <nl> } <nl>

Show filament width sensor values in LCD constantly if SD card support is not enabled .

MarlinFirmware/Marlin

d38b1bc4b1d6fda3f758bd972bcd226dab4c9b65

2017-03-29T09:03:08Z

new file mode 100644 <nl> index 00000000000 . . 13f769c9ca5 <nl> mmm / dev / null <nl> ppp b / ports / 3fd / CONTROL <nl> <nl> + Source : 3fd <nl> + Version : 2 . 6 . 2 <nl> + Description : C + + Framework For Fast Development <nl> + Build - Depends : boost - lockfree ( windows ) , boost - regex ( windows ) , poco ( windows ) , sqlite3 , rapidxml <nl> new file mode 100644 <nl> index 00000000000 . . 69fc60ccb6d <nl> mmm / dev / null <nl> ppp b / ports / 3fd / portfile . cmake <nl> <nl> + include ( vcpkg_common_functions ) <nl> + <nl> + # Check architecture : <nl> + if ( VCPKG_TARGET_ARCHITECTURE STREQUAL " x86 " ) <nl> + set ( BUILD_ARCH " Win32 " ) <nl> + elseif ( VCPKG_TARGET_ARCHITECTURE STREQUAL " x64 " ) <nl> + set ( BUILD_ARCH " x64 " ) <nl> + elseif ( VCPKG_TARGET_ARCHITECTURE STREQUAL " arm " ) <nl> + set ( BUILD_ARCH " ARM " ) <nl> + else ( ) <nl> + message ( FATAL_ERROR " Unsupported architecture : $ { VCPKG_TARGET_ARCHITECTURE } " ) <nl> + endif ( ) <nl> + <nl> + # Check library linkage : <nl> + if ( VCPKG_LIBRARY_LINKAGE STREQUAL " dynamic " ) <nl> + message ( " 3FD only supports static library linkage . Building static . " ) <nl> + set ( VCPKG_LIBRARY_LINKAGE static ) <nl> + endif ( ) <nl> + <nl> + # Check CRT linkage : <nl> + if ( VCPKG_CRT_LINKAGE STREQUAL " static " ) <nl> + message ( FATAL_ERROR " 3FD can only be built with dynamic linkage to CRT ! " ) <nl> + endif ( ) <nl> + <nl> + # Get source code : <nl> + vcpkg_from_github ( <nl> + OUT_SOURCE_PATH SOURCE_PATH <nl> + REPO faburaya / 3FD <nl> + REF v2 . 6 . 2 <nl> + SHA512 a2444cc07d8741540c6071ac59bc8c63785db52e412a843aa18a5dfa0144b5001d428e44bcb520238e3d476440bc74526343f025005f05d534e732645f59cbe0 <nl> + HEAD_REF master <nl> + PATCHES <nl> + " $ { CMAKE_CURRENT_LIST_DIR } / remove - seekpos . patch " <nl> + ) <nl> + <nl> + # Copy the sources to ensure a clean , out - of - source build <nl> + file ( REMOVE_RECURSE $ { CURRENT_BUILDTREES_DIR } / $ { TARGET_TRIPLET } - all ) <nl> + file ( MAKE_DIRECTORY $ { CURRENT_BUILDTREES_DIR } / $ { TARGET_TRIPLET } - all ) <nl> + file ( COPY $ { SOURCE_PATH } DESTINATION $ { CURRENT_BUILDTREES_DIR } / $ { TARGET_TRIPLET } - all ) <nl> + get_filename_component ( LAST_DIR_NAME " $ { SOURCE_PATH } " NAME ) <nl> + set ( SOURCE_PATH " $ { CURRENT_BUILDTREES_DIR } / $ { TARGET_TRIPLET } - all / $ { LAST_DIR_NAME } " ) <nl> + <nl> + # Build : <nl> + if ( VCPKG_CMAKE_SYSTEM_NAME STREQUAL " WindowsStore " ) # UWP : <nl> + vcpkg_build_msbuild ( <nl> + USE_VCPKG_INTEGRATION <nl> + PROJECT_PATH $ { SOURCE_PATH } / 3FD / 3FD . WinRT . UWP . vcxproj <nl> + PLATFORM $ { BUILD_ARCH } <nl> + ) <nl> + elseif ( NOT VCPKG_CMAKE_SYSTEM_NAME ) # Win32 : <nl> + vcpkg_build_msbuild ( <nl> + USE_VCPKG_INTEGRATION <nl> + PROJECT_PATH $ { SOURCE_PATH } / 3FD / 3FD . vcxproj <nl> + PLATFORM $ { BUILD_ARCH } <nl> + TARGET Build <nl> + ) <nl> + else ( ) <nl> + message ( FATAL_ERROR " Unsupported system : 3FD is not currently ported to VCPKG in $ { VCPKG_CMAKE_SYSTEM_NAME } ! " ) <nl> + endif ( ) <nl> + <nl> + # Install : <nl> + file ( GLOB HEADER_FILES LIST_DIRECTORIES false " $ { SOURCE_PATH } / 3FD / * . h " ) <nl> + file ( INSTALL <nl> + $ { HEADER_FILES } <nl> + DESTINATION $ { CURRENT_PACKAGES_DIR } / include / 3FD <nl> + PATTERN " * _impl * . h " EXCLUDE <nl> + PATTERN " * example * . h " EXCLUDE <nl> + PATTERN " stdafx . h " EXCLUDE <nl> + PATTERN " targetver . h " EXCLUDE <nl> + ) <nl> + <nl> + file ( INSTALL $ { SOURCE_PATH } / btree DESTINATION $ { CURRENT_PACKAGES_DIR } / include / 3FD ) <nl> + file ( INSTALL $ { SOURCE_PATH } / OpenCL / CL DESTINATION $ { CURRENT_PACKAGES_DIR } / include / 3FD ) <nl> + <nl> + file ( MAKE_DIRECTORY $ { CURRENT_PACKAGES_DIR } / share / 3FD ) <nl> + file ( INSTALL <nl> + $ { SOURCE_PATH } / 3FD / 3fd - config - template . xml <nl> + DESTINATION $ { CURRENT_PACKAGES_DIR } / share / 3FD <nl> + ) <nl> + <nl> + if ( VCPKG_CMAKE_SYSTEM_NAME STREQUAL " WindowsStore " ) # Visual C + + , UWP app : <nl> + file ( INSTALL <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Debug / 3FD . WinRT . UWP / 3FD . WinRT . UWP . lib <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Debug / 3FD . WinRT . UWP / _3FD_WinRT_UWP . pri <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Debug / WinRT . UWP / 3FD . WinRT . UWP . pdb <nl> + DESTINATION $ { CURRENT_PACKAGES_DIR } / debug / lib <nl> + ) <nl> + file ( INSTALL <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Release / 3FD . WinRT . UWP / 3FD . WinRT . UWP . lib <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Release / 3FD . WinRT . UWP / _3FD_WinRT_UWP . pri <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Release / WinRT . UWP / 3FD . WinRT . UWP . pdb <nl> + DESTINATION $ { CURRENT_PACKAGES_DIR } / lib <nl> + ) <nl> + else ( ) # Visual C + + , Win32 app : <nl> + file ( INSTALL <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Debug / 3FD . lib <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Debug / 3FD . pdb <nl> + DESTINATION $ { CURRENT_PACKAGES_DIR } / debug / lib <nl> + ) <nl> + file ( INSTALL <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Release / 3FD . lib <nl> + $ { SOURCE_PATH } / 3FD / $ { BUILD_ARCH } / Release / 3FD . pdb <nl> + DESTINATION $ { CURRENT_PACKAGES_DIR } / lib <nl> + ) <nl> + endif ( ) <nl> + <nl> + # Handle copyright <nl> + file ( INSTALL $ { SOURCE_PATH } / LICENSE DESTINATION $ { CURRENT_PACKAGES_DIR } / share / 3fd RENAME copyright ) <nl> + file ( INSTALL $ { SOURCE_PATH } / Acknowledgements . txt DESTINATION $ { CURRENT_PACKAGES_DIR } / share / 3fd ) <nl> + <nl> + vcpkg_copy_pdbs ( ) <nl> new file mode 100644 <nl> index 00000000000 . . 6c77cdc64a5 <nl> mmm / dev / null <nl> ppp b / ports / 3fd / remove - seekpos . patch <nl> <nl> + diff - - git a / 3fd / web_wws_impl_host . cpp b / 3fd / web_wws_impl_host . cpp <nl> + index b87dc75 . . 1cff45f 100644 <nl> + mmm a / 3fd / web_wws_impl_host . cpp <nl> ppp + b / 3fd / web_wws_impl_host . cpp <nl> + namespace wws <nl> + throw AppException < std : : runtime_error > ( oss . str ( ) ) ; <nl> + } <nl> + <nl> + - const auto fileSizeBytes = inputStream . seekg ( 0 , std : : ios : : end ) . tellg ( ) . seekpos ( ) ; / / move cursor to the end to get the zize <nl> + + const auto fileSizeBytes = inputStream . seekg ( 0 , std : : ios : : end ) . tellg ( ) ; / / move cursor to the end to get the zize <nl> + <nl> + / / File is not trunked : <nl> + if ( fileSizeBytes > 0 ) <nl> mmm a / scripts / cmake / vcpkg_build_msbuild . cmake <nl> ppp b / scripts / cmake / vcpkg_build_msbuild . cmake <nl> <nl> # # [ OPTIONS < / p : ZLIB_INCLUDE_PATH = X > . . . ] <nl> # # [ OPTIONS_RELEASE < / p : ZLIB_LIB = X > . . . ] <nl> # # [ OPTIONS_DEBUG < / p : ZLIB_LIB = X > . . . ] <nl> + # # [ USE_VCPKG_INTEGRATION ] <nl> # # ) <nl> # # ` ` ` <nl> # # <nl> function ( vcpkg_build_msbuild ) <nl> endif ( ) <nl> <nl> if ( _csc_USE_VCPKG_INTEGRATION ) <nl> - list ( APPEND _csc_OPTIONS / p : ForceImportBeforeCppTargets = $ { VCPKG_ROOT_DIR } / scripts / buildsystems / msbuild / vcpkg . targets ) <nl> + list ( <nl> + APPEND _csc_OPTIONS <nl> + / p : ForceImportBeforeCppTargets = $ { VCPKG_ROOT_DIR } / scripts / buildsystems / msbuild / vcpkg . targets <nl> + " / p : VcpkgTriplet = $ { TARGET_TRIPLET } " <nl> + ) <nl> endif ( ) <nl> <nl> if ( NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL " release " ) <nl>

[ 3fd ] Initial port of 3FD project ( )

microsoft/vcpkg

4ebdbe7e88ad93423e9d0d75eb066ecf8ab5fcad

2018-07-03T13:39:13Z

mmm a / UnitTests / HttpInterface / rest - edge - spec . rb <nl> ppp b / UnitTests / HttpInterface / rest - edge - spec . rb <nl> <nl> <nl> context " known collection name : " do <nl> before do <nl> - @ cn = " UnitTestsCollectionEdge " <nl> - @ cid = ArangoDB . create_collection ( @ cn , true , 3 ) # type 3 = edge collection <nl> + @ ce = " UnitTestsCollectionEdge " <nl> + @ eid = ArangoDB . create_collection ( @ ce , true , 3 ) # type 3 = edge collection <nl> + @ cv = " UnitTestsCollectionVertex " <nl> + @ vid = ArangoDB . create_collection ( @ cv , true , 2 ) # type 2 = document collection <nl> end <nl> <nl> after do <nl> - ArangoDB . drop_collection ( @ cn ) <nl> + ArangoDB . drop_collection ( @ ce ) <nl> + ArangoDB . drop_collection ( @ cv ) <nl> end <nl> <nl> it " creating an edge " do <nl> - cmd = " / _api / document ? collection = # { @ cid } " <nl> + cmd = " / _api / document ? collection = # { @ vid } " <nl> <nl> # create first vertex <nl> body = " { \ " a \ " : 1 } " <nl> <nl> id2 = doc . parsed_response [ ' _id ' ] <nl> <nl> # create edge <nl> - cmd = " / _api / edge ? collection = # { @ cid } & from = # { id1 } & to = # { id2 } " <nl> + cmd = " / _api / edge ? collection = # { @ eid } & from = # { id1 } & to = # { id2 } " <nl> body = " { } " <nl> doc = ArangoDB . log_post ( " # { prefix } - create - edge " , cmd , : body = > body ) <nl> <nl> <nl> doc . headers [ ' content - type ' ] . should eq ( " application / json ; charset = utf - 8 " ) <nl> <nl> # create another edge <nl> - cmd = " / _api / edge ? collection = # { @ cid } & from = # { id1 } & to = # { id2 } " <nl> + cmd = " / _api / edge ? collection = # { @ eid } & from = # { id1 } & to = # { id2 } " <nl> body = " { \ " e \ " : 1 } " <nl> doc = ArangoDB . log_post ( " # { prefix } - create - edge " , cmd , : body = > body ) <nl> <nl> <nl> doc . headers [ ' content - type ' ] . should eq ( " application / json ; charset = utf - 8 " ) <nl> <nl> # create third edge <nl> - cmd = " / _api / edge ? collection = # { @ cid } & from = # { id2 } & to = # { id1 } " <nl> + cmd = " / _api / edge ? collection = # { @ eid } & from = # { id2 } & to = # { id1 } " <nl> body = " { \ " e \ " : 2 } " <nl> doc = ArangoDB . log_post ( " # { prefix } - create - edge " , cmd , : body = > body ) <nl> <nl> <nl> doc . headers [ ' content - type ' ] . should eq ( " application / json ; charset = utf - 8 " ) <nl> <nl> # check ANY edges <nl> - cmd = " / _api / edges / # { @ cid } ? vertex = # { id1 } " <nl> + cmd = " / _api / edges / # { @ eid } ? vertex = # { id1 } " <nl> doc = ArangoDB . log_get ( " # { prefix } - read - edges - any " , cmd ) ; <nl> <nl> doc . code . should eq ( 200 ) <nl> <nl> doc . parsed_response [ ' edges ' ] . length . should be ( 3 ) <nl> <nl> # check IN edges <nl> - cmd = " / _api / edges / # { @ cid } ? vertex = # { id1 } & direction = in " <nl> + cmd = " / _api / edges / # { @ eid } ? vertex = # { id1 } & direction = in " <nl> doc = ArangoDB . log_get ( " # { prefix } - read - edges - in " , cmd ) ; <nl> <nl> doc . code . should eq ( 200 ) <nl> <nl> doc . parsed_response [ ' edges ' ] . length . should be ( 1 ) <nl> <nl> # check OUT edges <nl> - cmd = " / _api / edges / # { @ cid } ? vertex = # { id1 } & direction = out " <nl> + cmd = " / _api / edges / # { @ eid } ? vertex = # { id1 } & direction = out " <nl> doc = ArangoDB . log_get ( " # { prefix } - read - edges - out " , cmd ) ; <nl> <nl> doc . code . should eq ( 200 ) <nl> mmm a / arangod / RestHandler / RestDocumentHandler . cpp <nl> ppp b / arangod / RestHandler / RestDocumentHandler . cpp <nl> bool RestDocumentHandler : : createDocument ( ) { <nl> } <nl> <nl> / / find and load collection given by name or identifier <nl> - int res = useCollection ( collection , create ) ; <nl> + int res = useCollection ( collection , getCollectionType ( ) , create ) ; <nl> <nl> if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - releaseCollection ( ) ; <nl> return false ; <nl> } <nl> <nl> bool RestDocumentHandler : : createDocument ( ) { <nl> / / outside write transaction <nl> / / . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . <nl> <nl> - / / release collection and free json <nl> + / / release collection <nl> releaseCollection ( ) ; <nl> <nl> / / generate result <nl> bool RestDocumentHandler : : readSingleDocument ( bool generateBody ) { <nl> string collection = suffix [ 0 ] ; <nl> string did = suffix [ 1 ] ; <nl> <nl> - / / find and load collection given by name oder identifier <nl> - int res = useCollection ( collection ) ; <nl> + / / find and load collection given by name or identifier <nl> + int res = useCollection ( collection , getCollectionType ( ) ) ; <nl> <nl> if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - releaseCollection ( ) ; <nl> return false ; <nl> } <nl> <nl> bool RestDocumentHandler : : readSingleDocument ( bool generateBody ) { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> bool RestDocumentHandler : : readAllDocuments ( ) { <nl> - <nl> / / extract the cid <nl> bool found ; <nl> string collection = _request - > value ( " collection " , found ) ; <nl> <nl> - / / find and load collection given by name oder identifier <nl> - int res = useCollection ( collection ) ; <nl> + / / find and load collection given by name or identifier <nl> + int res = useCollection ( collection , getCollectionType ( ) ) ; <nl> <nl> if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - releaseCollection ( ) ; <nl> return false ; <nl> } <nl> <nl> bool RestDocumentHandler : : modifyDocument ( bool isPatch ) { <nl> / / extract or chose the update policy <nl> TRI_doc_update_policy_e policy = extractUpdatePolicy ( ) ; <nl> <nl> - / / find and load collection given by name oder identifier <nl> - int res = useCollection ( collection ) ; <nl> + / / find and load collection given by name or identifier <nl> + int res = useCollection ( collection , getCollectionType ( ) ) ; <nl> <nl> if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - releaseCollection ( ) ; <nl> return false ; <nl> } <nl> <nl> bool RestDocumentHandler : : deleteDocument ( ) { <nl> return false ; <nl> } <nl> <nl> - / / find and load collection given by name oder identifier <nl> - int res = useCollection ( collection ) ; <nl> + / / find and load collection given by name or identifier <nl> + int res = useCollection ( collection , getCollectionType ( ) ) ; <nl> <nl> if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - releaseCollection ( ) ; <nl> return false ; <nl> } <nl> <nl> mmm a / arangod / RestHandler / RestDocumentHandler . h <nl> ppp b / arangod / RestHandler / RestDocumentHandler . h <nl> namespace triagens { <nl> <nl> protected : <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief get collection type <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + virtual TRI_col_type_e getCollectionType ( ) const { <nl> + return TRI_COL_TYPE_SIMPLE_DOCUMENT ; <nl> + } <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief creates a document <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> namespace triagens { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> virtual bool checkDocument ( ) ; <nl> + <nl> } ; <nl> } <nl> } <nl> mmm a / arangod / RestHandler / RestEdgeHandler . cpp <nl> ppp b / arangod / RestHandler / RestEdgeHandler . cpp <nl> bool RestEdgeHandler : : createDocument ( ) { <nl> } <nl> <nl> / / find and load collection given by name or identifier <nl> - int res = useCollection ( collection , create ) ; <nl> + int res = useCollection ( collection , getCollectionType ( ) , create ) ; <nl> <nl> if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - releaseCollection ( ) ; <nl> return false ; <nl> } <nl> <nl> mmm a / arangod / RestHandler / RestEdgeHandler . h <nl> ppp b / arangod / RestHandler / RestEdgeHandler . h <nl> namespace triagens { <nl> / / - - SECTION - - protected methods <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ addtogroup ArangoDB <nl> + / / / @ { <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + protected : <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief get collection type <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + virtual TRI_col_type_e getCollectionType ( ) const { <nl> + return TRI_COL_TYPE_SIMPLE_EDGE ; <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ } <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + / / - - SECTION - - private methods <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ addtogroup ArangoDB <nl> / / / @ { <nl> mmm a / arangod / RestHandler / RestImportHandler . cpp <nl> ppp b / arangod / RestHandler / RestImportHandler . cpp <nl> bool RestImportHandler : : createByArray ( ) { <nl> bool reuseId = found ? StringUtils : : boolean ( valueStr ) : false ; <nl> <nl> / / find and load collection given by name or identifier <nl> - int res = useCollection ( collection , create ) ; <nl> + int res = useCollection ( collection , TRI_COL_TYPE_SIMPLE_DOCUMENT , create ) ; <nl> <nl> if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - releaseCollection ( ) ; <nl> - <nl> / / error is already generated by useCollection ! <nl> return false ; <nl> } <nl> bool RestImportHandler : : createByList ( ) { <nl> } <nl> <nl> / / find and load collection given by name or identifier <nl> - int res = useCollection ( collection , create ) ; <nl> + int res = useCollection ( collection , TRI_COL_TYPE_SIMPLE_DOCUMENT , create ) ; <nl> <nl> if ( res ! = TRI_ERROR_NO_ERROR ) { <nl> - releaseCollection ( ) ; <nl> - <nl> if ( keys ) { <nl> TRI_FreeJson ( TRI_UNKNOWN_MEM_ZONE , keys ) ; <nl> } <nl> mmm a / arangod / RestHandler / RestVocbaseBaseHandler . cpp <nl> ppp b / arangod / RestHandler / RestVocbaseBaseHandler . cpp <nl> TRI_doc_update_policy_e RestVocbaseBaseHandler : : extractUpdatePolicy ( ) { <nl> } <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief uses a collection , loading or manifesting and locking it <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - <nl> - int RestVocbaseBaseHandler : : useCollection ( string const & name , bool create ) { <nl> - _collection = 0 ; <nl> - _documentCollection = 0 ; <nl> - <nl> - / / sanity check <nl> - if ( name . empty ( ) ) { <nl> - generateError ( HttpResponse : : BAD , <nl> - TRI_ERROR_HTTP_CORRUPTED_JSON , <nl> - " collection identifier is empty " ) ; <nl> - return TRI_set_errno ( TRI_ERROR_HTTP_CORRUPTED_JSON ) ; <nl> - } <nl> - <nl> - / / try to find the collection <nl> - if ( isdigit ( name [ 0 ] ) ) { <nl> - TRI_voc_cid_t id = StringUtils : : uint64 ( name ) ; <nl> - <nl> - _collection = TRI_LookupCollectionByIdVocBase ( _vocbase , id ) ; <nl> - } <nl> - else { <nl> - _collection = TRI_FindCollectionByNameVocBase ( _vocbase , name . c_str ( ) , create ) ; <nl> - } <nl> - <nl> - if ( _collection = = 0 ) { <nl> - generateCollectionNotFound ( name ) ; <nl> - return TRI_set_errno ( TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND ) ; <nl> - } <nl> - <nl> - / / and use the collection <nl> - int res = TRI_UseCollectionVocBase ( _vocbase , const_cast < TRI_vocbase_col_s * > ( _collection ) ) ; <nl> - <nl> - if ( res = = TRI_ERROR_NO_ERROR ) { <nl> - _documentCollection = _collection - > _collection ; <nl> - assert ( _documentCollection ! = 0 ) ; <nl> - } <nl> - <nl> - return res ; <nl> - } <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief releases a collection <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> int RestVocbaseBaseHandler : : parseDocumentId ( string const & handle , <nl> return TRI_errno ( ) ; <nl> } <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief uses a collection , loading or manifesting and locking it <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + int RestVocbaseBaseHandler : : useCollection ( string const & name , <nl> + TRI_col_type_e type , <nl> + bool create ) { <nl> + _collection = 0 ; <nl> + _documentCollection = 0 ; <nl> + <nl> + / / sanity check <nl> + if ( name . empty ( ) ) { <nl> + generateError ( HttpResponse : : BAD , <nl> + TRI_ERROR_HTTP_CORRUPTED_JSON , <nl> + " collection identifier is empty " ) ; <nl> + return TRI_set_errno ( TRI_ERROR_HTTP_CORRUPTED_JSON ) ; <nl> + } <nl> + <nl> + / / try to find the collection <nl> + if ( isdigit ( name [ 0 ] ) ) { <nl> + TRI_voc_cid_t id = StringUtils : : uint64 ( name ) ; <nl> + <nl> + _collection = TRI_LookupCollectionByIdVocBase ( _vocbase , id ) ; <nl> + } <nl> + else { <nl> + if ( type = = TRI_COL_TYPE_SIMPLE_DOCUMENT ) { <nl> + _collection = TRI_FindDocumentCollectionByNameVocBase ( _vocbase , name . c_str ( ) , create ) ; <nl> + } <nl> + else if ( type = = TRI_COL_TYPE_SIMPLE_EDGE ) { <nl> + _collection = TRI_FindEdgeCollectionByNameVocBase ( _vocbase , name . c_str ( ) , create ) ; <nl> + } <nl> + } <nl> + <nl> + if ( _collection = = 0 ) { <nl> + generateCollectionNotFound ( name ) ; <nl> + return TRI_set_errno ( TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND ) ; <nl> + } <nl> + <nl> + / / and use the collection <nl> + int res = TRI_UseCollectionVocBase ( _vocbase , const_cast < TRI_vocbase_col_s * > ( _collection ) ) ; <nl> + <nl> + if ( res = = TRI_ERROR_NO_ERROR ) { <nl> + assert ( _collection ! = 0 ) ; <nl> + <nl> + _documentCollection = _collection - > _collection ; <nl> + assert ( _documentCollection ! = 0 ) ; <nl> + } <nl> + <nl> + return res ; <nl> + } <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ } <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> mmm a / arangod / RestHandler / RestVocbaseBaseHandler . h <nl> ppp b / arangod / RestHandler / RestVocbaseBaseHandler . h <nl> namespace triagens { <nl> TRI_doc_update_policy_e extractUpdatePolicy ( ) ; <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief creates or loads a collection <nl> + / / / @ brief creates or loads an edge collection <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - int useCollection ( string const & name , bool create = false ) ; <nl> + int useEdgeCollection ( string const & name , bool create = false ) ; <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief releases a collection <nl> namespace triagens { <nl> TRI_voc_cid_t & cid , <nl> TRI_voc_did_t & did ) ; <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief creates or loads a collection <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + int useCollection ( string const & name , TRI_col_type_e type , bool create = false ) ; <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ } <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> mmm a / arangod / VocBase / document - collection . c <nl> ppp b / arangod / VocBase / document - collection . c <nl> static TRI_doc_mptr_t CreateJson ( TRI_doc_collection_t * collection , <nl> TRI_doc_mptr_t result ; <nl> TRI_voc_did_t did = 0 ; <nl> TRI_voc_rid_t rid = 0 ; <nl> - <nl> + <nl> shaped = TRI_ShapedJsonJson ( collection - > _shaper , json ) ; <nl> <nl> if ( shaped = = 0 ) { <nl> mmm a / arangod / VocBase / vocbase . c <nl> ppp b / arangod / VocBase / vocbase . c <nl> static int ScanPath ( TRI_vocbase_t * vocbase , char const * path ) { <nl> / / / @ brief bears a new collection or returns an existing one by name <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - static TRI_vocbase_col_t * BearCollectionVocBase ( TRI_vocbase_t * vocbase , char const * name ) { <nl> + static TRI_vocbase_col_t * BearCollectionVocBase ( TRI_vocbase_t * vocbase , <nl> + char const * name , <nl> + TRI_col_type_e type ) { <nl> union { void const * v ; TRI_vocbase_col_t * c ; } found ; <nl> TRI_vocbase_col_t * collection ; <nl> TRI_col_parameter_t parameter ; <nl> static TRI_vocbase_col_t * BearCollectionVocBase ( TRI_vocbase_t * vocbase , char co <nl> } <nl> <nl> / / create a new collection <nl> - collection = AddCollection ( vocbase , TRI_COL_TYPE_SIMPLE_DOCUMENT , name , TRI_NewTickVocBase ( ) , NULL ) ; <nl> + collection = AddCollection ( vocbase , type , name , TRI_NewTickVocBase ( ) , NULL ) ; <nl> <nl> if ( collection = = NULL ) { <nl> TRI_WRITE_UNLOCK_COLLECTIONS_VOCBASE ( vocbase ) ; <nl> static int ManifestCollectionVocBase ( TRI_vocbase_t * vocbase , TRI_vocbase_col_t * <nl> } <nl> } <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief finds a collection by name or creates it <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + static TRI_vocbase_col_t * FindCollectionByNameVocBase ( TRI_vocbase_t * vocbase , <nl> + char const * name , <nl> + bool bear , <nl> + TRI_col_type_e type ) { <nl> + union { void const * v ; TRI_vocbase_col_t * c ; } found ; <nl> + <nl> + TRI_READ_LOCK_COLLECTIONS_VOCBASE ( vocbase ) ; <nl> + found . v = TRI_LookupByKeyAssociativePointer ( & vocbase - > _collectionsByName , name ) ; <nl> + TRI_READ_UNLOCK_COLLECTIONS_VOCBASE ( vocbase ) ; <nl> + <nl> + if ( found . v ! = NULL ) { <nl> + return found . c ; <nl> + } <nl> + <nl> + if ( ! bear ) { <nl> + TRI_set_errno ( TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND ) ; <nl> + return NULL ; <nl> + } <nl> + <nl> + return BearCollectionVocBase ( vocbase , name , type ) ; <nl> + } <nl> + <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief loads an existing ( document ) collection <nl> / / / <nl> TRI_vocbase_col_t * TRI_LookupCollectionByIdVocBase ( TRI_vocbase_t * vocbase , TRI_ <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief finds a ( document ) collection by name <nl> + / / / @ brief finds a collection by name <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> TRI_vocbase_col_t * TRI_FindCollectionByNameVocBase ( TRI_vocbase_t * vocbase , char const * name , bool bear ) { <nl> - union { void const * v ; TRI_vocbase_col_t * c ; } found ; <nl> + return TRI_FindDocumentCollectionByNameVocBase ( vocbase , name , bear ) ; <nl> + } <nl> <nl> - TRI_READ_LOCK_COLLECTIONS_VOCBASE ( vocbase ) ; <nl> - found . v = TRI_LookupByKeyAssociativePointer ( & vocbase - > _collectionsByName , name ) ; <nl> - TRI_READ_UNLOCK_COLLECTIONS_VOCBASE ( vocbase ) ; <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief finds a document collection by name <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - if ( found . v ! = NULL ) { <nl> - return found . c ; <nl> - } <nl> + TRI_vocbase_col_t * TRI_FindDocumentCollectionByNameVocBase ( TRI_vocbase_t * vocbase , char const * name , bool bear ) { <nl> + return FindCollectionByNameVocBase ( vocbase , name , bear , TRI_COL_TYPE_SIMPLE_DOCUMENT ) ; <nl> + } <nl> <nl> - if ( ! bear ) { <nl> - TRI_set_errno ( TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND ) ; <nl> - return NULL ; <nl> - } <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief finds an edge collection by name <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> - return BearCollectionVocBase ( vocbase , name ) ; <nl> + TRI_vocbase_col_t * TRI_FindEdgeCollectionByNameVocBase ( TRI_vocbase_t * vocbase , char const * name , bool bear ) { <nl> + return FindCollectionByNameVocBase ( vocbase , name , bear , TRI_COL_TYPE_SIMPLE_EDGE ) ; <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> mmm a / arangod / VocBase / vocbase . h <nl> ppp b / arangod / VocBase / vocbase . h <nl> TRI_vocbase_col_t * TRI_LookupCollectionByNameVocBase ( TRI_vocbase_t * , char const <nl> TRI_vocbase_col_t * TRI_LookupCollectionByIdVocBase ( TRI_vocbase_t * , TRI_voc_cid_t ) ; <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / / @ brief finds a ( document ) collection by name <nl> + / / / @ brief finds a collection by name <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> TRI_vocbase_col_t * TRI_FindCollectionByNameVocBase ( TRI_vocbase_t * , char const * , bool bear ) ; <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief finds a document collection by name <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + TRI_vocbase_col_t * TRI_FindDocumentCollectionByNameVocBase ( TRI_vocbase_t * , char const * , bool bear ) ; <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief finds an edge collection by name <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + TRI_vocbase_col_t * TRI_FindEdgeCollectionByNameVocBase ( TRI_vocbase_t * , char const * , bool bear ) ; <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief creates a new ( document ) collection from parameter set <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl>

issue

arangodb/arangodb

ed395ab8ce3c2257ee47ae49c40809c298a1efe1

2012-08-28T11:06:04Z

new file mode 100644 <nl> index 00000000000 . . 811ee2ee7ec <nl> mmm / dev / null <nl> ppp b / src / rdb_protocol / err . hpp <nl> <nl> + # include < list > <nl> + # include < string > <nl> + <nl> + # include " utils . hpp " <nl> + <nl> + # include " rdb_protocol / ql2 . pb . h " <nl> + <nl> + # ifndef RDB_PROTOCOL_ERR_HPP_ <nl> + # define RDB_PROTOCOL_ERR_HPP_ <nl> + namespace ql { <nl> + <nl> + void _runtime_check ( const char * test , const char * file , int line , <nl> + bool pred , std : : string msg = " " ) ; <nl> + # define rcheck ( pred , msg ) \ <nl> + _runtime_check ( stringify ( pred ) , __FILE__ , __LINE__ , pred , msg ) <nl> + / / TODO : do something smarter ? <nl> + # define rfail ( args . . . ) rcheck ( false , strprintf ( args ) ) <nl> + / / TODO : make this crash in debug mode <nl> + # define r_sanity_check ( test ) rcheck ( test , " SANITY_CHECK " ) <nl> + <nl> + struct backtrace_t { <nl> + struct frame_t { <nl> + public : <nl> + frame_t ( int _pos ) : type ( POS ) , pos ( _pos ) { } <nl> + frame_t ( const std : : string & _opt ) : type ( OPT ) , opt ( _opt ) { } <nl> + Response2_Frame toproto ( ) const ; <nl> + private : <nl> + enum type_t { POS = 0 , OPT = 1 } ; <nl> + type_t type ; <nl> + int pos ; <nl> + std : : string opt ; <nl> + } ; <nl> + std : : list < frame_t > frames ; <nl> + } ; <nl> + <nl> + class exc_t : public std : : exception { <nl> + public : <nl> + exc_t ( const std : : string & _msg ) : msg ( _msg ) { } <nl> + virtual ~ exc_t ( ) throw ( ) { } <nl> + backtrace_t backtrace ; <nl> + const char * what ( ) const throw ( ) { return msg . c_str ( ) ; } <nl> + private : <nl> + const std : : string msg ; <nl> + } ; <nl> + <nl> + void fill_error ( Response2 * res , Response2_ResponseType type , std : : string msg , <nl> + const backtrace_t & bt = backtrace_t ( ) ) ; <nl> + <nl> + } <nl> + # endif / / RDB_PROTOCOL_ERR_HPP_ <nl> mmm a / src / rdb_protocol / term . cc <nl> ppp b / src / rdb_protocol / term . cc <nl> val_t * term_t : : eval ( bool _use_cached_val ) { <nl> } <nl> <nl> val_t * term_t : : new_val ( datum_t * d ) { return env - > add_and_ret ( d , this ) ; } <nl> + val_t * term_t : : new_val ( datum_stream_t * s ) { return env - > add_and_ret ( s , this ) ; } <nl> val_t * term_t : : new_val ( uuid_t db ) { return env - > add_and_ret ( db , this ) ; } <nl> val_t * term_t : : new_val ( table_t * t ) { return env - > add_and_ret ( t , this ) ; } <nl> val_t * term_t : : new_val ( func_t * f ) { return env - > add_and_ret ( f , this ) ; } <nl> mmm a / src / rdb_protocol / term . hpp <nl> ppp b / src / rdb_protocol / term . hpp <nl> <nl> <nl> namespace ql { <nl> class env_t ; <nl> + class datum_stream_t ; <nl> class func_t ; <nl> class val_t ; <nl> class table_t ; <nl> class term_t { <nl> val_t * eval ( bool _use_cached_val ) ; <nl> <nl> val_t * new_val ( datum_t * d ) ; <nl> + val_t * new_val ( datum_stream_t * s ) ; <nl> val_t * new_val ( uuid_t db ) ; <nl> val_t * new_val ( table_t * t ) ; <nl> val_t * new_val ( func_t * f ) ; <nl> new file mode 100644 <nl> index 00000000000 . . d5e54b4a459 <nl> mmm / dev / null <nl> ppp b / src / rdb_protocol / terms / db_table . hpp <nl> <nl> + # include " rdb_protocol / op . hpp " <nl> + namespace ql { <nl> + class db_term_t : public op_term_t { <nl> + public : <nl> + db_term_t ( env_t * env , const Term2 * term ) : op_term_t ( env , term , argspec_t ( 1 ) ) { } <nl> + private : <nl> + virtual val_t * eval_impl ( ) { <nl> + std : : string name = arg ( 0 ) - > as_datum ( ) - > as_str ( ) ; <nl> + return new_val ( get_db_uuid ( env , name ) ) ; <nl> + } <nl> + RDB_NAME ( " DB " ) <nl> + } ; <nl> + <nl> + <nl> + static const char * const table_optargs [ ] = { " use_outdated " } ; <nl> + class table_term_t : public op_term_t { <nl> + public : <nl> + table_term_t ( env_t * env , const Term2 * term ) <nl> + : op_term_t ( env , term , argspec_t ( 2 ) , LEGAL_OPTARGS ( table_optargs ) ) { } <nl> + private : <nl> + virtual val_t * eval_impl ( ) { <nl> + val_t * t = optarg ( " use_outdated " , 0 ) ; <nl> + bool use_outdated = t ? t - > as_datum ( ) - > as_bool ( ) : false ; <nl> + uuid_t db = arg ( 0 ) - > as_db ( ) ; <nl> + std : : string name = arg ( 1 ) - > as_datum ( ) - > as_str ( ) ; <nl> + return new_val ( new table_t ( env , db , name , use_outdated ) ) ; <nl> + } <nl> + RDB_NAME ( " table " ) <nl> + } ; <nl> + <nl> + } <nl> mmm a / src / rdb_protocol / transform_visitors . cc <nl> ppp b / src / rdb_protocol / transform_visitors . cc <nl> void transform_visitor_t : : operator ( ) ( Builtin_Range range ) const { <nl> } <nl> } <nl> <nl> - void transform_visitor_t : : operator ( ) ( ql : : wire_func_t & func ) const { <nl> + void transform_visitor_t : : operator ( ) ( UNUSED ql : : wire_func_t & func ) const { <nl> + / * <nl> ql : : func_t * f = func . compile ( ql_env ) ; <nl> ql : : datum_t arg ( json ) ; <nl> std : : vector < ql : : datum_t * > args ; <nl> args . push_back ( & arg ) ; <nl> ql : : val_t * v = f - > call ( args ) ; <nl> out - > push_back ( v - > as_datum ( ) - > as_json ( ) ) ; <nl> + * / <nl> } <nl> <nl> terminal_initializer_visitor_t : : terminal_initializer_visitor_t ( rget_read_response_t : : result_t * _out , <nl> mmm a / src / rdb_protocol / val . cc <nl> ppp b / src / rdb_protocol / val . cc <nl> datum_stream_t : : datum_stream_t ( env_t * _env , bool use_outdated , <nl> { } <nl> <nl> datum_stream_t : : datum_stream_t ( datum_stream_t * src , func_t * f ) <nl> - : env ( src - > env ) , json_stream ( src - > json_stream ) { <nl> - query_language : : scopes_t _s ; <nl> - query_language : : backtrace_t _b ; <nl> - rdb_protocol_details : : transform_variant_t trans ( wire_func_t ( env , f ) ) ; <nl> - json_stream = json_stream - > add_transformation ( trans , 0 , env , _s , _b ) ; <nl> + : env ( src - > env ) , trans ( wire_func_t ( env , f ) ) { <nl> + json_stream = src - > json_stream ; <nl> + / / json_stream = src - > json_stream - > add_transformation ( trans , 0 , env , _s , _b ) ; <nl> } <nl> <nl> const datum_t * datum_stream_t : : next ( ) { <nl> val_t : : val_t ( const datum_t * _datum , const term_t * _parent ) <nl> : type ( type_t : : DATUM ) , datum ( _datum ) , parent ( _parent ) { <nl> guarantee ( _datum ) ; <nl> } <nl> + val_t : : val_t ( datum_stream_t * _sequence , const term_t * _parent ) <nl> + : type ( type_t : : SEQUENCE ) , sequence ( _sequence ) , parent ( _parent ) { <nl> + guarantee ( _sequence ) ; <nl> + } <nl> val_t : : val_t ( table_t * _table , const term_t * _parent ) <nl> : type ( type_t : : TABLE ) , table ( _table ) , parent ( _parent ) { <nl> guarantee ( _table ) ; <nl> val_t : : val_t ( uuid_t _db , const term_t * _parent ) <nl> } <nl> val_t : : val_t ( func_t * _func , const term_t * _parent ) <nl> : type ( type_t : : FUNC ) , func ( _func ) , parent ( _parent ) { <nl> + guarantee ( _func ) ; <nl> } <nl> <nl> uuid_t get_db_uuid ( env_t * env , const std : : string & dbs ) { <nl> mmm a / src / rdb_protocol / val . hpp <nl> ppp b / src / rdb_protocol / val . hpp <nl> class datum_stream_t { <nl> / / We have to do a const_cast here to make bosot happy <nl> void register_data ( const datum_t * d ) { data . push_back ( const_cast < datum_t * > ( d ) ) ; } <nl> boost : : ptr_vector < datum_t > data ; <nl> + <nl> + rdb_protocol_details : : transform_variant_t trans ; <nl> + query_language : : scopes_t _s ; <nl> + query_language : : backtrace_t _b ; <nl> } ; <nl> <nl> class table_t { <nl> class val_t { <nl> type_t get_type ( ) const ; <nl> <nl> val_t ( const datum_t * _datum , const term_t * _parent ) ; <nl> + val_t ( datum_stream_t * _sequence , const term_t * _parent ) ; <nl> val_t ( table_t * _table , const term_t * _parent ) ; <nl> val_t ( uuid_t _db , const term_t * _parent ) ; <nl> val_t ( func_t * _func , const term_t * _parent ) ; <nl> mmm a / src / rpc / mailbox / typed . hpp <nl> ppp b / src / rpc / mailbox / typed . hpp <nl> <nl> # ifndef RPC_MAILBOX_TYPED_HPP_ <nl> # define RPC_MAILBOX_TYPED_HPP_ <nl> <nl> - / * This file is automatically generated by ' scripts / generate_rpc_templates . py ' . <nl> - Please modify ' scripts / generate_rpc_templates . py ' instead of modifying this file . * / <nl> + / * This file is automatically generated by ' . . / scripts / generate_rpc_templates . py ' . <nl> + Please modify ' . . / scripts / generate_rpc_templates . py ' instead of modifying this file . * / <nl> <nl> # include " errors . hpp " <nl> # include < boost / bind . hpp > <nl>

1

rethinkdb/rethinkdb

d58834ea3cdf8140367486ea23e64d1b858b3cdc

2013-01-02T22:30:11Z

mmm a / xbmc / addons / GUIViewStateAddonBrowser . cpp <nl> ppp b / xbmc / addons / GUIViewStateAddonBrowser . cpp <nl> CGUIViewStateAddonBrowser : : CGUIViewStateAddonBrowser ( const CFileItemList & items ) <nl> } <nl> SetViewAsControl ( DEFAULT_VIEW_AUTO ) ; <nl> <nl> - SetSortOrder ( SortOrderAscending ) ; <nl> LoadViewState ( items . GetPath ( ) , WINDOW_ADDON_BROWSER ) ; <nl> } <nl> <nl> mmm a / xbmc / filesystem / AddonsDirectory . cpp <nl> ppp b / xbmc / filesystem / AddonsDirectory . cpp <nl> bool CAddonsDirectory : : GetDirectory ( const CURL & url , CFileItemList & items ) <nl> if ( ! GetRecentlyUpdatedAddons ( addons ) ) <nl> return false ; <nl> <nl> - std : : sort ( addons . begin ( ) , addons . end ( ) , <nl> - [ ] ( const AddonPtr & a , const AddonPtr & b ) { return a - > LastUpdated ( ) > b - > LastUpdated ( ) ; } ) ; <nl> - <nl> CAddonsDirectory : : GenerateAddonListing ( path , addons , items , g_localizeStrings . Get ( 24004 ) ) ; <nl> return true ; <nl> <nl>

Merge pull request from tamland / fix_addons_sortorder

xbmc/xbmc

207db6afbb39934677f089ec116240ecb5f5b612

2016-07-02T17:03:44Z

mmm a / tensorflow / python / grappler / layout_optimizer_test . py <nl> ppp b / tensorflow / python / grappler / layout_optimizer_test . py <nl> <nl> from __future__ import division <nl> from __future__ import print_function <nl> <nl> + import numpy as np <nl> + <nl> from tensorflow . core . protobuf import config_pb2 <nl> from tensorflow . core . protobuf import rewriter_config_pb2 <nl> + from tensorflow . core . protobuf import saver_pb2 <nl> from tensorflow . python . client import session <nl> from tensorflow . python . framework import constant_op <nl> from tensorflow . python . framework import dtypes <nl> <nl> from tensorflow . python . ops import math_ops <nl> from tensorflow . python . ops import nn <nl> from tensorflow . python . ops import random_ops <nl> + from tensorflow . python . ops import variables <nl> from tensorflow . python . platform import test <nl> from tensorflow . python . training import gradient_descent <nl> - from tensorflow . python . training import saver <nl> + from tensorflow . python . training import saver as saver_lib <nl> <nl> <nl> def weight ( shape ) : <nl> def loop ( ) : <nl> return outputs <nl> <nl> <nl> - def get_config ( ) : <nl> + def get_config ( layout_optimizer = True ) : <nl> rewrite_options = rewriter_config_pb2 . RewriterConfig ( <nl> - optimize_tensor_layout = True ) <nl> + optimize_tensor_layout = layout_optimizer ) <nl> graph_options = config_pb2 . GraphOptions ( <nl> rewrite_options = rewrite_options , build_cost_model = 1 ) <nl> config = config_pb2 . ConfigProto ( graph_options = graph_options ) <nl> def get_config ( ) : <nl> class LayoutOptimizerTest ( test . TestCase ) : <nl> " " " Tests the Grappler layout optimizer . " " " <nl> <nl> + def _train ( self , checkpoint_path , layout_optimizer = False , restore = False ) : <nl> + ops . reset_default_graph ( ) <nl> + graph = ops . get_default_graph ( ) <nl> + with session . Session ( <nl> + config = get_config ( layout_optimizer ) , graph = graph ) as sess : <nl> + batch = 2 <nl> + height = 6 <nl> + width = 7 <nl> + input_channels = 3 <nl> + shape = [ batch , height , width , input_channels ] <nl> + image = array_ops . placeholder ( dtype = ' float32 ' , shape = shape ) <nl> + conv1 = conv_layers . conv2d ( image , 32 , [ 3 , 3 ] ) <nl> + conv2 = conv_layers . conv2d ( conv1 , 32 , [ 3 , 3 ] ) <nl> + optimizer = gradient_descent . GradientDescentOptimizer ( 0 . 01 ) <nl> + loss = math_ops . reduce_mean ( conv2 ) <nl> + train_op = optimizer . minimize ( loss ) <nl> + saver = saver_lib . Saver ( write_version = saver_pb2 . SaverDef . V2 ) <nl> + <nl> + if restore : <nl> + saver . restore ( sess , checkpoint_path ) <nl> + else : <nl> + sess . run ( variables . global_variables_initializer ( ) ) <nl> + <nl> + np . random . seed ( 0 ) <nl> + for _ in range ( 2 ) : <nl> + image_val = np . random . rand ( * shape ) . astype ( np . float32 ) <nl> + sess . run ( [ loss , train_op ] , feed_dict = { image : image_val } ) <nl> + <nl> + if restore : <nl> + all_vars = ops . get_collection ( ops . GraphKeys . GLOBAL_VARIABLES ) <nl> + all_vars_values = [ var . eval ( session = sess ) for var in all_vars ] <nl> + return all_vars_values <nl> + else : <nl> + saver . save ( sess , checkpoint_path ) <nl> + <nl> def testTwoConvLayers ( self ) : <nl> if test . is_gpu_available ( cuda_only = True ) : <nl> random_seed . set_random_seed ( 0 ) <nl> def testGradient ( self ) : <nl> train_op = optimizer . minimize ( loss ) <nl> graph = ops . get_default_graph ( ) <nl> graph . add_to_collection ( ' train_op ' , train_op ) <nl> - meta_graph = saver . export_meta_graph ( graph_def = graph . as_graph_def ( ) ) <nl> + meta_graph = saver_lib . export_meta_graph ( graph_def = graph . as_graph_def ( ) ) <nl> <nl> rewrite_options = rewriter_config_pb2 . RewriterConfig ( <nl> optimize_tensor_layout = True ) <nl> def testGradient ( self ) : <nl> self . assertEqual ( node . attr [ ' data_format ' ] . s , ' NCHW ' ) <nl> self . assertEqual ( found , 5 ) <nl> <nl> + def testCheckpointCompatibility ( self ) : <nl> + checkpoint_path = self . get_temp_dir ( ) <nl> + self . _train ( checkpoint_path ) <nl> + vars_expected = self . _train ( checkpoint_path , restore = True ) <nl> + vars_layout_optimized = self . _train ( <nl> + checkpoint_path , restore = True , layout_optimizer = True ) <nl> + <nl> + for var_expected , var_layout_optimized in zip ( vars_expected , <nl> + vars_layout_optimized ) : <nl> + self . assertAllClose ( var_expected , var_layout_optimized , atol = 1e - 6 ) <nl> + <nl> <nl> if __name__ = = ' __main__ ' : <nl> test . main ( ) <nl>

Add a checkpoint compatibility test for layout optimizer .

tensorflow/tensorflow

2c26c98f8d1f15d064c76548393137f058043dc1

2017-11-14T06:36:28Z

mmm a / Marlin / src / feature / fwretract . cpp <nl> ppp b / Marlin / src / feature / fwretract . cpp <nl> float FWRetract : : retract_length , / / M207 S - G10 Retract len <nl> FWRetract : : swap_retract_length , / / M207 W - G10 Swap Retract length <nl> FWRetract : : swap_retract_recover_length , / / M208 W - G11 Swap Recover length <nl> FWRetract : : swap_retract_recover_feedrate_mm_s , / / M208 R - G11 Swap Recover feedrate <nl> - FWRetract : : hop_amount ; <nl> + FWRetract : : current_hop ; <nl> <nl> void FWRetract : : reset ( ) { <nl> autoretract_enabled = false ; <nl> void FWRetract : : reset ( ) { <nl> swap_retract_length = RETRACT_LENGTH_SWAP ; <nl> swap_retract_recover_length = RETRACT_RECOVER_LENGTH_SWAP ; <nl> swap_retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE_SWAP ; <nl> - hop_amount = 0 . 0 ; <nl> + current_hop = 0 . 0 ; <nl> <nl> for ( uint8_t i = 0 ; i < EXTRUDERS ; + + i ) { <nl> retracted [ i ] = false ; <nl> void FWRetract : : retract ( const bool retracting <nl> # endif <nl> ) { <nl> <nl> - static float hop_amount = 0 . 0 ; / / Total amount lifted , for use in recover <nl> + static float current_hop = 0 . 0 ; / / Total amount lifted , for use in recover <nl> <nl> / / Prevent two retracts or recovers in a row <nl> if ( retracted [ active_extruder ] = = retracting ) return ; <nl> void FWRetract : : retract ( const bool retracting <nl> } <nl> SERIAL_ECHOLNPAIR ( " current_position [ z ] " , current_position [ Z_AXIS ] ) ; <nl> SERIAL_ECHOLNPAIR ( " current_position [ e ] " , current_position [ E_AXIS ] ) ; <nl> - SERIAL_ECHOLNPAIR ( " hop_amount " , hop_amount ) ; <nl> + SERIAL_ECHOLNPAIR ( " current_hop " , current_hop ) ; <nl> / / * / <nl> <nl> const float old_feedrate_mm_s = feedrate_mm_s , <nl> void FWRetract : : retract ( const bool retracting <nl> prepare_move_to_destination ( ) ; / / set_current_to_destination <nl> <nl> / / Is a Z hop set , and has the hop not yet been done ? <nl> - if ( retract_zlift > 0 . 01 & & ! hop_amount ) { / / Apply hop only once <nl> - hop_amount + = retract_zlift ; / / Add to the hop total ( again , only once ) <nl> + if ( retract_zlift > 0 . 01 & & ! current_hop ) { / / Apply hop only once <nl> + current_hop + = retract_zlift ; / / Add to the hop total ( again , only once ) <nl> destination [ Z_AXIS ] + = retract_zlift ; / / Raise Z by the zlift ( M207 Z ) amount <nl> feedrate_mm_s = planner . max_feedrate_mm_s [ Z_AXIS ] ; / / Maximum Z feedrate <nl> prepare_move_to_destination ( ) ; / / Raise up , set_current_to_destination <nl> void FWRetract : : retract ( const bool retracting <nl> } <nl> else { <nl> / / If a hop was done and Z hasn ' t changed , undo the Z hop <nl> - if ( hop_amount ) { <nl> - current_position [ Z_AXIS ] + = hop_amount ; / / Restore the actual Z position <nl> + if ( current_hop ) { <nl> + current_position [ Z_AXIS ] + = current_hop ; / / Restore the actual Z position <nl> SYNC_PLAN_POSITION_KINEMATIC ( ) ; / / Unspoof the position planner <nl> feedrate_mm_s = planner . max_feedrate_mm_s [ Z_AXIS ] ; / / Z feedrate to max <nl> prepare_move_to_destination ( ) ; / / Lower Z , set_current_to_destination <nl> - hop_amount = 0 . 0 ; / / Clear the hop amount <nl> + current_hop = 0 . 0 ; / / Clear the hop amount <nl> } <nl> <nl> destination [ E_AXIS ] + = ( base_retract + ( swapping ? swap_retract_recover_length : retract_recover_length ) ) * renormalize ; <nl> void FWRetract : : retract ( const bool retracting <nl> } <nl> SERIAL_ECHOLNPAIR ( " current_position [ z ] " , current_position [ Z_AXIS ] ) ; <nl> SERIAL_ECHOLNPAIR ( " current_position [ e ] " , current_position [ E_AXIS ] ) ; <nl> - SERIAL_ECHOLNPAIR ( " hop_amount " , hop_amount ) ; <nl> + SERIAL_ECHOLNPAIR ( " current_hop " , current_hop ) ; <nl> / / * / <nl> <nl> } <nl> mmm a / Marlin / src / feature / fwretract . h <nl> ppp b / Marlin / src / feature / fwretract . h <nl> class FWRetract { <nl> swap_retract_length , / / M207 W - G10 Swap Retract length <nl> swap_retract_recover_length , / / M208 W - G11 Swap Recover length <nl> swap_retract_recover_feedrate_mm_s , / / M208 R - G11 Swap Recover feedrate <nl> - hop_amount ; <nl> + current_hop ; <nl> <nl> FWRetract ( ) { reset ( ) ; } <nl> <nl> mmm a / Marlin / src / module / motion . cpp <nl> ppp b / Marlin / src / module / motion . cpp <nl> void homeaxis ( const AxisEnum axis ) { <nl> <nl> / / Clear retracted status if homing the Z axis <nl> # if ENABLED ( FWRETRACT ) <nl> - if ( axis = = Z_AXIS ) fwretract . hop_amount = 0 . 0 ; <nl> + if ( axis = = Z_AXIS ) fwretract . current_hop = 0 . 0 ; <nl> # endif <nl> <nl> # if ENABLED ( DEBUG_LEVELING_FEATURE ) <nl>

hop_amount = > current_hop

MarlinFirmware/Marlin

0c01099f17685cffc3777e1bf89363f39492022f

2018-09-09T02:20:37Z

mmm a / tensorflow / lite / python / BUILD <nl> ppp b / tensorflow / lite / python / BUILD <nl> py_test ( <nl> name = " lite_test " , <nl> srcs = [ " lite_test . py " ] , <nl> data = [ " @ tflite_mobilenet_ssd_quant_protobuf / / : tflite_graph . pb " ] , <nl> + shard_count = 4 , <nl> srcs_version = " PY2AND3 " , <nl> tags = [ <nl> " no_oss " , <nl> mmm a / tensorflow / lite / python / lite . py <nl> ppp b / tensorflow / lite / python / lite . py <nl> def convert ( self ) : <nl> if self . _has_valid_tensors ( ) : <nl> for tensor in self . _input_tensors : <nl> shape = tensor . get_shape ( ) <nl> - if not shape or not shape . as_list ( ) : <nl> + if not shape : <nl> raise ValueError ( " Provide an input shape for input array " <nl> " ' { 0 } ' . " . format ( _tensor_name ( tensor ) ) ) <nl> + # Note that shape_list might be empty for scalar shapes . <nl> shape_list = shape . as_list ( ) <nl> if None in shape_list [ 1 : ] : <nl> raise ValueError ( <nl> " None is only supported in the 1st dimension . Tensor ' { 0 } ' has " <nl> " invalid shape ' { 1 } ' . " . format ( _tensor_name ( tensor ) , shape_list ) ) <nl> - elif shape_list [ 0 ] is None : <nl> + elif shape_list and shape_list [ 0 ] is None : <nl> self . _set_batch_size ( batch_size = 1 ) <nl> <nl> # Get quantization stats . Ensures there is one stat per name if the stats <nl> mmm a / tensorflow / lite / python / lite_test . py <nl> ppp b / tensorflow / lite / python / lite_test . py <nl> def testFloat ( self ) : <nl> self . assertTrue ( ( [ 1 , 16 , 16 , 3 ] = = output_details [ 0 ] [ ' shape ' ] ) . all ( ) ) <nl> self . assertEqual ( ( 0 . , 0 . ) , output_details [ 0 ] [ ' quantization ' ] ) <nl> <nl> + def testString ( self ) : <nl> + in_tensor = array_ops . placeholder ( shape = [ 4 ] , dtype = dtypes . string ) <nl> + out_tensor = array_ops . reshape ( in_tensor , shape = [ 2 , 2 ] ) <nl> + sess = session . Session ( ) <nl> + <nl> + # Convert model and ensure model is not None . <nl> + converter = lite . TFLiteConverter . from_session ( sess , [ in_tensor ] , <nl> + [ out_tensor ] ) <nl> + tflite_model = converter . convert ( ) <nl> + self . assertTrue ( tflite_model ) <nl> + <nl> + # Check values from converted model . <nl> + interpreter = Interpreter ( model_content = tflite_model ) <nl> + interpreter . allocate_tensors ( ) <nl> + <nl> + input_details = interpreter . get_input_details ( ) <nl> + self . assertEqual ( 1 , len ( input_details ) ) <nl> + self . assertEqual ( ' Placeholder ' , input_details [ 0 ] [ ' name ' ] ) <nl> + self . assertEqual ( np . object_ , input_details [ 0 ] [ ' dtype ' ] ) <nl> + self . assertTrue ( ( [ 4 ] = = input_details [ 0 ] [ ' shape ' ] ) . all ( ) ) <nl> + <nl> + output_details = interpreter . get_output_details ( ) <nl> + self . assertEqual ( 1 , len ( output_details ) ) <nl> + self . assertEqual ( ' Reshape ' , output_details [ 0 ] [ ' name ' ] ) <nl> + self . assertEqual ( np . object_ , output_details [ 0 ] [ ' dtype ' ] ) <nl> + self . assertTrue ( ( [ 2 , 2 ] = = output_details [ 0 ] [ ' shape ' ] ) . all ( ) ) <nl> + # TODO ( b / 122659643 ) : Test setting / getting string data via the python <nl> + # interpreter API after support has been added . <nl> + <nl> def testQuantization ( self ) : <nl> in_tensor_1 = array_ops . placeholder ( <nl> shape = [ 1 , 16 , 16 , 3 ] , dtype = dtypes . float32 , name = ' inputA ' ) <nl> def testSizeNoneInvalid ( self ) : <nl> self . assertEqual ( ' Provide an input shape for input array \ ' Placeholder \ ' . ' , <nl> str ( error . exception ) ) <nl> <nl> - def testSizeEmptyInvalid ( self ) : <nl> + def testScalarValid ( self ) : <nl> + # Construct a graph using a scalar ( empty shape ) input . <nl> in_tensor = array_ops . placeholder ( dtype = dtypes . float32 , shape = [ ] ) <nl> out_tensor = in_tensor + in_tensor <nl> sess = session . Session ( ) <nl> <nl> - # Test empty shape . <nl> + # Test conversion with the scalar input shape . <nl> converter = lite . TFLiteConverter . from_session ( sess , [ in_tensor ] , <nl> [ out_tensor ] ) <nl> - with self . assertRaises ( ValueError ) as error : <nl> - converter . convert ( ) <nl> - self . assertEqual ( ' Provide an input shape for input array \ ' Placeholder \ ' . ' , <nl> - str ( error . exception ) ) <nl> + tflite_model = converter . convert ( ) <nl> + self . assertTrue ( tflite_model ) <nl> + <nl> + # Check values from converted model . <nl> + interpreter = Interpreter ( model_content = tflite_model ) <nl> + interpreter . allocate_tensors ( ) <nl> + <nl> + input_details = interpreter . get_input_details ( ) <nl> + self . assertEqual ( 1 , len ( input_details ) ) <nl> + self . assertEqual ( ' Placeholder ' , input_details [ 0 ] [ ' name ' ] ) <nl> + self . assertEqual ( np . float32 , input_details [ 0 ] [ ' dtype ' ] ) <nl> + self . assertTrue ( ( [ ] = = input_details [ 0 ] [ ' shape ' ] ) . all ( ) ) <nl> + <nl> + output_details = interpreter . get_output_details ( ) <nl> + self . assertEqual ( 1 , len ( output_details ) ) <nl> + self . assertEqual ( ' add ' , output_details [ 0 ] [ ' name ' ] ) <nl> + self . assertEqual ( np . float32 , output_details [ 0 ] [ ' dtype ' ] ) <nl> + self . assertTrue ( ( [ ] = = input_details [ 0 ] [ ' shape ' ] ) . all ( ) ) <nl> + <nl> + # Validate inference using the scalar inputs / outputs . <nl> + test_input = np . array ( 4 . 0 , dtype = np . float32 ) <nl> + expected_output = np . array ( 8 . 0 , dtype = np . float32 ) <nl> + interpreter . set_tensor ( input_details [ 0 ] [ ' index ' ] , test_input ) <nl> + interpreter . invoke ( ) <nl> + <nl> + output_data = interpreter . get_tensor ( output_details [ 0 ] [ ' index ' ] ) <nl> + self . assertTrue ( ( expected_output = = output_data ) . all ( ) ) <nl> <nl> def testSizeInvalid ( self ) : <nl> in_tensor = array_ops . placeholder ( <nl>

Allow scalar shapes in the Python converter API

tensorflow/tensorflow

a7443e6ad57bd60693cf58a9dad3f462fdf5bc3d

2019-01-11T00:34:26Z

mmm a / examples / cpp_module / test . cpp <nl> ppp b / examples / cpp_module / test . cpp <nl> using namespace std ; <nl> <nl> extern " C " <nl> { <nl> - # include " swoole . h " <nl> + # include " swoole . h " <nl> # include " module . h " <nl> - int swModule_init ( swModule * ) ; <nl> + int swModule_init ( swModule * ) ; <nl> } <nl> <nl> swVal * cppMethod ( swModule * module , swString * args , int argc ) ; <nl>

code format .

swoole/swoole-src

180c55d55d7e91d8d1d3728191455e0158551201

2016-07-13T08:13:20Z

mmm a / src / json . hpp <nl> ppp b / src / json . hpp <nl> struct has_mapped_type <nl> std : : is_integral < decltype ( detect ( std : : declval < T > ( ) ) ) > : : value ; <nl> } ; <nl> <nl> + template < template < typename , typename > class JSONSerializer , typename Json , <nl> + typename T > <nl> + struct has_from_json <nl> + { <nl> + private : <nl> + template < typename U , typename = decltype ( uncvref_t < U > : : from_json ( <nl> + std : : declval < Json > ( ) , std : : declval < T & > ( ) ) ) > <nl> + static int detect ( U & & ) ; <nl> + <nl> + static void detect ( . . . ) ; <nl> + <nl> + public : <nl> + static constexpr bool value = std : : is_integral < decltype ( <nl> + detect ( std : : declval < JSONSerializer < T , void > > ( ) ) ) > : : value ; <nl> + } ; <nl> + <nl> + template < template < typename , typename > class JSONSerializer , typename Json , <nl> + typename T > <nl> + struct has_to_json <nl> + { <nl> + private : <nl> + template < typename U , typename = decltype ( uncvref_t < U > : : to_json ( <nl> + std : : declval < Json & > ( ) , std : : declval < T > ( ) ) ) > <nl> + static int detect ( U & & ) ; <nl> + <nl> + static void detect ( . . . ) ; <nl> + <nl> + public : <nl> + static constexpr bool value = std : : is_integral < decltype ( <nl> + detect ( std : : declval < JSONSerializer < T , void > > ( ) ) ) > : : value ; <nl> + } ; <nl> + <nl> void to_json ( ) ; <nl> void from_json ( ) ; <nl> <nl> class basic_json <nl> } <nl> <nl> / / constructor chosen when JSONSerializer : : to_json exists for type T <nl> - template < typename T , typename = decltype ( JSONSerializer < uncvref_t < T > > : : to_json ( std : : declval < basic_json & > ( ) , std : : declval < uncvref_t < T > > ( ) ) ) > <nl> + template < typename T , typename = typename std : : enable_if < detail : : has_to_json < <nl> + JSONSerializer , basic_json , uncvref_t < T > > : : value > : : type > <nl> explicit basic_json ( T & & val ) <nl> { <nl> JSONSerializer < uncvref_t < T > > : : to_json ( * this , std : : forward < T > ( val ) ) ; <nl> class basic_json <nl> <nl> @ since version 1 . 0 . 0 <nl> * / <nl> - template < typename ValueType , typename std : : enable_if < <nl> - not std : : is_pointer < ValueType > : : value , int > : : type = 0 > <nl> - auto get ( ) const - > decltype ( this - > get_impl ( static_cast < ValueType * > ( nullptr ) ) ) <nl> - { <nl> - return get_impl ( static_cast < ValueType * > ( nullptr ) ) ; <nl> - } <nl> - <nl> - template < typename ValueType , typename = decltype ( JSONSerializer < uncvref_t < ValueType > > : : from_json ( std : : declval < basic_json > ( ) , std : : declval < ValueType & > ( ) ) ) > <nl> - auto get ( ) const - > uncvref_t < ValueType > <nl> - { <nl> + template < typename ValueType , <nl> + typename std : : enable_if < <nl> + not std : : is_pointer < ValueType > : : value and <nl> + not detail : : has_from_json < JSONSerializer , basic_json , <nl> + uncvref_t < ValueType > > : : value , <nl> + int > : : type = 0 > <nl> + auto get ( ) const <nl> + - > decltype ( this - > get_impl ( static_cast < ValueType * > ( nullptr ) ) ) { <nl> + return get_impl ( static_cast < ValueType * > ( nullptr ) ) ; <nl> + } <nl> + <nl> + template < typename ValueType , <nl> + typename = enable_if_t < detail : : has_from_json < <nl> + JSONSerializer , basic_json , uncvref_t < ValueType > > : : value > > <nl> + auto get ( ) const - > uncvref_t < ValueType > { <nl> using type = uncvref_t < ValueType > ; <nl> - static_assert ( std : : is_default_constructible < type > : : value & & std : : is_copy_constructible < type > : : value , <nl> - " user - defined types must be DefaultConstructible and CopyConstructible when used with get " ) ; <nl> + static_assert ( std : : is_default_constructible < type > : : value & & <nl> + std : : is_copy_constructible < type > : : value , <nl> + " user - defined types must be DefaultConstructible and " <nl> + " CopyConstructible when used with get " ) ; <nl> type ret ; <nl> JSONSerializer < type > : : from_json ( * this , ret ) ; <nl> return ret ; <nl> mmm a / test / src / unit - udt . cpp <nl> ppp b / test / src / unit - udt . cpp <nl> TEST_CASE ( " from_json free function " , " [ udt ] " ) <nl> } <nl> } <nl> } <nl> + <nl> + / / custom serializer , uses adl by default <nl> + template < typename T , typename = void > <nl> + struct my_serializer ; <nl> + <nl> + template < > <nl> + struct my_serializer < udt : : pod_type > <nl> + { <nl> + template < typename Json > <nl> + static void from_json ( Json const & j , udt : : pod_type & val ) <nl> + { <nl> + nlohmann : : from_json ( j , val ) ; <nl> + } <nl> + <nl> + template < typename Json > <nl> + static void to_json ( Json & j , udt : : pod_type const & val ) <nl> + { <nl> + nlohmann : : to_json ( j , val ) ; <nl> + } <nl> + } ; <nl> + <nl> + using my_json = nlohmann : : basic_json < std : : map , std : : vector , std : : string , bool , <nl> + std : : int64_t , std : : uint64_t , double , <nl> + std : : allocator , my_serializer > ; <nl> + <nl> + namespace udt <nl> + { <nl> + void to_json ( my_json & j , pod_type const & val ) <nl> + { <nl> + j = my_json { { " a " , val . a } , { " b " , val . b } , { " c " , val . c } } ; <nl> + } <nl> + <nl> + void from_json ( my_json const & j , pod_type & val ) <nl> + { <nl> + val = { j [ " a " ] . get < int > ( ) , j [ " b " ] . get < char > ( ) , j [ " c " ] . get < short > ( ) } ; <nl> + } <nl> + } <nl> + <nl> + TEST_CASE ( " custom serializer " ) <nl> + { <nl> + <nl> + <nl> + SECTION ( " default use works like default serializer " ) <nl> + { <nl> + udt : : pod_type pod { 1 , 2 , 3 } ; <nl> + auto const j = my_json { pod } ; <nl> + <nl> + auto const j2 = json { pod } ; <nl> + CHECK ( j . dump ( ) = = j2 . dump ( ) ) ; <nl> + <nl> + auto const pod2 = j . get < udt : : pod_type > ( ) ; <nl> + auto const pod3 = j2 . get < udt : : pod_type > ( ) ; <nl> + CHECK ( pod2 = = pod3 ) ; <nl> + CHECK ( pod2 = = pod ) ; <nl> + } <nl> + } <nl>

add basic test for custom serializer

nlohmann/json

178441cdfd12a8b7f4c49778259470bd40d4f32a

2017-01-21T15:14:21Z

mmm a / test / cpp / qps / smoke_test . cc <nl> ppp b / test / cpp / qps / smoke_test . cc <nl> <nl> <nl> # include < grpc / support / log . h > <nl> <nl> + # include < signal . h > <nl> + <nl> # include " test / cpp / qps / driver . h " <nl> # include " test / cpp / qps / report . h " <nl> <nl> static void RunQPS ( ) { <nl> } / / namespace grpc <nl> <nl> int main ( int argc , char * * argv ) { <nl> + signal ( SIGPIPE , SIG_IGN ) ; <nl> using namespace grpc : : testing ; <nl> RunSynchronousStreamingPingPong ( ) ; <nl> RunSynchronousUnaryPingPong ( ) ; <nl>

Merge pull request from ctiller / sigign

grpc/grpc

6ea9e290e3b29b75359dc8b6cae92f9d96f25b66

2015-04-27T23:34:56Z

mmm a / . gitignore <nl> ppp b / . gitignore <nl> cppclient / watchmanclient . pc <nl> * . filters <nl> / . vs <nl> / external <nl> + / common <nl> + / eden <nl> new file mode 100644 <nl> index 000000000 . . a668bbac2 <nl> mmm / dev / null <nl> ppp b / CMake / ThriftCppLibrary . cmake <nl> <nl> + # NOTE : If you change this file , fbcode / fboss / github / ThriftCppLibrary . cmake also <nl> + # needs to be changed . TODO : this should be handled via shipit . <nl> + function ( add_thrift_cpp2_library LIB_NAME THRIFT_FILE ) <nl> + # Parse the arguments <nl> + set ( SERVICES ) <nl> + set ( DEPENDS ) <nl> + set ( GEN_ARGS ) <nl> + set ( mode " UNSET " ) <nl> + foreach ( arg IN LISTS ARGN ) <nl> + if ( " $ { arg } " STREQUAL " SERVICES " ) <nl> + set ( mode " SERVICES " ) <nl> + elseif ( " $ { arg } " STREQUAL " DEPENDS " ) <nl> + set ( mode " DEPENDS " ) <nl> + elseif ( " $ { arg } " STREQUAL " OPTIONS " ) <nl> + set ( mode " OPTIONS " ) <nl> + else ( ) <nl> + if ( " $ { mode } " STREQUAL " SERVICES " ) <nl> + list ( APPEND SERVICES " $ { arg } " ) <nl> + elseif ( " $ { mode } " STREQUAL " DEPENDS " ) <nl> + list ( APPEND DEPENDS " $ { arg } " ) <nl> + elseif ( " $ { mode } " STREQUAL " OPTIONS " ) <nl> + list ( APPEND GEN_ARGS " $ { arg } " ) <nl> + else ( ) <nl> + message ( <nl> + FATAL_ERROR <nl> + " expected SERVICES , DEPENDS , or OPTIONS argument , found $ { arg } " <nl> + ) <nl> + endif ( ) <nl> + endif ( ) <nl> + endforeach ( ) <nl> + <nl> + get_filename_component ( base $ { THRIFT_FILE } NAME_WE ) <nl> + get_filename_component ( <nl> + output_dir <nl> + $ { CMAKE_CURRENT_BINARY_DIR } / $ { THRIFT_FILE } <nl> + DIRECTORY <nl> + ) <nl> + <nl> + list ( APPEND GEN_ARGS " include_prefix = $ { output_dir } " ) <nl> + # CMake 3 . 12 is finally getting a list ( JOIN ) function , but until then <nl> + # treating the list as a string and replacing the semicolons is good enough . <nl> + string ( REPLACE " ; " " , " GEN_ARG_STR " $ { GEN_ARGS } " ) <nl> + <nl> + # Compute the list of generated files <nl> + list ( APPEND generated_headers <nl> + $ { output_dir } / gen - cpp2 / $ { base } _constants . h <nl> + $ { output_dir } / gen - cpp2 / $ { base } _constants . cpp <nl> + $ { output_dir } / gen - cpp2 / $ { base } _types . h <nl> + $ { output_dir } / gen - cpp2 / $ { base } _types . tcc <nl> + $ { output_dir } / gen - cpp2 / $ { base } _types_custom_protocol . h <nl> + ) <nl> + list ( APPEND generated_sources <nl> + $ { output_dir } / gen - cpp2 / $ { base } _data . h <nl> + $ { output_dir } / gen - cpp2 / $ { base } _data . cpp <nl> + $ { output_dir } / gen - cpp2 / $ { base } _types . cpp <nl> + ) <nl> + foreach ( service IN LISTS SERVICES ) <nl> + list ( APPEND generated_headers <nl> + $ { output_dir } / gen - cpp2 / $ { service } . h <nl> + $ { output_dir } / gen - cpp2 / $ { service } . tcc <nl> + $ { output_dir } / gen - cpp2 / $ { service } AsyncClient . h <nl> + $ { output_dir } / gen - cpp2 / $ { service } _custom_protocol . h <nl> + ) <nl> + list ( APPEND generated_sources <nl> + $ { output_dir } / gen - cpp2 / $ { service } . cpp <nl> + $ { output_dir } / gen - cpp2 / $ { service } AsyncClient . cpp <nl> + $ { output_dir } / gen - cpp2 / $ { service } _processmap_binary . cpp <nl> + $ { output_dir } / gen - cpp2 / $ { service } _processmap_compact . cpp <nl> + ) <nl> + endforeach ( ) <nl> + <nl> + # Emit the rule to run the thrift compiler <nl> + add_custom_command ( <nl> + OUTPUT <nl> + $ { generated_headers } <nl> + $ { generated_sources } <nl> + COMMAND <nl> + $ { CMAKE_COMMAND } - E make_directory $ { output_dir } <nl> + COMMAND <nl> + $ { FBTHRIFT_COMPILER } <nl> + - - strict <nl> + - - templates $ { FBTHRIFT_TEMPLATES_DIR } <nl> + - - gen " mstch_cpp2 : $ { GEN_ARG_STR } " <nl> + - I $ { CMAKE_SOURCE_DIR } <nl> + - o $ { output_dir } <nl> + $ { CMAKE_CURRENT_SOURCE_DIR } / $ { THRIFT_FILE } <nl> + WORKING_DIRECTORY <nl> + $ { CMAKE_BINARY_DIR } <nl> + MAIN_DEPENDENCY <nl> + $ { THRIFT_FILE } <nl> + DEPENDS <nl> + $ { DEPENDS } <nl> + ) <nl> + <nl> + # Now emit the library rule to compile the sources <nl> + add_library ( $ { LIB_NAME } STATIC <nl> + $ { generated_sources } <nl> + ) <nl> + set_property ( <nl> + TARGET $ { LIB_NAME } <nl> + PROPERTY PUBLIC_HEADER <nl> + $ { generated_headers } <nl> + ) <nl> + target_include_directories ( <nl> + $ { LIB_NAME } <nl> + PUBLIC <nl> + $ { CMAKE_SOURCE_DIR } <nl> + $ { CMAKE_BINARY_DIR } <nl> + ) <nl> + target_link_libraries ( <nl> + $ { LIB_NAME } <nl> + PUBLIC <nl> + $ { DEPENDS } <nl> + FBThrift : : thriftcpp2 <nl> + ) <nl> + endfunction ( ) <nl> mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> <nl> # This is an experimental cmakefile and doesn ' t offer all of the options <nl> # available in the configure script ! At this time you should prefer to <nl> # use the configure script to build and install watchman ! <nl> - cmake_minimum_required ( VERSION 3 . 0 . 2 FATAL_ERROR ) <nl> + cmake_minimum_required ( VERSION 3 . 1 . 3 FATAL_ERROR ) <nl> + <nl> set ( CMAKE_MODULE_PATH " $ { CMAKE_CURRENT_SOURCE_DIR } / CMake " $ { CMAKE_MODULE_PATH } ) <nl> <nl> + set ( CMAKE_CXX_STANDARD 14 ) <nl> + <nl> # Tell CMake to also look in the directories where getdeps . py installs <nl> # our third - party dependencies . <nl> list ( APPEND CMAKE_PREFIX_PATH " $ { CMAKE_CURRENT_SOURCE_DIR } / external / install " ) <nl> include_directories ( $ { CMAKE_CURRENT_SOURCE_DIR } ) <nl> include_directories ( $ { CMAKE_CURRENT_BINARY_DIR } ) <nl> include_directories ( " $ { CMAKE_CURRENT_SOURCE_DIR } / external / install / include " ) <nl> <nl> + if ( NOT WIN32 ) <nl> + set ( WANT_THRIFT ON ) <nl> + else ( ) <nl> + set ( WANT_THRIFT OFF ) <nl> + endif ( ) <nl> + <nl> + # Determine whether we are the git repo produced by shipit , a staging <nl> + # area produced by shipit in the FB internal CI , or whether <nl> + # we are building in the source monorepo . <nl> + # For the FB internal CI flavor running shipit , CMAKE_CURRENT_SOURCE_DIR <nl> + # will have a value like " . . . . / shipit_projects / watchman " . <nl> + if ( IS_DIRECTORY " $ { CMAKE_CURRENT_SOURCE_DIR } / . git " OR <nl> + " $ { CMAKE_CURRENT_SOURCE_DIR } " MATCHES " shipit_projects " ) <nl> + set ( IS_SHIPPED_IT TRUE ) <nl> + else ( ) <nl> + set ( IS_SHIPPED_IT FALSE ) <nl> + endif ( ) <nl> + <nl> + # If we ' re building from inside the monorepo , make the local directory <nl> + # look like the shipit - transformed source in the git repo . <nl> + # On windows we do a dumb recursive copy of the files because we cannot <nl> + # guarantee that we ' ll be successful in setting up a symlink . <nl> + # On everything else we set up a simple symlink . <nl> + # In theory we can tell cmake to add a non - child subdir and avoid the <nl> + # copy / symlink thing , but we ' d need to teach various targets how to resolve <nl> + # the path and that is rather a lot of work ( I spent a couple of hours on this <nl> + # before throwing in the towel ) . <nl> + function ( maybe_shipit_dir MONOREPO_RELATIVE_PATH ) <nl> + get_filename_component ( base " $ { MONOREPO_RELATIVE_PATH } " NAME ) <nl> + if ( NOT IS_SHIPPED_IT AND <nl> + NOT IS_DIRECTORY $ { CMAKE_CURRENT_SOURCE_DIR } / $ { base } ) <nl> + if ( WIN32 ) <nl> + file ( COPY <nl> + " $ { CMAKE_CURRENT_SOURCE_DIR } / $ { MONOREPO_RELATIVE_PATH } " <nl> + DESTINATION $ { CMAKE_CURRENT_SOURCE_DIR } ) <nl> + else ( ) <nl> + execute_process ( COMMAND <nl> + ln - s $ { MONOREPO_RELATIVE_PATH } $ { CMAKE_CURRENT_SOURCE_DIR } / $ { base } ) <nl> + endif ( ) <nl> + endif ( ) <nl> + endfunction ( ) <nl> + <nl> + if ( WANT_THRIFT ) <nl> + # We use shipit to mirror in these locations from the monorepo <nl> + maybe_shipit_dir ( " . . / fboss / common " ) <nl> + maybe_shipit_dir ( " . . / eden " ) <nl> + endif ( ) <nl> + <nl> set ( PACKAGE_VERSION " 4 . 9 . 4 " ) <nl> set ( WATCHMAN_VERSION_OVERRIDE " " CACHE STRING " Use this version code for \ <nl> Watchman instead of the default ( $ { PACKAGE_VERSION } ) " ) <nl> set ( PACKAGE_STRING " $ { PACKAGE_NAME } $ { PACKAGE_VERSION } " ) <nl> set ( PACKAGE_TARNAME " $ { PACKAGE_NAME } - $ { PACKAGE_VERSION } " ) <nl> set ( PACKAGE_BUGREPORT " https : / / github . com / facebook / watchman / issues " ) <nl> project ( $ { PACKAGE_NAME } CXX C ) <nl> + include ( ThriftCppLibrary ) <nl> include ( CheckFunctionExists ) <nl> include ( CheckIncludeFiles ) <nl> include ( CheckStructHasMember ) <nl> if ( THREADS_FOUND AND NOT TARGET Threads : : Threads ) <nl> endif ( ) <nl> endif ( ) <nl> <nl> - <nl> find_package ( OpenSSL ) <nl> <nl> # This block is for cmake 3 . 0 which doesn ' t define the OpenSSL : : Crypto <nl> find_package ( Glog REQUIRED ) <nl> find_package ( LibEvent REQUIRED ) <nl> get_filename_component ( LIBEVENT_LIBDIR " $ { LIBEVENT_LIB } " DIRECTORY ) <nl> link_directories ( $ { LIBEVENT_LIBDIR } ) <nl> - <nl> find_package ( folly CONFIG REQUIRED ) <nl> <nl> + <nl> + if ( WANT_THRIFT ) <nl> + find_package ( fizz CONFIG REQUIRED ) <nl> + find_package ( wangle CONFIG REQUIRED ) <nl> + find_package ( FBThrift CONFIG REQUIRED ) <nl> + find_package ( yarpl CONFIG REQUIRED ) <nl> + find_package ( rsocket CONFIG REQUIRED ) <nl> + endif ( ) <nl> + <nl> find_package ( PythonInterp REQUIRED ) <nl> message ( STATUS " Found python $ { PYTHON_VERSION_STRING } " ) <nl> <nl> else ( ) <nl> set ( CMAKE_CXX_FLAGS_RELEASE " $ { CMAKE_CXX_FLAGS_COMMON } - O3 " ) <nl> endif ( ) <nl> <nl> + if ( WANT_THRIFT ) <nl> + add_subdirectory ( common ) <nl> + endif ( ) <nl> + <nl> add_library ( wildmatch STATIC <nl> thirdparty / wildmatch / wildmatch . c <nl> thirdparty / wildmatch / wildmatch . h <nl> endif ( ) <nl> add_library ( testsupport STATIC $ { testsupport_sources } ) <nl> target_link_libraries ( testsupport log string jansson Folly : : folly glog : : glog ) <nl> <nl> + if ( WANT_THRIFT ) <nl> + add_thrift_cpp2_library ( <nl> + eden_service_thrift <nl> + eden / fs / service / eden . thrift <nl> + SERVICES <nl> + EdenService <nl> + DEPENDS <nl> + fb303_thrift_cpp2 <nl> + ) <nl> + add_thrift_cpp2_library ( <nl> + streamingeden_thrift <nl> + eden / fs / service / streamingeden . thrift <nl> + SERVICES <nl> + StreamingEdenService <nl> + DEPENDS <nl> + eden_service_thrift <nl> + ) <nl> + endif ( ) <nl> + <nl> list ( APPEND watchman_sources <nl> ChildProcess . cpp <nl> ContentHash . cpp <nl> saved_state / SavedStateInterface . cpp <nl> scm / Mercurial . cpp <nl> scm / SCM . cpp <nl> watcher / auto . cpp <nl> - # watcher / eden . cpp <nl> watcher / fsevents . cpp <nl> watcher / inotify . cpp <nl> watcher / kqueue . cpp <nl> watcher / portfs . cpp <nl> ) <nl> <nl> - if ( CMAKE_SYSTEM_NAME STREQUAL " Windows " ) <nl> + if ( WANT_THRIFT ) <nl> + # We currently only support talking to eden on posix systems <nl> + list ( APPEND watchman_sources watcher / eden . cpp ) <nl> + endif ( ) <nl> + <nl> + if ( WIN32 ) <nl> list ( APPEND watchman_sources <nl> stream_win . cpp <nl> watcher / win32 . cpp <nl> endif ( ) <nl> add_executable ( watchman $ { watchman_sources } ) <nl> target_link_libraries ( <nl> watchman <nl> - log hash string err jansson wildmatch Folly : : folly glog : : glog ) <nl> + log <nl> + hash <nl> + string <nl> + err <nl> + jansson <nl> + wildmatch <nl> + Folly : : folly <nl> + glog : : glog <nl> + ) <nl> + <nl> + if ( WANT_THRIFT ) <nl> + target_link_libraries ( <nl> + watchman <nl> + streamingeden_thrift <nl> + $ { YARPL_LIBRARIES } <nl> + rsocket : : ReactiveSocket <nl> + FBThrift : : thriftcpp2 <nl> + ) <nl> + endif ( ) <nl> + <nl> if ( CMAKE_SYSTEM_NAME STREQUAL " Darwin " ) <nl> target_link_libraries ( watchman " - framework CoreServices " ) <nl> elseif ( CMAKE_SYSTEM_NAME STREQUAL " Windows " ) <nl> mmm a / build / fbcode_builder_config . py <nl> ppp b / build / fbcode_builder_config . py <nl> <nl> <nl> import os <nl> <nl> + import specs . fbthrift as fbthrift <nl> import specs . folly as folly <nl> import specs . gmock as gmock <nl> from shell_quoting import ShellQuoted , path_join <nl> def fbcode_builder_spec ( builder ) : <nl> projects = builder . option ( " projects_dir " ) <nl> <nl> return { <nl> - " depends_on " : [ gmock , folly ] , <nl> + " depends_on " : [ gmock , folly , fbthrift ] , <nl> " steps " : [ <nl> builder . fb_github_cmake_install ( " watchman / _build " , " . . " ) , <nl> builder . step ( <nl> new file mode 100644 <nl> index 000000000 . . 7f870ab98 <nl> mmm / dev / null <nl> ppp b / common / . gitignore <nl> <nl> + / CMakeFiles <nl> + / CTestTestfile . cmake <nl> + / Makefile <nl> + / cmake_install . cmake <nl> + / lib * . a <nl> new file mode 100644 <nl> index 000000000 . . 0edf1ccba <nl> mmm / dev / null <nl> ppp b / common / fb303 / if / . gitignore <nl> @ @ - 0 , 0 + 1 @ @ <nl> + / gen - cpp2 <nl> mmm a / getdeps . py <nl> ppp b / getdeps . py <nl> def _build ( self , project ) : <nl> self . _run_cmd ( [ " make " , " install " ] ) <nl> <nl> <nl> - class JeMallocBuilder ( BuilderBase ) : <nl> - def __init__ ( self , subdir = None , env = None , args = None ) : <nl> - super ( JeMallocBuilder , self ) . __init__ ( subdir = subdir , env = env ) <nl> - self . args = args or [ ] <nl> - <nl> - def _build ( self , project ) : <nl> - self . _run_cmd ( <nl> - [ " . / autogen . sh " ] + [ " - - prefix = " + project . opts . install_dir ] + self . args <nl> - ) <nl> - self . _run_cmd ( [ " make " , " - j % s " % project . opts . num_jobs ] ) <nl> - self . _run_cmd ( [ " make " , " install_bin " , " install_include " , " install_lib " ] ) <nl> - <nl> - <nl> class CMakeBuilder ( BuilderBase ) : <nl> def __init__ ( self , subdir = None , env = None , defines = None ) : <nl> super ( CMakeBuilder , self ) . __init__ ( subdir = subdir , env = env , build_dir = " _build " ) <nl> def _build ( self , project ) : <nl> defines = { <nl> " CMAKE_INSTALL_PREFIX " : project . opts . install_dir , <nl> " BUILD_SHARED_LIBS " : " OFF " , <nl> + # Some of the deps ( rsocket ) default to UBSAN enabled if left <nl> + # unspecified . Some of the deps fail to compile in release mode <nl> + # due to warning - > error promotion . RelWithDebInfo is the happy <nl> + # medium . <nl> + " CMAKE_BUILD_TYPE " : " RelWithDebInfo " , <nl> } <nl> <nl> # If any of these env vars are set , set the corresponding cmake def . <nl> def install_vcpkg ( pkgs ) : <nl> <nl> <nl> def get_projects ( opts ) : <nl> - projects = [ ] <nl> - if os . path . exists ( " / usr / include / jemalloc / jemalloc . h " ) : <nl> - # ubuntu 16 has a very old jemalloc installed , and folly doesn ' t <nl> - # currently have a way to be told not to try linking against it . <nl> - # To workaround this snafu , we build our own current version <nl> - # of jemalloc for folly to find and use . <nl> - # If we don ' t have jemalloc installed we don ' t need to install it . <nl> - # Confusing ! <nl> - projects . append ( <nl> - Project ( <nl> - " jemalloc " , <nl> - opts , <nl> - GitUpdater ( " https : / / github . com / jemalloc / jemalloc . git " ) , <nl> - JeMallocBuilder ( ) , <nl> - ) <nl> - ) <nl> - <nl> - projects + = [ <nl> + projects = [ <nl> Project ( <nl> " mstch " , <nl> opts , <nl> def get_projects ( opts ) : <nl> ] <nl> <nl> if not is_win ( ) : <nl> - # Ubuntu 16 also has an old version of zstd , so build our own . <nl> + # Ubuntu 16 has an old version of zstd , so build our own . <nl> # We can ' t use the MakeBuilder on windows , but we can get zstd <nl> # from vcpkg so we ' re ok there . <nl> - projects . append ( <nl> + projects + = [ <nl> Project ( <nl> " zstd " , <nl> opts , <nl> GitUpdater ( " https : / / github . com / facebook / zstd . git " ) , <nl> MakeBuilder ( ) , <nl> ) <nl> - ) <nl> + ] <nl> <nl> projects + = [ <nl> # TODO : see if we can get get a faster and / or static build working <nl> def get_projects ( opts ) : <nl> ) <nl> ] <nl> <nl> - # We ' ll add this in a later diff ; there are some glog issues in these <nl> - # projects that need to be resolved before we can guarantee success <nl> - need_thrift = False <nl> + need_thrift = not is_win ( ) <nl> if need_thrift : <nl> projects + = [ <nl> Project ( <nl> " libsodium " , <nl> opts , <nl> GitUpdater ( " https : / / github . com / jedisct1 / libsodium . git " ) , <nl> - AutoconfBuilder ( ) , <nl> + AutoconfBuilder ( args = [ " - - disable - shared " ] ) , <nl> ) , <nl> Project ( <nl> " fizz " , <nl> mmm a / watcher / eden . cpp <nl> ppp b / watcher / eden . cpp <nl> class EdenView : public QueryableView { <nl> } ; <nl> <nl> std : : shared_ptr < watchman : : QueryableView > detectEden ( w_root_t * root ) { <nl> - if ( root - > fs_type ! = " fuse " ) { <nl> + if ( root - > fs_type ! = " fuse " & & root - > fs_type ! = " osxfuse_eden " ) { <nl> throw std : : runtime_error ( to < std : : string > ( " not a FUSE file system " ) ) ; <nl> } <nl> <nl>

watchman : pull in thrift in the oss build for eden support

facebook/watchman

631bdda241a136d975883de7d78aacce59dc0721

2019-02-05T05:38:10Z

mmm a / tensorflow / contrib / data / kernels / prefetching_kernels . cc <nl> ppp b / tensorflow / contrib / data / kernels / prefetching_kernels . cc <nl> class FunctionBufferingResource : public ResourceBase { <nl> source_device_ ( source_device ) , <nl> target_device_ ( target_device ) , <nl> func_args_ ( func_args ) , <nl> - thread_pool_ ( new thread : : ThreadPool ( Env : : Default ( ) , ThreadOptions ( ) , <nl> - " buffer_resource " , thread_pool_size , <nl> - false / * low_latency_hint * / ) ) , <nl> handle_ ( kInvalidHandle ) , <nl> is_buffering_ ( false ) , <nl> end_of_sequence_ ( false ) , <nl> cancelled_ ( false ) { <nl> - runner_ = [ this ] ( std : : function < void ( ) > c ) { <nl> - thread_pool_ - > Schedule ( std : : move ( c ) ) ; <nl> - } ; <nl> + if ( thread_pool_size > 0 ) { <nl> + thread_pool_ = new thread : : ThreadPool ( Env : : Default ( ) , ThreadOptions ( ) , <nl> + " buffer_resource " , thread_pool_size , <nl> + false / * low_latency_hint * / ) ; <nl> + runner_ = [ this ] ( std : : function < void ( ) > c ) { <nl> + thread_pool_ - > Schedule ( std : : move ( c ) ) ; <nl> + } ; <nl> + } <nl> } <nl> <nl> ~ FunctionBufferingResource ( ) override { <nl> class FunctionBufferingResource : public ResourceBase { <nl> cond_var_ . wait ( l ) ; <nl> } <nl> } <nl> - delete thread_pool_ ; <nl> + if ( thread_pool_ ! = nullptr ) { <nl> + delete thread_pool_ ; <nl> + } <nl> } <nl> <nl> string DebugString ( ) override { <nl> class FunctionBufferingResource : public ResourceBase { <nl> FunctionLibraryRuntime : : Options opts ; <nl> / / Copied from CapturedFunction : : generate_step_id ( ) ; <nl> opts . step_id = - std : : abs ( static_cast < int64 > ( random : : New64 ( ) ) ) ; <nl> - opts . runner = & runner_ ; <nl> + if ( runner_ ! = nullptr ) { <nl> + opts . runner = & runner_ ; <nl> + } <nl> opts . source_device = source_device_ ; <nl> AllocatorAttributes arg_alloc_attr ; <nl> arg_alloc_attr . set_on_host ( true ) ; <nl> class FunctionBufferingResource : public ResourceBase { <nl> const string source_device_ ; <nl> const string target_device_ ; <nl> const std : : vector < Tensor > func_args_ ; <nl> - thread : : ThreadPool * thread_pool_ ; <nl> + thread : : ThreadPool * thread_pool_ = nullptr ; <nl> FunctionLibraryRuntime : : Handle handle_ GUARDED_BY ( mu_ ) ; <nl> std : : deque < BufferElement > buffer_ GUARDED_BY ( mu_ ) ; <nl> std : : deque < FunctionBufferCallback > requests_ GUARDED_BY ( mu_ ) ; <nl> mmm a / tensorflow / contrib / data / python / ops / prefetching_ops . py <nl> ppp b / tensorflow / contrib / data / python / ops / prefetching_ops . py <nl> def function_buffering_resource ( string_arg , <nl> target_device , <nl> f , <nl> buffer_size , <nl> - thread_pool_size = 1 , <nl> + thread_pool_size = 0 , <nl> container = " " , <nl> shared_name = None , <nl> name = None ) : <nl>

Allowing the FunctionBufferingResource to be passed in thread_pool_size = 0 in which case we wouldn ' t pass in a runner to the FLR : : Run call and rely on the underlying device threadpool instead .

tensorflow/tensorflow

dee1bc350ac0826822161f211f7fa8a1e1ae62f0

2018-03-19T22:11:07Z

mmm a / xbmc / cores / dvdplayer / DVDDemuxers / DVDDemuxFFmpeg . cpp <nl> ppp b / xbmc / cores / dvdplayer / DVDDemuxers / DVDDemuxFFmpeg . cpp <nl> bool CDVDDemuxFFmpeg : : SeekChapter ( int chapter , double * startpts ) <nl> <nl> AVChapter * ch = m_pFormatContext - > chapters [ chapter - 1 ] ; <nl> double dts = ConvertTimestamp ( ch - > start , ch - > time_base . den , ch - > time_base . num ) ; <nl> - return SeekTime ( DVD_TIME_TO_MSEC ( dts ) , false , startpts ) ; <nl> + return SeekTime ( DVD_TIME_TO_MSEC ( dts ) , true , startpts ) ; <nl> # else <nl> return false ; <nl> # endif <nl>

changed : do a backward seek when jumping to chapters .

xbmc/xbmc

a456036c5e81f4cec27b83b93445678cf68b576b

2011-12-04T13:58:01Z

mmm a / core / io / http_client . cpp <nl> ppp b / core / io / http_client . cpp <nl> Error HTTPClient : : poll ( ) { <nl> } <nl> <nl> if ( ssl - > get_status ( ) = = StreamPeerSSL : : STATUS_CONNECTED ) { <nl> - / / Handshake has been successfull <nl> + / / Handshake has been successful <nl> handshaking = false ; <nl> status = STATUS_CONNECTED ; <nl> return OK ; <nl> mmm a / core / math / octree . h <nl> ppp b / core / math / octree . h <nl> void Octree < T , use_pairs , AL > : : _insert_element ( Element * p_element , Octant * p_oct <nl> splits + + ; <nl> } <nl> } else { <nl> - / * check againt AABB where child should be * / <nl> + / * check against AABB where child should be * / <nl> <nl> AABB aabb = p_octant - > aabb ; <nl> aabb . size * = 0 . 5 ; <nl> mmm a / core / math / triangulate . cpp <nl> ppp b / core / math / triangulate . cpp <nl> bool Triangulate : : triangulate ( const Vector < Vector2 > & contour , Vector < int > & resul <nl> <nl> nv - - ; <nl> <nl> - / * resest error detection counter * / <nl> + / * reset error detection counter * / <nl> count = 2 * nv ; <nl> } <nl> } <nl> mmm a / core / os / dir_access . h <nl> ppp b / core / os / dir_access . h <nl> <nl> @ author Juan Linietsky < reduzio @ gmail . com > <nl> * / <nl> <nl> - / / @ TOOD , excellent candidate for THREAD_SAFE MACRO , should go through all these and add THREAD_SAFE where it applies <nl> + / / @ TODO , excellent candidate for THREAD_SAFE MACRO , should go through all these and add THREAD_SAFE where it applies <nl> class DirAccess { <nl> public : <nl> enum AccessType { <nl> mmm a / core / os / os . h <nl> ppp b / core / os / os . h <nl> class OS { <nl> <nl> RenderThreadMode _render_thread_mode ; <nl> <nl> - / / functions used by main to initialize / deintialize the OS <nl> + / / functions used by main to initialize / deinitialize the OS <nl> void add_logger ( Logger * p_logger ) ; <nl> <nl> virtual void initialize_core ( ) = 0 ; <nl> mmm a / core / project_settings . cpp <nl> ppp b / core / project_settings . cpp <nl> String ProjectSettings : : get_resource_path ( ) const { <nl> String ProjectSettings : : localize_path ( const String & p_path ) const { <nl> <nl> if ( resource_path = = " " ) <nl> - return p_path ; / / not initialied yet <nl> + return p_path ; / / not initialized yet <nl> <nl> if ( p_path . begins_with ( " res : / / " ) | | p_path . begins_with ( " user : / / " ) | | <nl> ( p_path . is_abs_path ( ) & & ! p_path . begins_with ( resource_path ) ) ) <nl> mmm a / core / variant_parser . cpp <nl> ppp b / core / variant_parser . cpp <nl> Error VariantParser : : _parse_tag ( Token & token , Stream * p_stream , int & line , Strin <nl> break ; <nl> <nl> if ( parsing_tag & & token . type = = TK_PERIOD ) { <nl> - r_tag . name + = " . " ; / / support tags such as [ someprop . Anroid ] for specific platforms <nl> + r_tag . name + = " . " ; / / support tags such as [ someprop . Android ] for specific platforms <nl> get_token ( p_stream , token , line , r_err_str ) ; <nl> } else if ( parsing_tag & & token . type = = TK_COLON ) { <nl> - r_tag . name + = " : " ; / / support tags such as [ someprop . Anroid ] for specific platforms <nl> + r_tag . name + = " : " ; / / support tags such as [ someprop . Android ] for specific platforms <nl> get_token ( p_stream , token , line , r_err_str ) ; <nl> } else { <nl> parsing_tag = false ; <nl> mmm a / doc / classes / ColorPicker . xml <nl> ppp b / doc / classes / ColorPicker . xml <nl> <nl> The currently selected color . <nl> < / member > <nl> < member name = " deferred_mode " type = " bool " setter = " set_deferred_mode " getter = " is_deferred_mode " > <nl> - If [ code ] true [ / code ] the color will apply only after the user releases the mouse button , otherwise it will apply immediatly even in mouse motion event ( which can cause performance issues ) . <nl> + If [ code ] true [ / code ] the color will apply only after the user releases the mouse button , otherwise it will apply immediately even in mouse motion event ( which can cause performance issues ) . <nl> < / member > <nl> < member name = " edit_alpha " type = " bool " setter = " set_edit_alpha " getter = " is_editing_alpha " > <nl> If [ code ] true [ / code ] shows an alpha channel slider ( transparency ) . <nl> mmm a / doc / classes / ColorPickerButton . xml <nl> ppp b / doc / classes / ColorPickerButton . xml <nl> <nl> Button that pops out a [ ColorPicker ] . <nl> < / brief_description > <nl> < description > <nl> - Encapsulates a [ ColorPicker ] making it accesible by pressing a button . Pressing the button will toggle the [ ColorPicker ] visibility . <nl> + Encapsulates a [ ColorPicker ] making it accessible by pressing a button . Pressing the button will toggle the [ ColorPicker ] visibility . <nl> < / description > <nl> < tutorials > <nl> < / tutorials > <nl> mmm a / doc / classes / EditorFileSystemDirectory . xml <nl> ppp b / doc / classes / EditorFileSystemDirectory . xml <nl> <nl> < ? xml version = " 1 . 0 " encoding = " UTF - 8 " ? > <nl> < class name = " EditorFileSystemDirectory " inherits = " Object " category = " Core " version = " 3 . 1 " > <nl> < brief_description > <nl> - A diretory for the resource filesystem . <nl> + A directory for the resource filesystem . <nl> < / brief_description > <nl> < description > <nl> A more generalized , low - level variation of the directory concept . <nl> mmm a / doc / classes / Object . xml <nl> ppp b / doc / classes / Object . xml <nl> <nl> < / argument > <nl> < description > <nl> Get indexed object property by String . <nl> - Property indices get accessed with colon seperation , for example : [ code ] position : x [ / code ] <nl> + Property indices get accessed with colon separation , for example : [ code ] position : x [ / code ] <nl> < / description > <nl> < / method > <nl> < method name = " get_instance_id " qualifiers = " const " > <nl> mmm a / doc / classes / ProceduralSky . xml <nl> ppp b / doc / classes / ProceduralSky . xml <nl> <nl> < / brief_description > <nl> < description > <nl> ProceduralSky provides a way to create an effective background quickly by defining procedural parameters for the sun , the sky and the ground . The sky and ground are very similar , they are defined by a color at the horizon , another color , and finally an easing curve to interpolate between these two colors . Similarly the sun is described by a position in the sky , a color , and an easing curve . However , the sun also defines a minimum and maximum angle , these two values define at what distance the easing curve begins and ends from the sun , and thus end up defining the size of the sun in the sky . <nl> - The ProceduralSky is updated on the CPU after the parameters change and stored in a texture and then displayed as a background in the scene . This makes it relatively unsuitable for realtime updates during gameplay . But with a small texture size it is still feasible to update relatively frequently becuase it is updated on a background thread when multi - threading is available . <nl> + The ProceduralSky is updated on the CPU after the parameters change and stored in a texture and then displayed as a background in the scene . This makes it relatively unsuitable for realtime updates during gameplay . But with a small texture size it is still feasible to update relatively frequently because it is updated on a background thread when multi - threading is available . <nl> < / description > <nl> < tutorials > <nl> < / tutorials > <nl> mmm a / doc / classes / ProjectSettings . xml <nl> ppp b / doc / classes / ProjectSettings . xml <nl> <nl> < member name = " audio / output_latency " type = " int " setter = " " getter = " " > <nl> < / member > <nl> < member name = " audio / video_delay_compensation_ms " type = " int " setter = " " getter = " " > <nl> - Setting to harcode audio delay when playing video . Best to leave this untouched unless you know what you are doing . <nl> + Setting to hardcode audio delay when playing video . Best to leave this untouched unless you know what you are doing . <nl> < / member > <nl> < member name = " compression / formats / gzip / compression_level " type = " int " setter = " " getter = " " > <nl> Default compression level for gzip . Affects compressed scenes and resources . <nl> mmm a / doc / classes / SceneTree . xml <nl> ppp b / doc / classes / SceneTree . xml <nl> <nl> < / member > <nl> < member name = " multiplayer_poll " type = " bool " setter = " set_multiplayer_poll_enabled " getter = " is_multiplayer_poll_enabled " > <nl> If [ code ] true [ / code ] ( default ) enable the automatic polling of the [ MultiplayerAPI ] for this SceneTree during [ signal idle_frame ] . <nl> - When [ code ] false [ / code ] you need to manually call [ method MultiplayerAPI . poll ] for processing network packets and delivering RPCs / RSETs . This allows to run RPCs / RSETs in a different loop ( e . g . physics , thread , specific time step ) and for manual [ Mutex ] protecion when accessing the [ MultiplayerAPI ] from threads . <nl> + When [ code ] false [ / code ] you need to manually call [ method MultiplayerAPI . poll ] for processing network packets and delivering RPCs / RSETs . This allows to run RPCs / RSETs in a different loop ( e . g . physics , thread , specific time step ) and for manual [ Mutex ] protection when accessing the [ MultiplayerAPI ] from threads . <nl> < / member > <nl> < member name = " network_peer " type = " NetworkedMultiplayerPeer " setter = " set_network_peer " getter = " get_network_peer " > <nl> The peer object to handle the RPC system ( effectively enabling networking when set ) . Depending on the peer itself , the SceneTree will become a network server ( check with [ method is_network_server ( ) ] ) and will set root node ' s network mode to master ( see NETWORK_MODE_ * constants in [ Node ] ) , or it will become a regular peer with root node set to slave . All child nodes are set to inherit the network mode by default . Handling of networking - related events ( connection , disconnection , new clients ) is done by connecting to SceneTree ' s signals . <nl> mmm a / doc / classes / Shader . xml <nl> ppp b / doc / classes / Shader . xml <nl> <nl> < return type = " int " enum = " Shader . Mode " > <nl> < / return > <nl> < description > <nl> - Returns the shader mode for the shader , eiter [ code ] MODE_CANVAS_ITEM [ / code ] , [ code ] MODE_SPATIAL [ / code ] or [ code ] MODE_PARTICLES [ / code ] <nl> + Returns the shader mode for the shader , either [ code ] MODE_CANVAS_ITEM [ / code ] , [ code ] MODE_SPATIAL [ / code ] or [ code ] MODE_PARTICLES [ / code ] <nl> < / description > <nl> < / method > <nl> < method name = " has_param " qualifiers = " const " > <nl> mmm a / doc / classes / StreamPeerTCP . xml <nl> ppp b / doc / classes / StreamPeerTCP . xml <nl> <nl> A status representing a [ code ] StreamPeerTCP [ / code ] that is connected to a host . <nl> < / constant > <nl> < constant name = " STATUS_ERROR " value = " 3 " enum = " Status " > <nl> - A staus representing a [ code ] StreamPeerTCP [ / code ] in error state . <nl> + A status representing a [ code ] StreamPeerTCP [ / code ] in error state . <nl> < / constant > <nl> < / constants > <nl> < / class > <nl> mmm a / drivers / gles2 / rasterizer_canvas_gles2 . cpp <nl> ppp b / drivers / gles2 / rasterizer_canvas_gles2 . cpp <nl> void RasterizerCanvasGLES2 : : _canvas_item_render_commands ( Item * p_item , Item * cur <nl> buffer [ ( 1 * 4 * 4 ) + 14 ] = ( source . position . x + source . size . x ) * texpixel_size . x ; <nl> buffer [ ( 1 * 4 * 4 ) + 15 ] = ( source . position . y + np - > margin [ MARGIN_TOP ] ) * texpixel_size . y ; <nl> <nl> - / / thrid row <nl> + / / third row <nl> <nl> buffer [ ( 2 * 4 * 4 ) + 0 ] = np - > rect . position . x ; <nl> buffer [ ( 2 * 4 * 4 ) + 1 ] = np - > rect . position . y + np - > rect . size . y - np - > margin [ MARGIN_BOTTOM ] ; <nl> mmm a / drivers / gles2 / rasterizer_storage_gles2 . cpp <nl> ppp b / drivers / gles2 / rasterizer_storage_gles2 . cpp <nl> void RasterizerStorageGLES2 : : _update_material ( Material * p_material ) { <nl> } <nl> } <nl> <nl> - / / uniforms and other thigns will be set in the use_material method in ShaderGLES2 <nl> + / / uniforms and other things will be set in the use_material method in ShaderGLES2 <nl> <nl> if ( p_material - > shader & & p_material - > shader - > texture_count > 0 ) { <nl> <nl> mmm a / drivers / gles2 / shader_gles2 . cpp <nl> ppp b / drivers / gles2 / shader_gles2 . cpp <nl> ShaderGLES2 : : Version * ShaderGLES2 : : get_current_version ( ) { <nl> } <nl> } <nl> <nl> - / / keep them around during the functino <nl> + / / keep them around during the function <nl> CharString code_string ; <nl> CharString code_string2 ; <nl> CharString code_globals ; <nl> mmm a / drivers / gles3 / shaders / tonemap . glsl <nl> ppp b / drivers / gles3 / shaders / tonemap . glsl <nl> vec3 apply_tonemapping ( vec3 color , float white ) { / / inputs are LINEAR , always o <nl> return tonemap_aces ( color , white ) ; <nl> # endif <nl> <nl> - return clamp ( color , vec3 ( 0 . 0f ) , vec3 ( 1 . 0f ) ) ; / / no other seleced - > linear <nl> + return clamp ( color , vec3 ( 0 . 0f ) , vec3 ( 1 . 0f ) ) ; / / no other selected - > linear <nl> } <nl> <nl> vec3 gather_glow ( sampler2D tex , vec2 uv ) { / / sample all selected glow levels <nl> mmm a / drivers / unix / dir_access_unix . cpp <nl> ppp b / drivers / unix / dir_access_unix . cpp <nl> Error DirAccessUnix : : list_dir_begin ( ) { <nl> <nl> / / char real_current_dir_name [ 2048 ] ; / / is this enough ? ! <nl> / / getcwd ( real_current_dir_name , 2048 ) ; <nl> - / / chdir ( curent_path . utf8 ( ) . get_data ( ) ) ; <nl> + / / chdir ( current_path . utf8 ( ) . get_data ( ) ) ; <nl> dir_stream = opendir ( current_dir . utf8 ( ) . get_data ( ) ) ; <nl> / / chdir ( real_current_dir_name ) ; <nl> if ( ! dir_stream ) <nl> mmm a / editor / connections_dialog . cpp <nl> ppp b / editor / connections_dialog . cpp <nl> void ConnectionsDock : : _disconnect ( TreeItem & item ) { <nl> } <nl> <nl> / * <nl> - Break all conections of currently selected signal . <nl> + Break all connections of currently selected signal . <nl> Can undo - redo as a single action . <nl> * / <nl> void ConnectionsDock : : _disconnect_all ( ) { <nl> mmm a / editor / editor_file_system . cpp <nl> ppp b / editor / editor_file_system . cpp <nl> bool EditorFileSystem : : _test_for_reimport ( const String & p_path , bool p_only_impo <nl> <nl> memdelete ( f ) ; <nl> <nl> - / / Read the md5 ' s from a separate file ( so the import parameters aren ' t dependant on the file version <nl> + / / Read the md5 ' s from a separate file ( so the import parameters aren ' t dependent on the file version <nl> String base_path = ResourceFormatImporter : : get_singleton ( ) - > get_import_base_path ( p_path ) ; <nl> FileAccess * md5s = FileAccess : : open ( base_path + " . md5 " , FileAccess : : READ , & err ) ; <nl> if ( ! md5s ) { / / No md5 ' s stored for this resource <nl> mmm a / editor / editor_inspector . cpp <nl> ppp b / editor / editor_inspector . cpp <nl> void EditorInspector : : edit ( Object * p_object ) { <nl> if ( object ) { <nl> update_scroll_request = 0 ; / / reset <nl> if ( scroll_cache . has ( object - > get_instance_id ( ) ) ) { / / if exists , set something else <nl> - update_scroll_request = scroll_cache [ object - > get_instance_id ( ) ] ; / / done this way because wait until full size is accomodated <nl> + update_scroll_request = scroll_cache [ object - > get_instance_id ( ) ] ; / / done this way because wait until full size is accommodated <nl> } <nl> object - > add_change_receptor ( this ) ; <nl> update_tree ( ) ; <nl> mmm a / editor / editor_node . cpp <nl> ppp b / editor / editor_node . cpp <nl> void EditorNode : : _update_dock_slots_visibility ( ) { <nl> <nl> void EditorNode : : _dock_tab_changed ( int p_tab ) { <nl> <nl> - / / update visibility but dont set current tab <nl> + / / update visibility but don ' t set current tab <nl> VSplitContainer * splits [ DOCK_SLOT_MAX / 2 ] = { <nl> left_l_vsplit , <nl> left_r_vsplit , <nl> EditorNode : : EditorNode ( ) { <nl> Physics2DServer : : get_singleton ( ) - > set_active ( false ) ; / / no physics by default if editor <nl> ScriptServer : : set_scripting_enabled ( false ) ; / / no scripting by default if editor <nl> <nl> - EditorHelp : : generate_doc ( ) ; / / before any editor classes are crated <nl> + EditorHelp : : generate_doc ( ) ; / / before any editor classes are created <nl> SceneState : : set_disable_placeholders ( true ) ; <nl> ResourceLoader : : clear_translation_remaps ( ) ; / / no remaps using during editor <nl> ResourceLoader : : clear_path_remaps ( ) ; <nl> EditorNode : : EditorNode ( ) { <nl> # else <nl> ED_SHORTCUT ( " editor / editor_2d " , TTR ( " Open 2D Editor " ) , KEY_F1 ) ; <nl> ED_SHORTCUT ( " editor / editor_3d " , TTR ( " Open 3D Editor " ) , KEY_F2 ) ; <nl> - ED_SHORTCUT ( " editor / editor_script " , TTR ( " Open Script Editor " ) , KEY_F3 ) ; / / hack neded for script editor F3 search to work : ) Assign like this or don ' t use F3 <nl> + ED_SHORTCUT ( " editor / editor_script " , TTR ( " Open Script Editor " ) , KEY_F3 ) ; / / hack needed for script editor F3 search to work : ) Assign like this or don ' t use F3 <nl> ED_SHORTCUT ( " editor / editor_help " , TTR ( " Search Help " ) , KEY_F4 ) ; <nl> # endif <nl> ED_SHORTCUT ( " editor / editor_assetlib " , TTR ( " Open Asset Library " ) ) ; <nl> mmm a / editor / editor_properties . cpp <nl> ppp b / editor / editor_properties . cpp <nl> EditorPropertyNodePath : : EditorPropertyNodePath ( ) { <nl> clear - > connect ( " pressed " , this , " _node_clear " ) ; <nl> hbc - > add_child ( clear ) ; <nl> <nl> - scene_tree = NULL ; / / do not allocate unnecesarily <nl> + scene_tree = NULL ; / / do not allocate unnecessarily <nl> } <nl> <nl> / / / / / / / / / / / / / / RESOURCE / / / / / / / / / / / / / / / / / / / / / / <nl> bool EditorInspectorDefaultPlugin : : parse_property ( Object * p_object , Variant : : Typ <nl> case PROPERTY_HINT_LAYERS_3D_PHYSICS : <nl> lt = EditorPropertyLayers : : LAYER_PHYSICS_3D ; <nl> break ; <nl> - default : { } / / compiler could be smarter here and realize this cant happen <nl> + default : { } / / compiler could be smarter here and realize this can ' t happen <nl> } <nl> EditorPropertyLayers * editor = memnew ( EditorPropertyLayers ) ; <nl> editor - > setup ( lt ) ; <nl> bool EditorInspectorDefaultPlugin : : parse_property ( Object * p_object , Variant : : Typ <nl> bool greater = true , lesser = true ; <nl> <nl> if ( p_hint = = PROPERTY_HINT_RANGE & & p_hint_text . get_slice_count ( " , " ) > = 2 ) { <nl> - greater = false ; / / if using ranged , asume false by default <nl> + greater = false ; / / if using ranged , assume false by default <nl> lesser = false ; <nl> min = p_hint_text . get_slice ( " , " , 0 ) . to_int ( ) ; <nl> max = p_hint_text . get_slice ( " , " , 1 ) . to_int ( ) ; <nl> bool EditorInspectorDefaultPlugin : : parse_property ( Object * p_object , Variant : : Typ <nl> bool greater = true , lesser = true ; <nl> <nl> if ( ( p_hint = = PROPERTY_HINT_RANGE | | p_hint = = PROPERTY_HINT_EXP_RANGE ) & & p_hint_text . get_slice_count ( " , " ) > = 2 ) { <nl> - greater = false ; / / if using ranged , asume false by default <nl> + greater = false ; / / if using ranged , assume false by default <nl> lesser = false ; <nl> min = p_hint_text . get_slice ( " , " , 0 ) . to_double ( ) ; <nl> max = p_hint_text . get_slice ( " , " , 1 ) . to_double ( ) ; <nl> bool EditorInspectorDefaultPlugin : : parse_property ( Object * p_object , Variant : : Typ <nl> default : { } <nl> } <nl> <nl> - return false ; / / can be overriden , although it will most likely be last anyway <nl> + return false ; / / can be overridden , although it will most likely be last anyway <nl> } <nl> <nl> void EditorInspectorDefaultPlugin : : parse_end ( ) { <nl> mmm a / editor / editor_spin_slider . cpp <nl> ppp b / editor / editor_spin_slider . cpp <nl> void EditorSpinSlider : : _notification ( int p_what ) { <nl> update ( ) ; <nl> } <nl> if ( p_what = = NOTIFICATION_FOCUS_ENTER ) { <nl> - / * Sorry , I dont like this , it makes navigating the different fields with arrows more difficult . <nl> + / * Sorry , I don ' t like this , it makes navigating the different fields with arrows more difficult . <nl> * Just press enter to edit . <nl> * if ( Input : : get_singleton ( ) - > is_mouse_button_pressed ( BUTTON_LEFT ) & & ! value_input_just_closed ) { <nl> _focus_entered ( ) ; <nl> mmm a / editor / find_in_files . cpp <nl> ppp b / editor / find_in_files . cpp <nl> void FindInFilesPanel : : apply_replaces_in_file ( String fpath , const Vector < Result > <nl> <nl> / / If the file is already open , I assume the editor will reload it . <nl> / / If there are unsaved changes , the user will be asked on focus , <nl> - / / however that means either loosing changes or loosing replaces . <nl> + / / however that means either losing changes or losing replaces . <nl> <nl> FileAccess * f = FileAccess : : open ( fpath , FileAccess : : READ ) ; <nl> ERR_FAIL_COND ( f = = NULL ) ; <nl> mmm a / editor / icons / README . md <nl> ppp b / editor / icons / README . md <nl> There you can find the optimizer script . <nl> If you add a new icon , please make a pull request to this repo : <nl> https : / / github . com / godotengine / godot - design / <nl> <nl> - and store the the optimized SVG version here . <nl> + and store the optimized SVG version here . <nl> mmm a / editor / import / resource_importer_layered_texture . cpp <nl> ppp b / editor / import / resource_importer_layered_texture . cpp <nl> Error ResourceImporterLayeredTexture : : import ( const String & p_source_file , const <nl> } <nl> <nl> if ( ! ok_on_pc ) { <nl> - EditorNode : : add_io_error ( " Warning , no suitable PC VRAM compression enabled in Project Settings . This texture will not display correcly on PC . " ) ; <nl> + EditorNode : : add_io_error ( " Warning , no suitable PC VRAM compression enabled in Project Settings . This texture will not display correctly on PC . " ) ; <nl> } <nl> } else { <nl> / / import normally <nl> mmm a / editor / import / resource_importer_texture . cpp <nl> ppp b / editor / import / resource_importer_texture . cpp <nl> Error ResourceImporterTexture : : import ( const String & p_source_file , const String <nl> } <nl> <nl> if ( ! ok_on_pc ) { <nl> - EditorNode : : add_io_error ( " Warning , no suitable PC VRAM compression enabled in Project Settings . This texture will not display correcly on PC . " ) ; <nl> + EditorNode : : add_io_error ( " Warning , no suitable PC VRAM compression enabled in Project Settings . This texture will not display correctly on PC . " ) ; <nl> } <nl> } else { <nl> / / import normally <nl> mmm a / editor / plugins / animation_blend_tree_editor_plugin . cpp <nl> ppp b / editor / plugins / animation_blend_tree_editor_plugin . cpp <nl> void AnimationNodeBlendTreeEditor : : _update_graph ( ) { <nl> mb - > get_popup ( ) - > connect ( " index_pressed " , this , " _anim_selected " , varray ( options , E - > get ( ) ) , CONNECT_DEFERRED ) ; <nl> } <nl> <nl> - / * should be no longer necesary , as the boolean works <nl> + / * should be no longer necessary , as the boolean works <nl> Ref < AnimationNodeOneShot > oneshot = agnode ; <nl> if ( oneshot . is_valid ( ) ) { <nl> <nl> bool AnimationNodeBlendTreeEditor : : _update_filters ( const Ref < AnimationNode > & ano <nl> node = base - > get_node ( accum ) ; <nl> } <nl> if ( ! node ) <nl> - continue ; / / no node , cant edit <nl> + continue ; / / no node , can ' t edit <nl> <nl> if ( path . get_subname_count ( ) ) { <nl> <nl> mmm a / editor / plugins / animation_player_editor_plugin . cpp <nl> ppp b / editor / plugins / animation_player_editor_plugin . cpp <nl> void AnimationPlayerEditor : : _prepare_onion_layers_2 ( ) { <nl> <nl> void AnimationPlayerEditor : : _start_onion_skinning ( ) { <nl> <nl> - / / FIXME : Using " idle_frame " makes onion layers update one frame behing the current <nl> + / / FIXME : Using " idle_frame " makes onion layers update one frame behind the current <nl> if ( ! get_tree ( ) - > is_connected ( " idle_frame " , this , " call_deferred " ) ) { <nl> get_tree ( ) - > connect ( " idle_frame " , this , " call_deferred " , varray ( " _prepare_onion_layers_1 " ) ) ; <nl> } <nl> mmm a / editor / plugins / animation_state_machine_editor . cpp <nl> ppp b / editor / plugins / animation_state_machine_editor . cpp <nl> void AnimationNodeStateMachineEditor : : _state_machine_draw ( ) { <nl> <nl> transition_lines . clear ( ) ; <nl> <nl> - / / draw conecting line for potential new transition <nl> + / / draw connecting line for potential new transition <nl> if ( connecting ) { <nl> Vector2 from = ( state_machine - > get_node_position ( connecting_from ) * EDSCALE ) - state_machine - > get_graph_offset ( ) * EDSCALE ; <nl> Vector2 to ; <nl> mmm a / editor / plugins / canvas_item_editor_plugin . cpp <nl> ppp b / editor / plugins / canvas_item_editor_plugin . cpp <nl> void CanvasItemEditor : : _draw_hover ( ) { <nl> Size2 item_size = Size2 ( node_icon - > get_size ( ) . x + 4 + node_name_size . x , MAX ( node_icon - > get_size ( ) . y , node_name_size . y - 3 ) ) ; <nl> <nl> Point2 pos = transform . xform ( hovering_results [ i ] . position ) - Point2 ( 0 , item_size . y ) + ( Point2 ( node_icon - > get_size ( ) . x , - node_icon - > get_size ( ) . y ) / 4 ) ; <nl> - / / Rectify the position to avoid overlaping items <nl> + / / Rectify the position to avoid overlapping items <nl> for ( List < Rect2 > : : Element * E = previous_rects . front ( ) ; E ; E = E - > next ( ) ) { <nl> if ( E - > get ( ) . intersects ( Rect2 ( pos , item_size ) ) ) { <nl> pos . y = E - > get ( ) . get_position ( ) . y - item_size . y ; <nl> mmm a / editor / plugins / root_motion_editor_plugin . cpp <nl> ppp b / editor / plugins / root_motion_editor_plugin . cpp <nl> void EditorPropertyRootMotion : : _node_assign ( ) { <nl> node = base - > get_node ( accum ) ; <nl> } <nl> if ( ! node ) <nl> - continue ; / / no node , cant edit <nl> + continue ; / / no node , can ' t edit <nl> <nl> if ( path . get_subname_count ( ) ) { <nl> <nl> bool EditorInspectorRootMotionPlugin : : parse_property ( Object * p_object , Variant : : <nl> return true ; <nl> } <nl> <nl> - return false ; / / can be overriden , although it will most likely be last anyway <nl> + return false ; / / can be overridden , although it will most likely be last anyway <nl> } <nl> <nl> void EditorInspectorRootMotionPlugin : : parse_end ( ) { <nl> mmm a / editor / plugins / script_text_editor . cpp <nl> ppp b / editor / plugins / script_text_editor . cpp <nl> void ScriptTextEditor : : _text_edit_gui_input ( const Ref < InputEvent > & ev ) { <nl> int to_column = tx - > get_selection_to_column ( ) ; <nl> <nl> if ( row < from_line | | row > to_line | | ( row = = from_line & & col < from_column ) | | ( row = = to_line & & col > to_column ) ) { <nl> - / / Right click is outside the seleted text <nl> + / / Right click is outside the selected text <nl> tx - > deselect ( ) ; <nl> } <nl> } <nl> mmm a / editor / plugins / shader_editor_plugin . cpp <nl> ppp b / editor / plugins / shader_editor_plugin . cpp <nl> void ShaderEditor : : _text_edit_gui_input ( const Ref < InputEvent > & ev ) { <nl> int to_column = tx - > get_selection_to_column ( ) ; <nl> <nl> if ( row < from_line | | row > to_line | | ( row = = from_line & & col < from_column ) | | ( row = = to_line & & col > to_column ) ) { <nl> - / / Right click is outside the seleted text <nl> + / / Right click is outside the selected text <nl> tx - > deselect ( ) ; <nl> } <nl> } <nl> mmm a / editor / plugins / text_editor . cpp <nl> ppp b / editor / plugins / text_editor . cpp <nl> void TextEditor : : _text_edit_gui_input ( const Ref < InputEvent > & ev ) { <nl> int to_column = tx - > get_selection_to_column ( ) ; <nl> <nl> if ( row < from_line | | row > to_line | | ( row = = from_line & & col < from_column ) | | ( row = = to_line & & col > to_column ) ) { <nl> - / / Right click is outside the seleted text <nl> + / / Right click is outside the selected text <nl> tx - > deselect ( ) ; <nl> } <nl> } <nl> mmm a / editor / plugins / visual_shader_editor_plugin . cpp <nl> ppp b / editor / plugins / visual_shader_editor_plugin . cpp <nl> void VisualShaderEditor : : _duplicate_nodes ( ) { <nl> int id = String ( graph - > get_child ( i ) - > get_name ( ) ) . to_int ( ) ; <nl> Ref < VisualShaderNode > node = visual_shader - > get_node ( type , id ) ; <nl> Ref < VisualShaderNodeOutput > output = node ; <nl> - if ( output . is_valid ( ) ) / / cant duplicate output <nl> + if ( output . is_valid ( ) ) / / can ' t duplicate output <nl> continue ; <nl> if ( node . is_valid ( ) ) { <nl> nodes . push_back ( id ) ; <nl> bool EditorInspectorShaderModePlugin : : parse_property ( Object * p_object , Variant : : <nl> return true ; <nl> } <nl> <nl> - return false ; / / can be overriden , although it will most likely be last anyway <nl> + return false ; / / can be overridden , although it will most likely be last anyway <nl> } <nl> <nl> void EditorInspectorShaderModePlugin : : parse_end ( ) { <nl> mmm a / editor / translations / extract . py <nl> ppp b / editor / translations / extract . py <nl> def process_file ( f , fname ) : <nl> unique_str . append ( msg ) <nl> unique_loc [ msg ] = [ location ] <nl> elif ( not location in unique_loc [ msg ] ) : <nl> - # Add additional location to previous occurence too <nl> + # Add additional location to previous occurrence too <nl> msg_pos = main_po . find ( ' \ nmsgid " ' + msg + ' " ' ) <nl> if ( msg_pos = = - 1 ) : <nl> print ( " Someone apparently thought writing Python was as easy as GDScript . Ping Akien . " ) <nl> mmm a / main / tests / test_gui . cpp <nl> ppp b / main / tests / test_gui . cpp <nl> class TestMainLoop : public SceneTree { <nl> richtext - > push_meta ( " http : / / www . scrollingcapabilities . xz " ) ; <nl> richtext - > add_text ( " This allows to test for the scrolling capabilities " ) ; <nl> richtext - > pop ( ) ; <nl> - richtext - > add_text ( " of the rich text label for huge text ( not like this text will really be huge but , you know ) . \ nAs long as it is so long that it will work nicely for a test / demo , then it ' s welcomed in my book . . . \ nChanging subject , the day is cloudy today and I ' m wondering if I ' ll get che chance to travel somewhere nice . Sometimes , watching the clouds from satellite images may give a nice insight about how pressure zones in our planet work , althogh it also makes it pretty obvious to see why most weather forecasts get it wrong so often . \ nClouds are so difficult to predict ! \ nBut it ' s pretty cool how our civilization has adapted to having water falling from the sky each time it rains . . . " ) ; <nl> + richtext - > add_text ( " of the rich text label for huge text ( not like this text will really be huge but , you know ) . \ nAs long as it is so long that it will work nicely for a test / demo , then it ' s welcomed in my book . . . \ nChanging subject , the day is cloudy today and I ' m wondering if I ' ll get che chance to travel somewhere nice . Sometimes , watching the clouds from satellite images may give a nice insight about how pressure zones in our planet work , although it also makes it pretty obvious to see why most weather forecasts get it wrong so often . \ nClouds are so difficult to predict ! \ nBut it ' s pretty cool how our civilization has adapted to having water falling from the sky each time it rains . . . " ) ; <nl> <nl> TabContainer * tabc = memnew ( TabContainer ) ; <nl> <nl> mmm a / main / timer_sync . cpp <nl> ppp b / main / timer_sync . cpp <nl> MainFrameTime MainTimerSync : : advance_core ( float p_frame_slice , int p_iterations_ <nl> int min_typical_steps = typical_physics_steps [ 0 ] ; <nl> int max_typical_steps = min_typical_steps + 1 ; <nl> <nl> - / / given the past recorded steps and typcial steps to match , calculate bounds for this <nl> + / / given the past recorded steps and typical steps to match , calculate bounds for this <nl> / / step to be typical <nl> bool update_typical = false ; <nl> <nl> mmm a / modules / bullet / rigid_body_bullet . cpp <nl> ppp b / modules / bullet / rigid_body_bullet . cpp <nl> void RigidBodyBullet : : on_exit_area ( AreaBullet * p_area ) { <nl> bool wasTheAreaFound = false ; <nl> for ( int i = 0 ; i < areaWhereIamCount ; + + i ) { <nl> if ( p_area = = areasWhereIam [ i ] ) { <nl> - / / The area was fount , just shift down all elements <nl> + / / The area was found , just shift down all elements <nl> for ( int j = i ; j < areaWhereIamCount ; + + j ) { <nl> areasWhereIam . write [ j ] = areasWhereIam [ j + 1 ] ; <nl> } <nl> mmm a / modules / csg / csg . cpp <nl> ppp b / modules / csg / csg . cpp <nl> void CSGBrushOperation : : BuildPoly : : _clip_segment ( const CSGBrush * p_brush , int p_ <nl> for ( int j = 0 ; j < 2 ; j + + ) { <nl> <nl> if ( edges [ i ] . points [ 0 ] = = segment_idx [ 0 ] | | edges [ i ] . points [ 1 ] = = segment_idx [ 1 ] | | edges [ i ] . points [ 0 ] = = segment_idx [ 1 ] | | edges [ i ] . points [ 1 ] = = segment_idx [ 0 ] ) { <nl> - edge_valid = false ; / / segment has this point , cant check against this <nl> + edge_valid = false ; / / segment has this point , can ' t check against this <nl> break ; <nl> } <nl> } <nl> <nl> - if ( ! edge_valid ) / / already hit a point in this edge , so dont test it <nl> + if ( ! edge_valid ) / / already hit a point in this edge , so don ' t test it <nl> continue ; <nl> <nl> / / see if either points are within the edge isntead of crossing it <nl> void CSGBrushOperation : : _collision_callback ( const CSGBrush * A , int p_face_a , Map <nl> } <nl> } <nl> <nl> - / / if we are still here , it means they most likely intersect , so create BuildPolys if they dont existy <nl> + / / if we are still here , it means they most likely intersect , so create BuildPolys if they don ' t exist <nl> <nl> BuildPoly * poly_a = NULL ; <nl> <nl> void CSGBrushOperation : : _merge_poly ( MeshMerge & mesh , int p_face_idx , const Build <nl> Vector2 to = p_poly . points [ to_idx ] . point ; <nl> with_outline_vertex = l ; <nl> <nl> - / / try agaisnt outline ( other points ) first <nl> + / / try against outline ( other points ) first <nl> <nl> valid = true ; <nl> <nl> void CSGBrushOperation : : _merge_poly ( MeshMerge & mesh , int p_face_idx , const Build <nl> if ( ! valid ) <nl> continue ; <nl> <nl> - / / try agaisnt all holes including self <nl> + / / try against all holes including self <nl> <nl> for ( int m = 0 ; m < polys [ i ] . holes . size ( ) ; m + + ) { <nl> <nl> mmm a / modules / enet / doc_classes / NetworkedMultiplayerENet . xml <nl> ppp b / modules / enet / doc_classes / NetworkedMultiplayerENet . xml <nl> <nl> < argument index = " 4 " name = " client_port " type = " int " default = " 0 " > <nl> < / argument > <nl> < description > <nl> - Create client that connects to a server at [ code ] address [ / code ] using specified [ code ] port [ / code ] . The given address needs to be either a fully qualified domain nome ( e . g . [ code ] www . example . com [ / code ] ) or an IP address in IPv4 or IPv6 format ( e . g . [ code ] 192 . 168 . 1 . 1 [ / code ] ) . The [ code ] port [ / code ] is the port the server is listening on . The [ code ] in_bandwidth [ / code ] and [ code ] out_bandwidth [ / code ] parameters can be used to limit the incoming and outgoing bandwidth to the given number of bytes per second . The default of 0 means unlimited bandwidth . Note that ENet will strategically drop packets on specific sides of a connection between peers to ensure the peer ' s bandwidth is not overwhelmed . The bandwidth parameters also determine the window size of a connection which limits the amount of reliable packets that may be in transit at any given time . Returns [ code ] OK [ / code ] if a client was created , [ code ] ERR_ALREADY_IN_USE [ / code ] if this NetworkedMultiplayerEnet instance already has an open connection ( in which case you need to call [ method close_connection ] first ) or [ code ] ERR_CANT_CREATE [ / code ] if the client could not be created . If [ code ] client_port [ / code ] is specified , the client will also listen to the given port , this is useful in some NAT traveral technique . <nl> + Create client that connects to a server at [ code ] address [ / code ] using specified [ code ] port [ / code ] . The given address needs to be either a fully qualified domain nome ( e . g . [ code ] www . example . com [ / code ] ) or an IP address in IPv4 or IPv6 format ( e . g . [ code ] 192 . 168 . 1 . 1 [ / code ] ) . The [ code ] port [ / code ] is the port the server is listening on . The [ code ] in_bandwidth [ / code ] and [ code ] out_bandwidth [ / code ] parameters can be used to limit the incoming and outgoing bandwidth to the given number of bytes per second . The default of 0 means unlimited bandwidth . Note that ENet will strategically drop packets on specific sides of a connection between peers to ensure the peer ' s bandwidth is not overwhelmed . The bandwidth parameters also determine the window size of a connection which limits the amount of reliable packets that may be in transit at any given time . Returns [ code ] OK [ / code ] if a client was created , [ code ] ERR_ALREADY_IN_USE [ / code ] if this NetworkedMultiplayerEnet instance already has an open connection ( in which case you need to call [ method close_connection ] first ) or [ code ] ERR_CANT_CREATE [ / code ] if the client could not be created . If [ code ] client_port [ / code ] is specified , the client will also listen to the given port , this is useful in some NAT traversal technique . <nl> < / description > <nl> < / method > <nl> < method name = " create_server " > <nl> mmm a / modules / enet / networked_multiplayer_enet . cpp <nl> ppp b / modules / enet / networked_multiplayer_enet . cpp <nl> Error NetworkedMultiplayerENet : : create_server ( int p_port , int p_max_clients , int <nl> host = enet_host_create ( & address / * the address to bind the server host to * / , <nl> p_max_clients / * allow up to 32 clients and / or outgoing connections * / , <nl> channel_count / * allow up to channel_count to be used * / , <nl> - p_in_bandwidth / * limit incoming bandwith if > 0 * / , <nl> - p_out_bandwidth / * limit outgoing bandwith if > 0 * / ) ; <nl> + p_in_bandwidth / * limit incoming bandwidth if > 0 * / , <nl> + p_out_bandwidth / * limit outgoing bandwidth if > 0 * / ) ; <nl> <nl> ERR_FAIL_COND_V ( ! host , ERR_CANT_CREATE ) ; <nl> <nl> Error NetworkedMultiplayerENet : : create_client ( const String & p_address , int p_por <nl> host = enet_host_create ( & c_client / * create a client host * / , <nl> 1 / * only allow 1 outgoing connection * / , <nl> channel_count / * allow up to channel_count to be used * / , <nl> - p_in_bandwidth / * limit incoming bandwith if > 0 * / , <nl> - p_out_bandwidth / * limit outgoing bandwith if > 0 * / ) ; <nl> + p_in_bandwidth / * limit incoming bandwidth if > 0 * / , <nl> + p_out_bandwidth / * limit outgoing bandwidth if > 0 * / ) ; <nl> } else { <nl> host = enet_host_create ( NULL / * create a client host * / , <nl> 1 / * only allow 1 outgoing connection * / , <nl> channel_count / * allow up to channel_count to be used * / , <nl> - p_in_bandwidth / * limit incoming bandwith if > 0 * / , <nl> - p_out_bandwidth / * limit outgoing bandwith if > 0 * / ) ; <nl> + p_in_bandwidth / * limit incoming bandwidth if > 0 * / , <nl> + p_out_bandwidth / * limit outgoing bandwidth if > 0 * / ) ; <nl> } <nl> <nl> ERR_FAIL_COND_V ( ! host , ERR_CANT_CREATE ) ; <nl> mmm a / modules / freetype / SCsub <nl> ppp b / modules / freetype / SCsub <nl> if env [ ' builtin_freetype ' ] : <nl> env . Append ( CCFLAGS = [ ' / FI ' , ' " modules / freetype / uwpdef . h " ' ] ) <nl> elif env [ ' platform ' ] = = ' javascript ' : <nl> # Forcibly undefine this macro so SIMD is not used in this file , <nl> - # since currently unsuported in WASM <nl> + # since currently unsupported in WASM <nl> sfnt = env . Object ( sfnt , CPPFLAGS = [ ' - U__OPTIMIZE__ ' ] ) <nl> <nl> thirdparty_sources + = [ sfnt ] <nl> mmm a / modules / gdnative / gdnative . cpp <nl> ppp b / modules / gdnative / gdnative . cpp <nl> bool GDNative : : terminate ( ) { <nl> if ( library - > should_load_once ( ) ) { <nl> Vector < Ref < GDNative > > * gdnatives = & ( * GDNativeLibrary : : loaded_libraries ) [ library - > get_current_library_path ( ) ] ; <nl> if ( gdnatives - > size ( ) > 1 ) { <nl> - / / there are other GDNative ' s still using this library , so we actually don ' t terminte <nl> + / / there are other GDNative ' s still using this library , so we actually don ' t terminate <nl> gdnatives - > erase ( Ref < GDNative > ( this ) ) ; <nl> initialized = false ; <nl> return true ; <nl> mmm a / modules / gdscript / gdscript . cpp <nl> ppp b / modules / gdscript / gdscript . cpp <nl> String GDScriptWarning : : get_message ( ) const { <nl> } break ; <nl> case UNSAFE_CAST : { <nl> CHECK_SYMBOLS ( 1 ) ; <nl> - return " The value is cast to ' " + symbols [ 0 ] + " ' but has an unkown type . " ; <nl> + return " The value is cast to ' " + symbols [ 0 ] + " ' but has an unknown type . " ; <nl> } break ; <nl> case UNSAFE_CALL_ARGUMENT : { <nl> CHECK_SYMBOLS ( 4 ) ; <nl> return " The argument ' " + symbols [ 0 ] + " ' of the function ' " + symbols [ 1 ] + " ' requires a the subtype ' " + symbols [ 2 ] + " ' but the supertype ' " + symbols [ 3 ] + " ' was provided " ; <nl> } break ; <nl> } <nl> - ERR_EXPLAIN ( " Invalid GDScript waring code : " + get_name_from_code ( code ) ) ; <nl> + ERR_EXPLAIN ( " Invalid GDScript warning code : " + get_name_from_code ( code ) ) ; <nl> ERR_FAIL_V ( String ( ) ) ; <nl> <nl> # undef CHECK_SYMBOLS <nl> GDScriptWarning : : Code GDScriptWarning : : get_code_from_name ( const String & p_name ) <nl> } <nl> } <nl> <nl> - ERR_EXPLAIN ( " Invalid GDScript waring name : " + p_name ) ; <nl> + ERR_EXPLAIN ( " Invalid GDScript warning name : " + p_name ) ; <nl> ERR_FAIL_V ( WARNING_MAX ) ; <nl> } <nl> <nl> mmm a / modules / gdscript / gdscript . h <nl> ppp b / modules / gdscript / gdscript . h <nl> struct GDScriptWarning { <nl> FUNCTION_USED_AS_PROPERTY , / / Property not found , but there ' s a function with the same name <nl> INTEGER_DIVISION , / / Integer divide by integer , decimal part is discarded <nl> UNSAFE_PROPERTY_ACCESS , / / Property not found in the detected type ( but can be in subtypes ) <nl> - UNSAFE_METHOD_ACCESS , / / Fucntion not found in the detected type ( but can be in subtypes ) <nl> + UNSAFE_METHOD_ACCESS , / / Function not found in the detected type ( but can be in subtypes ) <nl> UNSAFE_CAST , / / Cast used in an unknown type <nl> UNSAFE_CALL_ARGUMENT , / / Function call argument is of a supertype of the require argument <nl> WARNING_MAX , <nl> mmm a / modules / gdscript / gdscript_compiler . cpp <nl> ppp b / modules / gdscript / gdscript_compiler . cpp <nl> int GDScriptCompiler : : _parse_expression ( CodeGen & codegen , const GDScriptParser : : <nl> } <nl> } <nl> <nl> - codegen . opcodes . push_back ( src_addr ) ; / / source adddress <nl> + codegen . opcodes . push_back ( src_addr ) ; / / source address <nl> int dst_addr = ( p_stack_level ) | ( GDScriptFunction : : ADDR_TYPE_STACK < < GDScriptFunction : : ADDR_BITS ) ; <nl> codegen . opcodes . push_back ( dst_addr ) ; / / append the stack level as destination address of the opcode <nl> codegen . alloc_stack ( p_stack_level ) ; <nl> mmm a / modules / gdscript / gdscript_editor . cpp <nl> ppp b / modules / gdscript / gdscript_editor . cpp <nl> Error GDScriptLanguage : : lookup_code ( const String & p_code , const String & p_symbol <nl> } <nl> } else { <nl> / * <nl> - / / Because get_integer_constant_enum and get_integer_constant dont work on @ GlobalScope <nl> + / / Because get_integer_constant_enum and get_integer_constant don ' t work on @ GlobalScope <nl> / / We cannot determine the exact nature of the identifier here <nl> / / Otherwise these codes would work <nl> StringName enumName = ClassDB : : get_integer_constant_enum ( " @ GlobalScope " , p_symbol , true ) ; <nl> mmm a / modules / gdscript / gdscript_parser . cpp <nl> ppp b / modules / gdscript / gdscript_parser . cpp <nl> void GDScriptParser : : _generate_pattern ( PatternNode * p_pattern , Node * p_node_to_m <nl> <nl> Node * condition = NULL ; <nl> <nl> - / / chech for has , then for pattern <nl> + / / check for has , then for pattern <nl> <nl> IdentifierNode * has = alloc_node < IdentifierNode > ( ) ; <nl> has - > name = " has " ; <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> member . rpc_mode = rpc_mode ; <nl> <nl> if ( current_class - > constant_expressions . has ( member . identifier ) ) { <nl> - _set_error ( " A constant named ' " + String ( member . identifier ) + " ' alread exists in this class ( at line : " + <nl> + _set_error ( " A constant named ' " + String ( member . identifier ) + " ' already exists in this class ( at line : " + <nl> itos ( current_class - > constant_expressions [ member . identifier ] . expression - > line ) + " ) . " ) ; <nl> return ; <nl> } <nl> <nl> for ( int i = 0 ; i < current_class - > variables . size ( ) ; i + + ) { <nl> if ( current_class - > variables [ i ] . identifier = = member . identifier ) { <nl> - _set_error ( " Variable ' " + String ( member . identifier ) + " ' alread exists in this class ( at line : " + <nl> + _set_error ( " Variable ' " + String ( member . identifier ) + " ' already exists in this class ( at line : " + <nl> itos ( current_class - > variables [ i ] . line ) + " ) . " ) ; <nl> return ; <nl> } <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> int line = tokenizer - > get_token_line ( ) ; <nl> <nl> if ( current_class - > constant_expressions . has ( const_id ) ) { <nl> - _set_error ( " Constant ' " + String ( const_id ) + " ' alread exists in this class ( at line : " + <nl> + _set_error ( " Constant ' " + String ( const_id ) + " ' already exists in this class ( at line : " + <nl> itos ( current_class - > constant_expressions [ const_id ] . expression - > line ) + " ) . " ) ; <nl> return ; <nl> } <nl> <nl> for ( int i = 0 ; i < current_class - > variables . size ( ) ; i + + ) { <nl> if ( current_class - > variables [ i ] . identifier = = const_id ) { <nl> - _set_error ( " A variable named ' " + String ( const_id ) + " ' alread exists in this class ( at line : " + <nl> + _set_error ( " A variable named ' " + String ( const_id ) + " ' already exists in this class ( at line : " + <nl> itos ( current_class - > variables [ i ] . line ) + " ) . " ) ; <nl> return ; <nl> } <nl> void GDScriptParser : : _parse_class ( ClassNode * p_class ) { <nl> case GDScriptTokenizer : : TK_PR_ENUM : { <nl> / / multiple constant declarations . . <nl> <nl> - int last_assign = - 1 ; / / Incremented by 1 right before the assingment . <nl> + int last_assign = - 1 ; / / Incremented by 1 right before the assignment . <nl> String enum_name ; <nl> Dictionary enum_dict ; <nl> <nl> void GDScriptParser : : _check_class_level_types ( ClassNode * p_class ) { <nl> return ; <nl> } <nl> <nl> - / / Replace assigment with implict conversion <nl> + / / Replace assignment with implict conversion <nl> BuiltInFunctionNode * convert = alloc_node < BuiltInFunctionNode > ( ) ; <nl> convert - > line = v . line ; <nl> convert - > function = GDScriptFunctions : : TYPE_CONVERT ; <nl> void GDScriptParser : : _check_block_types ( BlockNode * p_block ) { <nl> lv - > line ) ; <nl> return ; <nl> } <nl> - / / Replace assigment with implict conversion <nl> + / / Replace assignment with implict conversion <nl> BuiltInFunctionNode * convert = alloc_node < BuiltInFunctionNode > ( ) ; <nl> convert - > line = lv - > line ; <nl> convert - > function = GDScriptFunctions : : TYPE_CONVERT ; <nl> void GDScriptParser : : _check_block_types ( BlockNode * p_block ) { <nl> op - > line ) ; <nl> return ; <nl> } <nl> - / / Replace assigment with implict conversion <nl> + / / Replace assignment with implict conversion <nl> BuiltInFunctionNode * convert = alloc_node < BuiltInFunctionNode > ( ) ; <nl> convert - > line = op - > line ; <nl> convert - > function = GDScriptFunctions : : TYPE_CONVERT ; <nl> mmm a / modules / gridmap / doc_classes / GridMap . xml <nl> ppp b / modules / gridmap / doc_classes / GridMap . xml <nl> <nl> < argument index = " 2 " name = " z " type = " int " > <nl> < / argument > <nl> < description > <nl> - The orientation of the cell at the grid - based X , Y and Z coordinates . - 1 is retuned if the cell is empty . <nl> + The orientation of the cell at the grid - based X , Y and Z coordinates . - 1 is returned if the cell is empty . <nl> < / description > <nl> < / method > <nl> < method name = " get_collision_layer_bit " qualifiers = " const " > <nl> mmm a / modules / mono / mono_gd / gd_mono . cpp <nl> ppp b / modules / mono / mono_gd / gd_mono . cpp <nl> void GDMono : : initialize ( ) { <nl> _load_project_assembly ( ) ; <nl> } else { <nl> # ifdef TOOLS_ENABLED <nl> - / / The assembly was successfuly loaded , but the full api could not be cached . <nl> + / / The assembly was successfully loaded , but the full api could not be cached . <nl> / / This is most likely an outdated assembly loaded because of an invalid version in the metadata , <nl> / / so we invalidate the version in the metadata and unload the script domain . <nl> <nl> Error GDMono : : reload_scripts_domain ( ) { <nl> / / Everything is fine with the api assemblies , load the project assembly <nl> _load_project_assembly ( ) ; <nl> } else { <nl> - / / The assembly was successfuly loaded , but the full api could not be cached . <nl> + / / The assembly was successfully loaded , but the full api could not be cached . <nl> / / This is most likely an outdated assembly loaded because of an invalid version in the metadata , <nl> / / so we invalidate the version in the metadata and unload the script domain . <nl> <nl> mmm a / modules / opus / audio_stream_opus . cpp <nl> ppp b / modules / opus / audio_stream_opus . cpp <nl> Error AudioStreamPlaybackOpus : : _load_stream ( ) { <nl> } break ; <nl> case OP_EBADLINK : / / - Failed to find old data after seeking . <nl> case OP_EBADTIMESTAMP : / / - Timestamp failed the validity checks . <nl> - case OP_EBADHEADER : { / / - Invalid or mising Opus bitstream header . <nl> + case OP_EBADHEADER : { / / - Invalid or missing Opus bitstream header . <nl> memdelete ( f ) ; <nl> f = NULL ; <nl> ERR_FAIL_V ( ERR_FILE_CORRUPT ) ; <nl> Error AudioStreamPlaybackOpus : : set_file ( const String & p_file ) { <nl> } break ; <nl> case OP_EBADLINK : / / - Failed to find old data after seeking . <nl> case OP_EBADTIMESTAMP : / / - Timestamp failed the validity checks . <nl> - case OP_EBADHEADER : { / / - Invalid or mising Opus bitstream header . <nl> + case OP_EBADHEADER : { / / - Invalid or missing Opus bitstream header . <nl> memdelete ( f ) ; <nl> f = NULL ; <nl> ERR_FAIL_V ( ERR_FILE_CORRUPT ) ; <nl> mmm a / modules / upnp / doc_classes / UPNP . xml <nl> ppp b / modules / upnp / doc_classes / UPNP . xml <nl> <nl> < / argument > <nl> < description > <nl> Discovers local [ UPNPDevice ] s . Clears the list of previously discovered devices . <nl> - Filters for IGD ( InternetGatewayDevice ) type devices by default , as those manage port forwarding . [ code ] timeout [ / code ] is the time to wait for responses in miliseconds . [ code ] ttl [ / code ] is the time - to - live ; only touch this if you know what you ' re doing . <nl> + Filters for IGD ( InternetGatewayDevice ) type devices by default , as those manage port forwarding . [ code ] timeout [ / code ] is the time to wait for responses in milliseconds . [ code ] ttl [ / code ] is the time - to - live ; only touch this if you know what you ' re doing . <nl> See [ enum UPNPResult ] for possible return values . <nl> < / description > <nl> < / method > <nl> mmm a / modules / visual_script / visual_script_editor . cpp <nl> ppp b / modules / visual_script / visual_script_editor . cpp <nl> void VisualScriptEditor : : _graph_connected ( const String & p_from , int p_from_slot , <nl> int from_port ; <nl> <nl> if ( ! _get_out_slot ( from_node , p_from_slot , from_port , from_seq ) ) <nl> - return ; / / can ' t connect this , it ' s invalid <nl> + return ; / / can ' t connect this , it ' s invalid <nl> <nl> Ref < VisualScriptNode > to_node = script - > get_node ( edited_func , p_to . to_int ( ) ) ; <nl> ERR_FAIL_COND ( ! to_node . is_valid ( ) ) ; <nl> void VisualScriptEditor : : _graph_connected ( const String & p_from , int p_from_slot , <nl> int to_port ; <nl> <nl> if ( ! _get_in_slot ( to_node , p_to_slot , to_port , to_seq ) ) <nl> - return ; / / can ' t connect this , it ' s invalid <nl> + return ; / / can ' t connect this , it ' s invalid <nl> <nl> ERR_FAIL_COND ( from_seq ! = to_seq ) ; <nl> <nl> void VisualScriptEditor : : _graph_connected ( const String & p_from , int p_from_slot , <nl> undo_redo - > add_undo_method ( script . ptr ( ) , " sequence_disconnect " , edited_func , p_from . to_int ( ) , from_port , p_to . to_int ( ) ) ; <nl> } else { <nl> <nl> - / / disconect current , and connect the new one <nl> + / / disconnect current , and connect the new one <nl> if ( script - > is_input_value_port_connected ( edited_func , p_to . to_int ( ) , to_port ) ) { <nl> int conn_from ; <nl> int conn_port ; <nl> void VisualScriptEditor : : _graph_disconnected ( const String & p_from , int p_from_sl <nl> int from_port ; <nl> <nl> if ( ! _get_out_slot ( from_node , p_from_slot , from_port , from_seq ) ) <nl> - return ; / / can ' t connect this , it ' s invalid <nl> + return ; / / can ' t connect this , it ' s invalid <nl> <nl> Ref < VisualScriptNode > to_node = script - > get_node ( edited_func , p_to . to_int ( ) ) ; <nl> ERR_FAIL_COND ( ! to_node . is_valid ( ) ) ; <nl> void VisualScriptEditor : : _graph_disconnected ( const String & p_from , int p_from_sl <nl> int to_port ; <nl> <nl> if ( ! _get_in_slot ( to_node , p_to_slot , to_port , to_seq ) ) <nl> - return ; / / can ' t connect this , it ' s invalid <nl> + return ; / / can ' t connect this , it ' s invalid <nl> <nl> ERR_FAIL_COND ( from_seq ! = to_seq ) ; <nl> <nl> mmm a / modules / websocket / doc_classes / WebSocketClient . xml <nl> ppp b / modules / websocket / doc_classes / WebSocketClient . xml <nl> <nl> < / argument > <nl> < description > <nl> Connect to the given URL requesting one of the given [ code ] protocols [ / code ] as sub - protocol . <nl> - If [ code ] true [ / code ] is passed as [ code ] gd_mp_api [ / code ] , the client will behave like a network peer for the [ MultiplayerAPI ] . Note : connnections to non Godot servers will not work , and [ signal data_received ] will not be emitted when this option is true . <nl> + If [ code ] true [ / code ] is passed as [ code ] gd_mp_api [ / code ] , the client will behave like a network peer for the [ MultiplayerAPI ] . Note : connections to non Godot servers will not work , and [ signal data_received ] will not be emitted when this option is true . <nl> < / description > <nl> < / method > <nl> < method name = " disconnect_from_host " > <nl> mmm a / platform / android / os_android . h <nl> ppp b / platform / android / os_android . h <nl> class OS_Android : public OS_Unix { <nl> int video_driver_index ; <nl> <nl> public : <nl> - / / functions used by main to initialize / deintialize the OS <nl> + / / functions used by main to initialize / deinitialize the OS <nl> virtual int get_video_driver_count ( ) const ; <nl> virtual const char * get_video_driver_name ( int p_driver ) const ; <nl> <nl> mmm a / platform / javascript / os_javascript . cpp <nl> ppp b / platform / javascript / os_javascript . cpp <nl> Error OS_JavaScript : : initialize ( const VideoMode & p_desired , int p_video_driver , <nl> video_driver_index = p_video_driver ; <nl> <nl> video_mode = p_desired ; <nl> - / / Can ' t fulfil fullscreen request during start - up due to browser security . <nl> + / / Can ' t fulfill fullscreen request during start - up due to browser security . <nl> video_mode . fullscreen = false ; <nl> / * clang - format off * / <nl> if ( EM_ASM_INT_V ( { return Module . resizeCanvasOnStart } ) ) { <nl> mmm a / platform / uwp / os_uwp . h <nl> ppp b / platform / uwp / os_uwp . h <nl> class OSUWP : public OS { <nl> Windows : : Devices : : Sensors : : Magnetometer ^ magnetometer ; <nl> Windows : : Devices : : Sensors : : Gyrometer ^ gyrometer ; <nl> <nl> - / / functions used by main to initialize / deintialize the OS <nl> + / / functions used by main to initialize / deinitialize the OS <nl> protected : <nl> virtual int get_video_driver_count ( ) const ; <nl> virtual int get_current_video_driver ( ) const ; <nl> mmm a / platform / windows / os_windows . h <nl> ppp b / platform / windows / os_windows . h <nl> class OS_Windows : public OS { <nl> <nl> void _update_window_style ( bool repaint = true ) ; <nl> <nl> - / / functions used by main to initialize / deintialize the OS <nl> + / / functions used by main to initialize / deinitialize the OS <nl> protected : <nl> virtual int get_current_video_driver ( ) const ; <nl> <nl> mmm a / scene / 2d / canvas_item . h <nl> ppp b / scene / 2d / canvas_item . h <nl> class CanvasItem : public Node { <nl> <nl> void force_update_transform ( ) ; <nl> <nl> - / / Used by control nodes to retreive the parent ' s anchorable area <nl> + / / Used by control nodes to retrieve the parent ' s anchorable area <nl> virtual Rect2 get_anchorable_rect ( ) const { return Rect2 ( 0 , 0 , 0 , 0 ) ; } ; <nl> <nl> int get_canvas_layer ( ) const ; <nl> mmm a / scene / 3d / vehicle_body . cpp <nl> ppp b / scene / 3d / vehicle_body . cpp <nl> void VehicleBody : : _resolve_single_bilateral ( PhysicsDirectBodyState * s , const Vec <nl> b2invmass ) ; <nl> <nl> / / FIXME : rel_vel assignment here is overwritten by the following assignment . <nl> - / / What seemes to be intended in the next next assignment is : rel_vel = normal . dot ( rel_vel ) ; <nl> + / / What seems to be intended in the next next assignment is : rel_vel = normal . dot ( rel_vel ) ; <nl> / / Investigate why . <nl> real_t rel_vel = jac . getRelativeVelocity ( <nl> s - > get_linear_velocity ( ) , <nl> mmm a / scene / animation / animation_node_state_machine . cpp <nl> ppp b / scene / animation / animation_node_state_machine . cpp <nl> float AnimationNodeStateMachinePlayback : : process ( AnimationNodeStateMachine * sm , <nl> } <nl> <nl> if ( ! _travel ( sm , start_request ) ) { <nl> - / / cant travel , then teleport <nl> + / / can ' t travel , then teleport <nl> path . clear ( ) ; <nl> current = start_request ; <nl> } <nl> mmm a / scene / animation / animation_player . cpp <nl> ppp b / scene / animation / animation_player . cpp <nl> void AnimationPlayer : : _animation_process_animation ( AnimationData * p_anim , float <nl> if ( first_key_time = = 0 . 0 ) { <nl> / / ignore , use for transition <nl> if ( key_count = = 1 ) <nl> - continue ; / / with one key we cant do anything <nl> + continue ; / / with one key we can ' t do anything <nl> transition = a - > track_get_key_transition ( i , 0 ) ; <nl> first_key_time = a - > track_get_key_time ( i , 1 ) ; <nl> first_key = 1 ; <nl> mmm a / scene / animation / animation_tree . cpp <nl> ppp b / scene / animation / animation_tree . cpp <nl> float AnimationNode : : _blend_node ( const StringName & p_subpath , const Vector < Strin <nl> case FILTER_IGNORE : <nl> break ; / / will not happen anyway <nl> case FILTER_PASS : { <nl> - / / values filtered pass , the rest dont <nl> + / / values filtered pass , the rest don ' t <nl> for ( int i = 0 ; i < blend_count ; i + + ) { <nl> if ( blendw [ i ] = = 0 ) / / not filtered , does not pass <nl> continue ; <nl> float AnimationNode : : _blend_node ( const StringName & p_subpath , const Vector < Strin <nl> } break ; <nl> case FILTER_STOP : { <nl> <nl> - / / values filtered dont pass , the rest are blended <nl> + / / values filtered don ' t pass , the rest are blended <nl> <nl> for ( int i = 0 ; i < blend_count ; i + + ) { <nl> if ( blendw [ i ] > 0 ) / / filtered , does not pass <nl> String AnimationNode : : get_caption ( ) const { <nl> } <nl> <nl> void AnimationNode : : add_input ( const String & p_name ) { <nl> - / / root nodes cant add inputs <nl> + / / root nodes can ' t add inputs <nl> ERR_FAIL_COND ( Object : : cast_to < AnimationRootNode > ( this ) ! = NULL ) <nl> Input input ; <nl> ERR_FAIL_COND ( p_name . find ( " . " ) ! = - 1 | | p_name . find ( " / " ) ! = - 1 ) ; <nl> void AnimationTree : : _process_graph ( float p_delta ) { <nl> t - > object - > set_indexed ( t - > subpath , t - > value ) ; <nl> <nl> } break ; <nl> - default : { } / / the rest dont matter <nl> + default : { } / / the rest don ' t matter <nl> } <nl> } <nl> } <nl> mmm a / scene / animation / root_motion_view . cpp <nl> ppp b / scene / animation / root_motion_view . cpp <nl> void RootMotionView : : _notification ( int p_what ) { <nl> <nl> first = false ; <nl> <nl> - transform . orthonormalize ( ) ; / / dont want scale , too imprecise <nl> + transform . orthonormalize ( ) ; / / don ' t want scale , too imprecise <nl> transform . affine_invert ( ) ; <nl> <nl> accumulated = transform * accumulated ; <nl> mmm a / scene / gui / control . cpp <nl> ppp b / scene / gui / control . cpp <nl> void Control : : _bind_methods ( ) { <nl> <nl> ADD_GROUP ( " Mouse " , " mouse_ " ) ; <nl> ADD_PROPERTY ( PropertyInfo ( Variant : : INT , " mouse_filter " , PROPERTY_HINT_ENUM , " Stop , Pass , Ignore " ) , " set_mouse_filter " , " get_mouse_filter " ) ; <nl> - ADD_PROPERTY ( PropertyInfo ( Variant : : INT , " mouse_default_cursor_shape " , PROPERTY_HINT_ENUM , " Arrow , Ibeam , Pointing hand , Cross , Wait , Busy , Drag , Can drop , Forbidden , Vertical resize , Horizontal resize , Secondary diagonal resize , Main diagonal resize , Move , Vertial split , Horizontal split , Help " ) , " set_default_cursor_shape " , " get_default_cursor_shape " ) ; <nl> + ADD_PROPERTY ( PropertyInfo ( Variant : : INT , " mouse_default_cursor_shape " , PROPERTY_HINT_ENUM , " Arrow , Ibeam , Pointing hand , Cross , Wait , Busy , Drag , Can drop , Forbidden , Vertical resize , Horizontal resize , Secondary diagonal resize , Main diagonal resize , Move , Vertical split , Horizontal split , Help " ) , " set_default_cursor_shape " , " get_default_cursor_shape " ) ; <nl> <nl> ADD_GROUP ( " Size Flags " , " size_flags_ " ) ; <nl> ADD_PROPERTY ( PropertyInfo ( Variant : : INT , " size_flags_horizontal " , PROPERTY_HINT_FLAGS , " Fill , Expand , Shrink Center , Shrink End " ) , " set_h_size_flags " , " get_h_size_flags " ) ; <nl> mmm a / scene / gui / graph_edit . cpp <nl> ppp b / scene / gui / graph_edit . cpp <nl> GraphEdit : : GraphEdit ( ) { <nl> add_child ( connections_layer ) ; <nl> connections_layer - > connect ( " draw " , this , " _connections_layer_draw " ) ; <nl> connections_layer - > set_name ( " CLAYER " ) ; <nl> - connections_layer - > set_disable_visibility_clip ( true ) ; / / so it can draw freely and be offseted <nl> + connections_layer - > set_disable_visibility_clip ( true ) ; / / so it can draw freely and be offset <nl> connections_layer - > set_mouse_filter ( MOUSE_FILTER_IGNORE ) ; <nl> <nl> h_scroll = memnew ( HScrollBar ) ; <nl> mmm a / scene / gui / text_edit . cpp <nl> ppp b / scene / gui / text_edit . cpp <nl> void TextEdit : : _gui_input ( const Ref < InputEvent > & p_gui_input ) { <nl> int to_column = get_selection_to_column ( ) ; <nl> <nl> if ( row < from_line | | row > to_line | | ( row = = from_line & & col < from_column ) | | ( row = = to_line & & col > to_column ) ) { <nl> - / / Right click is outside the seleted text <nl> + / / Right click is outside the selected text <nl> deselect ( ) ; <nl> } <nl> } <nl> mmm a / scene / gui / tree . cpp <nl> ppp b / scene / gui / tree . cpp <nl> int Tree : : propagate_mouse_event ( const Point2i & p_pos , int x_ofs , int y_ofs , bool <nl> if ( p_button = = BUTTON_LEFT | | ( p_button = = BUTTON_RIGHT & & allow_rmb_select ) ) { <nl> / * process selection * / <nl> <nl> - if ( p_doubleclick & & ( ! c . editable | | c . mode = = TreeItem : : CELL_MODE_CUSTOM | | c . mode = = TreeItem : : CELL_MODE_ICON / * | | c . mode = = TreeItem : : CELL_MODE_CHECK * / ) ) { / / it ' s confusing for check <nl> + if ( p_doubleclick & & ( ! c . editable | | c . mode = = TreeItem : : CELL_MODE_CUSTOM | | c . mode = = TreeItem : : CELL_MODE_ICON / * | | c . mode = = TreeItem : : CELL_MODE_CHECK * / ) ) { / / it ' s confusing for check <nl> <nl> emit_signal ( " item_activated " ) ; <nl> incr_search . clear ( ) ; <nl> mmm a / scene / resources / animation . cpp <nl> ppp b / scene / resources / animation . cpp <nl> void Animation : : track_set_key_transition ( int p_track , int p_key_idx , float p_tra <nl> case TYPE_BEZIER : <nl> case TYPE_AUDIO : <nl> case TYPE_ANIMATION : { <nl> - / / they dont use transition <nl> + / / they don ' t use transition <nl> } break ; <nl> } <nl> } <nl> mmm a / scene / resources / scene_format_text . cpp <nl> ppp b / scene / resources / scene_format_text . cpp <nl> Ref < PackedScene > ResourceInteractiveLoaderText : : _parse_node_tag ( VariantParser : : R <nl> <nl> if ( ! next_tag . fields . has ( " from " ) ) { <nl> error = ERR_FILE_CORRUPT ; <nl> - error_text = " missing ' from ' field fron connection tag " ; <nl> + error_text = " missing ' from ' field from connection tag " ; <nl> return Ref < PackedScene > ( ) ; <nl> } <nl> <nl> if ( ! next_tag . fields . has ( " to " ) ) { <nl> error = ERR_FILE_CORRUPT ; <nl> - error_text = " missing ' to ' field fron connection tag " ; <nl> + error_text = " missing ' to ' field from connection tag " ; <nl> return Ref < PackedScene > ( ) ; <nl> } <nl> <nl> if ( ! next_tag . fields . has ( " signal " ) ) { <nl> error = ERR_FILE_CORRUPT ; <nl> - error_text = " missing ' signal ' field fron connection tag " ; <nl> + error_text = " missing ' signal ' field from connection tag " ; <nl> return Ref < PackedScene > ( ) ; <nl> } <nl> <nl> if ( ! next_tag . fields . has ( " method " ) ) { <nl> error = ERR_FILE_CORRUPT ; <nl> - error_text = " missing ' method ' field fron connection tag " ; <nl> + error_text = " missing ' method ' field from connection tag " ; <nl> return Ref < PackedScene > ( ) ; <nl> } <nl> <nl> Ref < PackedScene > ResourceInteractiveLoaderText : : _parse_node_tag ( VariantParser : : R <nl> <nl> if ( ! next_tag . fields . has ( " path " ) ) { <nl> error = ERR_FILE_CORRUPT ; <nl> - error_text = " missing ' path ' field fron connection tag " ; <nl> + error_text = " missing ' path ' field from connection tag " ; <nl> _printerr ( ) ; <nl> return Ref < PackedScene > ( ) ; <nl> } <nl> mmm a / servers / arvr_server . h <nl> ppp b / servers / arvr_server . h <nl> class ARVRServer : public Object { <nl> <nl> uint64_t last_process_usec ; / * for frame timing , usec when we did our processing * / <nl> uint64_t last_commit_usec ; / * for frame timing , usec when we finished committing both eyes * / <nl> - uint64_t last_frame_usec ; / * time it took between process and commiting , we should probably average this over the last x frames * / <nl> + uint64_t last_frame_usec ; / * time it took between process and committing , we should probably average this over the last x frames * / <nl> <nl> protected : <nl> static ARVRServer * singleton ; <nl> mmm a / servers / audio / audio_stream . cpp <nl> ppp b / servers / audio / audio_stream . cpp <nl> void AudioStreamPlaybackMicrophone : : _mix_internal ( AudioFrame * p_buffer , int p_fr <nl> Vector < int32_t > buf = AudioDriver : : get_singleton ( ) - > get_input_buffer ( ) ; <nl> unsigned int input_size = AudioDriver : : get_singleton ( ) - > get_input_size ( ) ; <nl> <nl> - / / p_frames is multipled by two since an AudioFrame is stereo <nl> + / / p_frames is multiplied by two since an AudioFrame is stereo <nl> if ( ( p_frames + MICROPHONE_PLAYBACK_DELAY * 2 ) > input_size ) { <nl> for ( int i = 0 ; i < p_frames ; i + + ) { <nl> p_buffer [ i ] = AudioFrame ( 0 . 0f , 0 . 0f ) ; <nl> mmm a / servers / physics / space_sw . cpp <nl> ppp b / servers / physics / space_sw . cpp <nl> bool PhysicsDirectSpaceStateSW : : intersect_ray ( const Vector3 & p_from , const Vecto <nl> <nl> int amount = space - > broadphase - > cull_segment ( begin , end , space - > intersection_query_results , SpaceSW : : INTERSECTION_QUERY_MAX , space - > intersection_query_subindex_results ) ; <nl> <nl> - / / todo , create another array tha references results , compute AABBs and check closest point to ray origin , sort , and stop evaluating results when beyond first collision <nl> + / / todo , create another array that references results , compute AABBs and check closest point to ray origin , sort , and stop evaluating results when beyond first collision <nl> <nl> bool collided = false ; <nl> Vector3 res_point , res_normal ; <nl> mmm a / servers / physics_2d / space_2d_sw . cpp <nl> ppp b / servers / physics_2d / space_2d_sw . cpp <nl> bool Physics2DDirectSpaceStateSW : : intersect_ray ( const Vector2 & p_from , const Vec <nl> <nl> int amount = space - > broadphase - > cull_segment ( begin , end , space - > intersection_query_results , Space2DSW : : INTERSECTION_QUERY_MAX , space - > intersection_query_subindex_results ) ; <nl> <nl> - / / todo , create another array tha references results , compute AABBs and check closest point to ray origin , sort , and stop evaluating results when beyond first collision <nl> + / / todo , create another array that references results , compute AABBs and check closest point to ray origin , sort , and stop evaluating results when beyond first collision <nl> <nl> bool collided = false ; <nl> Vector2 res_point , res_normal ; <nl> mmm a / servers / visual / visual_server_viewport . cpp <nl> ppp b / servers / visual / visual_server_viewport . cpp <nl> void VisualServerViewport : : draw_viewports ( ) { <nl> arvr_interface - > commit_for_eye ( ARVRInterface : : EYE_RIGHT , vp - > render_target , vp - > viewport_to_screen_rect ) ; <nl> } <nl> <nl> - / / and for our frame timing , mark when we ' ve finished commiting our eyes <nl> + / / and for our frame timing , mark when we ' ve finished committing our eyes <nl> ARVRServer : : get_singleton ( ) - > _mark_commit ( ) ; <nl> } else { <nl> VSG : : rasterizer - > set_current_render_target ( vp - > render_target ) ; <nl>

Merge pull request from luzpaz / misc - typos

godotengine/godot

1a16dabfb52a5f3e82afa22ee827d8ed8f17511e

2018-09-13T08:59:00Z

mmm a / tensorflow / core / profiler / internal / BUILD <nl> ppp b / tensorflow / core / profiler / internal / BUILD <nl> tf_cuda_library ( <nl> hdrs = [ " python_traceme . h " ] , <nl> visibility = [ " / / tensorflow / python : __pkg__ " ] , <nl> deps = [ <nl> + " : traceme_recorder " , <nl> " / / tensorflow / core / profiler / lib : traceme " , <nl> " @ com_google_absl / / absl / types : optional " , <nl> ] , <nl> mmm a / tensorflow / core / profiler / internal / python_scoped_annotation . h <nl> ppp b / tensorflow / core / profiler / internal / python_scoped_annotation . h <nl> class PythonScopedAnnotation { <nl> void Enter ( ) { current_ . emplace ( std : : move ( name_ ) ) ; } <nl> void Exit ( ) { current_ . reset ( ) ; } <nl> <nl> + static bool IsEnabled ( ) { return tracing : : ScopedAnnotation : : IsEnabled ( ) ; } <nl> + <nl> private : <nl> std : : string name_ ; <nl> absl : : optional < tracing : : ScopedAnnotation > current_ ; <nl> mmm a / tensorflow / core / profiler / internal / python_traceme . h <nl> ppp b / tensorflow / core / profiler / internal / python_traceme . h <nl> limitations under the License . <nl> # include < utility > <nl> <nl> # include " absl / types / optional . h " <nl> + # include " tensorflow / core / profiler / internal / traceme_recorder . h " <nl> # include " tensorflow / core / profiler / lib / traceme . h " <nl> <nl> namespace tensorflow { <nl> class PythonTraceMe { <nl> void Enter ( ) { current_ . emplace ( std : : move ( activity_name_ ) ) ; } <nl> void Exit ( ) { current_ . reset ( ) ; } <nl> <nl> + static bool IsEnabled ( ) { return TraceMeRecorder : : Active ( ) ; } <nl> + <nl> private : <nl> std : : string activity_name_ ; <nl> absl : : optional < TraceMe > current_ ; <nl> mmm a / tensorflow / python / profiler / scoped_annotation . py <nl> ppp b / tensorflow / python / profiler / scoped_annotation . py <nl> <nl> from __future__ import division <nl> from __future__ import print_function <nl> <nl> - from tensorflow . python import pywrap_tensorflow <nl> + from tensorflow . python . pywrap_tensorflow import PythonScopedAnnotation <nl> <nl> <nl> class ScopedAnnotation ( object ) : <nl> - " " " Context manager that generates a trace event in the profiler . " " " <nl> + " " " Context manager that generates an annotation for the profiler . " " " <nl> <nl> def __init__ ( self , name , * * kwargs ) : <nl> - if kwargs : <nl> - name + = ' # ' + ' , ' . join ( <nl> - [ key + ' = ' + str ( value ) for key , value in kwargs . iteritems ( ) ] ) + ' # ' <nl> - self . _scoped_annotation = pywrap_tensorflow . PythonScopedAnnotation ( name ) <nl> + if PythonScopedAnnotation . IsEnabled ( ) : <nl> + if kwargs : <nl> + name + = ' # ' + ' , ' . join ( <nl> + [ key + ' = ' + str ( value ) for key , value in kwargs . iteritems ( ) ] ) + ' # ' <nl> + self . _scoped_annotation = PythonScopedAnnotation ( name ) <nl> + else : <nl> + self . _scoped_annotation = None <nl> <nl> def __enter__ ( self ) : <nl> - self . _scoped_annotation . Enter ( ) <nl> + if self . _scoped_annotation : <nl> + self . _scoped_annotation . Enter ( ) <nl> <nl> def __exit__ ( self , exc_type , exc_val , exc_tb ) : <nl> - self . _scoped_annotation . Exit ( ) <nl> + if self . _scoped_annotation : <nl> + self . _scoped_annotation . Exit ( ) <nl> mmm a / tensorflow / python / profiler / traceme . py <nl> ppp b / tensorflow / python / profiler / traceme . py <nl> <nl> from __future__ import division <nl> from __future__ import print_function <nl> <nl> - from tensorflow . python import pywrap_tensorflow <nl> + from tensorflow . python . pywrap_tensorflow import PythonTraceMe <nl> <nl> <nl> class TraceMe ( object ) : <nl> " " " Context manager that generates a trace event in the profiler . " " " <nl> <nl> - def __init__ ( self , name ) : <nl> - self . _traceme = pywrap_tensorflow . PythonTraceMe ( name ) <nl> + def __init__ ( self , name , * * kwargs ) : <nl> + if PythonTraceMe . IsEnabled ( ) : <nl> + if kwargs : <nl> + name + = ' # ' + ' , ' . join ( <nl> + [ key + ' = ' + str ( value ) for key , value in kwargs . iteritems ( ) ] ) + ' # ' <nl> + self . _traceme = PythonTraceMe ( name ) <nl> + else : <nl> + self . _traceme = None <nl> <nl> def __enter__ ( self ) : <nl> - self . _traceme . Enter ( ) <nl> + if self . _traceme : <nl> + self . _traceme . Enter ( ) <nl> <nl> def __exit__ ( self , exc_type , exc_val , exc_tb ) : <nl> - self . _traceme . Exit ( ) <nl> + if self . _traceme : <nl> + self . _traceme . Exit ( ) <nl> mmm a / tensorflow / python / util / scoped_annotation . i <nl> ppp b / tensorflow / python / util / scoped_annotation . i <nl> limitations under the License . <nl> % unignore tensorflow : : profiler : : PythonScopedAnnotation : : Enter ; <nl> % unignore tensorflow : : profiler : : PythonScopedAnnotation : : Exit ; <nl> % unignore tensorflow : : profiler : : PythonScopedAnnotation : : ~ PythonScopedAnnotation ; <nl> + % unignore tensorflow : : profiler : : PythonScopedAnnotation : : IsEnabled ; <nl> <nl> % include " tensorflow / core / profiler / internal / python_scoped_annotation . h " <nl> <nl> mmm a / tensorflow / python / util / traceme . i <nl> ppp b / tensorflow / python / util / traceme . i <nl> limitations under the License . <nl> % unignore tensorflow : : profiler : : PythonTraceMe : : Enter ; <nl> % unignore tensorflow : : profiler : : PythonTraceMe : : Exit ; <nl> % unignore tensorflow : : profiler : : PythonTraceMe : : ~ PythonTraceMe ; <nl> + % unignore tensorflow : : profiler : : PythonTraceMe : : IsEnabled ; <nl> <nl> % include " tensorflow / core / profiler / internal / python_traceme . h " <nl> <nl>

Support arguments in python TraceMe .

tensorflow/tensorflow

feeb4e5f0ab0f7241a27302dae054bd94e562d79

2019-08-16T23:39:43Z

mmm a / AUTHORS <nl> ppp b / AUTHORS <nl> Developers : <nl> Linux OpenAL support . <nl> Added some guards to prevent Eclipse to compile twice the same class . <nl> Linux Eclipse projects updates <nl> + Refactored emscripten - build . sh , it ' s no longer need to be edited to make emscripten work . <nl> <nl> elmiro <nl> Correction of passed buffer size to readlink and verification of result return by readlink . <nl>

Update AUTHORS [ ci skip ]

cocos2d/cocos2d-x

8ead893e72b938e55fc6e44dd9edf77fd49de480

2013-07-23T02:08:15Z

mmm a / src / core / lib / iomgr / udp_server . c <nl> ppp b / src / core / lib / iomgr / udp_server . c <nl> void grpc_udp_server_start ( grpc_exec_ctx * exec_ctx , grpc_udp_server * s , <nl> grpc_schedule_on_exec_ctx ) ; <nl> grpc_fd_notify_on_write ( exec_ctx , sp - > emfd , & sp - > write_closure ) ; <nl> <nl> - s - > active_ports + + ; <nl> + / * Registered for both read and write callbacks : increment active_ports <nl> + * twice to account for this , and delay free - ing of memory until both <nl> + * on_read and on_write have fired . * / <nl> + s - > active_ports + = 2 ; <nl> + <nl> sp = sp - > next ; <nl> } <nl> <nl>

Fix flaky use - after - free in udp_server

grpc/grpc

69709e2819f5eeeb47a16f7ed964dd1196b94ff0

2017-03-08T17:54:28Z

mmm a / src / Interpreters / PredicateExpressionsOptimizer . cpp <nl> ppp b / src / Interpreters / PredicateExpressionsOptimizer . cpp <nl> static ASTs splitConjunctionPredicate ( const std : : initializer_list < const ASTPtr > <nl> { <nl> std : : vector < ASTPtr > res ; <nl> <nl> - auto remove_expression_at_index = [ & res ] ( const size_t index ) <nl> - { <nl> - if ( index < res . size ( ) - 1 ) <nl> - std : : swap ( res [ index ] , res . back ( ) ) ; <nl> - res . pop_back ( ) ; <nl> - } ; <nl> - <nl> for ( const auto & predicate : predicates ) <nl> { <nl> if ( ! predicate ) <nl> static ASTs splitConjunctionPredicate ( const std : : initializer_list < const ASTPtr > <nl> <nl> for ( size_t idx = 0 ; idx < res . size ( ) ; ) <nl> { <nl> - const auto & expression = res . at ( idx ) ; <nl> + ASTPtr expression = res . at ( idx ) ; <nl> <nl> if ( const auto * function = expression - > as < ASTFunction > ( ) ; function & & function - > name = = " and " ) <nl> { <nl> + res . erase ( res . begin ( ) + idx ) ; <nl> + <nl> for ( auto & child : function - > arguments - > children ) <nl> res . emplace_back ( child ) ; <nl> <nl> - remove_expression_at_index ( idx ) ; <nl> continue ; <nl> } <nl> + + idx ; <nl> mmm a / tests / queries / 0_stateless / 00740_optimize_predicate_expression . reference <nl> ppp b / tests / queries / 0_stateless / 00740_optimize_predicate_expression . reference <nl> @ @ - 1 + 1 , 2 @ @ <nl> nan <nl> + SELECT dummy \ nFROM system . one \ nWHERE ( dummy > 0 ) AND ( dummy < 0 ) <nl> mmm a / tests / queries / 0_stateless / 00740_optimize_predicate_expression . sql <nl> ppp b / tests / queries / 0_stateless / 00740_optimize_predicate_expression . sql <nl> FROM ( <nl> WHERE user_id = 999 <nl> ) js2 USING site ) ; <nl> <nl> + - - check order is preserved <nl> + SET enable_debug_queries = 1 ; <nl> + ANALYZE SELECT * FROM system . one HAVING dummy > 0 AND dummy < 0 ; <nl> + <nl> DROP TABLE perf ; <nl>

Preserve order of expressions during predicates optimization ( enable_optimize_predicate_expression )

ClickHouse/ClickHouse

6d40c1ea2c2f149ab374f19e37e96f8e99c85022

2020-05-22T21:36:30Z

mmm a / tensorflow / contrib / learn / python / learn / monitors . py <nl> ppp b / tensorflow / contrib / learn / python / learn / monitors . py <nl> def step_end ( self , step , output ) : # pylint : disable = unused - argument <nl> <nl> <nl> class EveryN ( BaseMonitor ) : <nl> - " " " Base class for monitors that execute callbacks every n steps / seconds . <nl> + " " " Base class for monitors that execute callbacks every n steps . <nl> <nl> Parameters : <nl> every_n_steps : int , calls ` every_n_step_ { begin , end } ` every this many steps . <nl> def step_end ( self , step , output ) : <nl> <nl> <nl> class PrintTensor ( EveryN ) : <nl> + " " " Prints given tensors every N steps . <nl> + <nl> + Print the tensors provided in ` tensor_names ` ` every_n ` <nl> + steps , starting with the ` first_n ` th step . <nl> + <nl> + " " " <nl> <nl> def __init__ ( self , tensor_names , every_n = 100 , first_n = 1 ) : <nl> super ( PrintTensor , self ) . __init__ ( every_n , first_n ) <nl> def every_n_step_end ( self , step , outputs ) : <nl> <nl> <nl> class SummarySaver ( EveryN ) : <nl> - " " " Saves summary every N seconds . " " " <nl> + " " " Saves a summary every N steps . " " " <nl> <nl> def __init__ ( self , summary_op , save_steps = 100 , output_dir = None , <nl> summary_writer = None ) : <nl>

Fix the documentation to be consistent with the actual N step implementation .

tensorflow/tensorflow

5e1aaefc0f28008767852a4e6d5938aaa0f55081

2016-06-02T21:34:18Z

mmm a / README . md <nl> ppp b / README . md <nl> <nl> # Apollo <nl> <nl> - [ ! [ Build Status ] ( https : / / travis - ci . org / ApolloAuto / apollo . svg ? branch = master ) ] ( https : / / travis - ci . org / ApolloAuto / apollo ) <nl> + [ ! [ Build Status ] ( https : / / travis - ci . org / ApolloAuto / apollo . svg ? branch = master ) ] ( https : / / travis - ci . org / ApolloAuto / apollo ) [ ! [ Simulation Status ] ( https : / / azure . apollo . auto / dailybuildstatus . svg ) ] ( https : / / azure . apollo . auto / dailybuild ) <nl> <nl> ` ` ` <nl> We choose to go to the moon in this decade and do the other things , <nl>

add simulation daily build status icon

ApolloAuto/apollo

14c62b4a58bb2f8c897e869eaf7c339f5b50ff6f

2018-02-20T22:25:54Z

mmm a / cocos / scripting / lua - bindings / manual / CCLuaStack . cpp <nl> ppp b / cocos / scripting / lua - bindings / manual / CCLuaStack . cpp <nl> int LuaStack : : luaLoadChunksFromZIP ( lua_State * L ) <nl> ssize_t bufferSize = 0 ; <nl> unsigned char * zbuffer = zip - > getFileData ( filename . c_str ( ) , & bufferSize ) ; <nl> if ( bufferSize ) { <nl> + / / remove extension <nl> + std : : size_t found = filename . rfind ( " . lua " ) ; <nl> + if ( found ! = std : : string : : npos ) <nl> + { <nl> + filename . erase ( found ) ; <nl> + } <nl> + / / replace path seperator ' / ' ' \ ' to ' . ' <nl> + for ( int i = 0 ; i < filename . size ( ) ; i + + ) { <nl> + if ( filename [ i ] = = ' / ' | | filename [ i ] = = ' \ \ ' ) { <nl> + filename [ i ] = ' . ' ; <nl> + } <nl> + } <nl> + CCLOG ( " [ luaLoadChunksFromZIP ] add % s to preload " , filename . c_str ( ) ) ; <nl> if ( stack - > luaLoadBuffer ( L , ( char * ) zbuffer , ( int ) bufferSize , filename . c_str ( ) ) = = 0 ) { <nl> lua_setfield ( L , - 2 , filename . c_str ( ) ) ; <nl> + + count ; <nl>

Merge pull request from edwardzhou / luaLoadChunksFromZIP_supports_folder_structured_lua

cocos2d/cocos2d-x

42b6fbd1c65911be3e4988fc69d5572f5f8ccb50

2015-01-23T08:13:09Z

mmm a / atom / browser / native_window . cc <nl> ppp b / atom / browser / native_window . cc <nl> NativeWindow : : NativeWindow ( <nl> enable_larger_than_screen_ ( false ) , <nl> is_closed_ ( false ) , <nl> has_dialog_attached_ ( false ) , <nl> + sheet_offset_ ( 0 . 0 ) , <nl> aspect_ratio_ ( 0 . 0 ) , <nl> inspectable_web_contents_ ( inspectable_web_contents ) , <nl> weak_factory_ ( this ) { <nl> mmm a / atom / browser / native_window_mac . mm <nl> ppp b / atom / browser / native_window_mac . mm <nl> - ( BOOL ) windowShouldClose : ( id ) window { <nl> return NO ; <nl> } <nl> <nl> - - ( NSRect ) window : ( NSWindow * ) window willPositionSheet : ( NSWindow * ) sheet usingRect : ( NSRect ) rect { <nl> - NSView * view = window . contentView ; <nl> + - ( NSRect ) window : ( NSWindow * ) window <nl> + willPositionSheet : ( NSWindow * ) sheet usingRect : ( NSRect ) rect { <nl> + NSView * view = window . contentView ; <nl> rect . origin . y = view . frame . size . height - shell_ - > GetSheetOffset ( ) ; <nl> return rect ; <nl> } <nl> <nl> - <nl> @ end <nl> <nl> @ interface AtomNSWindow : NSWindow { <nl> mmm a / atom / browser / net / atom_network_delegate . h <nl> ppp b / atom / browser / net / atom_network_delegate . h <nl> class AtomNetworkDelegate : public brightray : : NetworkDelegate { <nl> std : : map < uint64_t , net : : CompletionCallback > callbacks_ ; <nl> <nl> base : : Lock lock_ ; <nl> + <nl> / / Client id for devtools network emulation . <nl> std : : string client_id_ ; <nl> <nl> mmm a / docs / api / dialog . md <nl> ppp b / docs / api / dialog . md <nl> it is usually used to report errors in early stage of startup . If called <nl> before the app ` ready ` event on Linux , the message will be emitted to stderr , <nl> and no GUI dialog will appear . <nl> <nl> - <nl> # # Sheets <nl> <nl> On Mac OS X , dialogs are presented as sheets attached to a window if you provide <nl>

Merge pull request from electron / style - fix

electron/electron

b2a3aabc904faa22899d07f566e4c37719adda65

2016-04-20T00:31:53Z

mmm a / tensorflow / compiler / jit / partially_decluster_pass . cc <nl> ppp b / tensorflow / compiler / jit / partially_decluster_pass . cc <nl> Status MustCompileNode ( const Node * n , bool * must_compile ) { <nl> / / We assume here that the extra repeated ( repeated compared to a clustered f <nl> / / where it will always be constant folded ) host - side computation of f does not <nl> / / regress performance in any significant manner . We will have to revisit this <nl> - / / algorith with a more complex cost model if this assumption turns out to be <nl> + / / algorithm with a more complex cost model if this assumption turns out to be <nl> / / incorrect . <nl> Status PartiallyDeclusterGraph ( Graph * graph ) { <nl> std : : vector < bool > compile_time_const_nodes ( graph - > num_node_ids ( ) ) ; <nl> mmm a / tensorflow / compiler / tf2tensorrt / utils / trt_allocator . cc <nl> ppp b / tensorflow / compiler / tf2tensorrt / utils / trt_allocator . cc <nl> void * TRTDeviceAllocator : : allocate ( uint64_t size , uint64_t alignment , <nl> uint32_t flags ) { <nl> if ( size = = 0 ) return nullptr ; <nl> / / WAR for allocator alignment requirement . Certain cuda API calls require GPU <nl> - / / memory with alignemtn to cudaDeviceProp : : textureAlignment . <nl> + / / memory with alignment to cudaDeviceProp : : textureAlignment . <nl> / / See issue # 20856 <nl> alignment = 512 ; <nl> assert ( ( alignment & ( alignment - 1 ) ) = = 0 ) ; / / zero or a power of 2 . <nl> mmm a / tensorflow / compiler / xla / service / batchnorm_expander . cc <nl> ppp b / tensorflow / compiler / xla / service / batchnorm_expander . cc <nl> Status BatchNormExpanderVisitor : : HandleBatchNormGrad ( <nl> activation_shape , HloOpcode : : kSubtract , activation , mean_broadcasted ) ; <nl> <nl> / / Grad [ Y ] * ( X - E [ X ] ) . <nl> - auto grad_output_times_activiation_minus_mean = <nl> + auto grad_output_times_activation_minus_mean = <nl> add_binary ( activation_shape , HloOpcode : : kMultiply , grad_output , <nl> activation_minus_mean ) ; <nl> <nl> Status BatchNormExpanderVisitor : : HandleBatchNormGrad ( <nl> GetOrCreateScalarAddComputation ( ptype ) ; <nl> <nl> / / sum ( Grad [ Y ] * ( X - E [ X ] ) ) . <nl> - auto sum_grad_output_times_activiation_minus_mean = <nl> + auto sum_grad_output_times_activation_minus_mean = <nl> add ( HloInstruction : : CreateReduce ( <nl> - feature_shape , grad_output_times_activiation_minus_mean , zero , <nl> + feature_shape , grad_output_times_activation_minus_mean , zero , <nl> dimensions_without_feature , add_reduce_computation ) ) ; <nl> <nl> / / Grad [ beta ] = Sum ( Grad [ Y ] ) . <nl> Status BatchNormExpanderVisitor : : HandleBatchNormGrad ( <nl> <nl> / / Grad [ scale ] = Sum ( Grad [ Y ] * ( X - E [ X ] ) * rsqrt [ Var [ X ] + epsilon ] ) . <nl> auto grad_scale = add_binary ( feature_shape , HloOpcode : : kMultiply , <nl> - sum_grad_output_times_activiation_minus_mean , <nl> + sum_grad_output_times_activation_minus_mean , <nl> rsqrt_var_add_epsilon ) ; <nl> <nl> / / I2 = Sum ( Grad [ Y ] ) <nl> Status BatchNormExpanderVisitor : : HandleBatchNormGrad ( <nl> <nl> / / I3 = Sum ( Grad [ Y ] * ( X - E [ X ] ) ) <nl> auto i3 = add ( HloInstruction : : CreateBroadcast ( <nl> - activation_shape , sum_grad_output_times_activiation_minus_mean , <nl> + activation_shape , sum_grad_output_times_activation_minus_mean , <nl> { feature_index } ) ) ; <nl> <nl> / / I4 = ( X - E [ X ] ) * I3 <nl> mmm a / tensorflow / compiler / xla / service / batchnorm_expander_test . cc <nl> ppp b / tensorflow / compiler / xla / service / batchnorm_expander_test . cc <nl> TEST_F ( BatchNormExpanderTest , BatchNormTraining ) { <nl> <nl> HloComputation : : Builder builder ( TestName ( ) ) ; <nl> HloInstruction * param0 = builder . AddInstruction ( <nl> - HloInstruction : : CreateParameter ( 0 , input_shape , " activiation " ) ) ; <nl> + HloInstruction : : CreateParameter ( 0 , input_shape , " activation " ) ) ; <nl> <nl> HloInstruction * param1 = builder . AddInstruction ( <nl> HloInstruction : : CreateParameter ( 1 , scale_shape , " scale " ) ) ; <nl> mmm a / tensorflow / compiler / xrt / ops / xrt_state_ops . cc <nl> ppp b / tensorflow / compiler / xrt / ops / xrt_state_ops . cc <nl> The shapes can differ from the corresponding input one , as long as the total <nl> number of elements matches . In other words , it is possible to feed an input <nl> tensor with shape { 8 } and have a corresponding shape { 2 , 2 , 2 } . <nl> layouts : A vector holding the requested layout in minor - to - major sequence . <nl> - If empty , the default layout wil be used . <nl> + If empty , the default layout will be used . <nl> For a tuple , the layouts vector holds a linearized minor - to - major numbers <nl> for all the tuple leaves , in the order they appear within the tuple . <nl> The elements within the layouts sequence corresponding to a given tuple <nl>

Merge pull request from siju - samuel : patch - 42

tensorflow/tensorflow

49b058f22b04439e8390a73253ad353b769e4ba8

2019-02-26T22:33:15Z

mmm a / src / objects - inl . h <nl> ppp b / src / objects - inl . h <nl> InlineCacheState Code : : ic_state ( ) { <nl> <nl> <nl> Code : : ExtraICState Code : : extra_ic_state ( ) { <nl> - ASSERT ( is_inline_cache_stub ( ) | | ic_state ( ) = = DEBUG_STUB ) ; <nl> + ASSERT ( ( is_inline_cache_stub ( ) & & ! needs_extended_extra_ic_state ( kind ( ) ) ) <nl> + | | ic_state ( ) = = DEBUG_STUB ) ; <nl> return ExtractExtraICStateFromFlags ( flags ( ) ) ; <nl> } <nl> <nl> mmm a / src / type - info . cc <nl> ppp b / src / type - info . cc <nl> Handle < Type > TypeFeedbackOracle : : UnaryType ( TypeFeedbackId id ) { <nl> } <nl> Handle < Code > code = Handle < Code > : : cast ( object ) ; <nl> ASSERT ( code - > is_unary_op_stub ( ) ) ; <nl> - return UnaryOpStub ( code - > extra_ic_state ( ) ) . GetType ( isolate ( ) ) ; <nl> + return UnaryOpStub ( code - > extended_extra_ic_state ( ) ) . GetType ( isolate ( ) ) ; <nl> } <nl> <nl> <nl>

Fix unary op type feedback .

v8/v8

e84649d85e1d4ac7be31ca31d4514ac721347b55

2013-07-10T16:03:00Z

mmm a / utilities / backupable / backupable_db . cc <nl> ppp b / utilities / backupable / backupable_db . cc <nl> Status BackupEngineImpl : : GarbageCollect ( ) { <nl> / / delete obsolete shared files <nl> std : : vector < std : : string > shared_children ; <nl> { <nl> - auto shared_path = GetAbsolutePath ( GetSharedFileRel ( ) ) ; <nl> + std : : string shared_path ; <nl> + if ( options_ . share_files_with_checksum ) { <nl> + shared_path = GetAbsolutePath ( GetSharedFileWithChecksumRel ( ) ) ; <nl> + } else { <nl> + shared_path = GetAbsolutePath ( GetSharedFileRel ( ) ) ; <nl> + } <nl> auto s = backup_env_ - > FileExists ( shared_path ) ; <nl> if ( s . ok ( ) ) { <nl> s = backup_env_ - > GetChildren ( shared_path , & shared_children ) ; <nl> Status BackupEngineImpl : : GarbageCollect ( ) { <nl> } <nl> } <nl> for ( auto & child : shared_children ) { <nl> - std : : string rel_fname = GetSharedFileRel ( child ) ; <nl> + std : : string rel_fname ; <nl> + if ( options_ . share_files_with_checksum ) { <nl> + rel_fname = GetSharedFileWithChecksumRel ( child ) ; <nl> + } else { <nl> + rel_fname = GetSharedFileRel ( child ) ; <nl> + } <nl> auto child_itr = backuped_file_infos_ . find ( rel_fname ) ; <nl> / / if it ' s not refcounted , delete it <nl> if ( child_itr = = backuped_file_infos_ . end ( ) | | <nl> mmm a / utilities / backupable / backupable_db_test . cc <nl> ppp b / utilities / backupable / backupable_db_test . cc <nl> TEST_F ( BackupableDBTest , ShareTableFilesWithChecksumsTransition ) { <nl> } <nl> <nl> TEST_F ( BackupableDBTest , DeleteTmpFiles ) { <nl> - OpenDBAndBackupEngine ( ) ; <nl> - CloseDBAndBackupEngine ( ) ; <nl> - std : : string shared_tmp = backupdir_ + " / shared / 00006 . sst . tmp " ; <nl> - std : : string private_tmp_dir = backupdir_ + " / private / 10 . tmp " ; <nl> - std : : string private_tmp_file = private_tmp_dir + " / 00003 . sst " ; <nl> - file_manager_ - > WriteToFile ( shared_tmp , " tmp " ) ; <nl> - file_manager_ - > CreateDir ( private_tmp_dir ) ; <nl> - file_manager_ - > WriteToFile ( private_tmp_file , " tmp " ) ; <nl> - ASSERT_OK ( file_manager_ - > FileExists ( private_tmp_dir ) ) ; <nl> - OpenDBAndBackupEngine ( ) ; <nl> - / / Need to call this explicitly to delete tmp files <nl> - ( void ) backup_engine_ - > GarbageCollect ( ) ; <nl> - CloseDBAndBackupEngine ( ) ; <nl> - ASSERT_EQ ( Status : : NotFound ( ) , file_manager_ - > FileExists ( shared_tmp ) ) ; <nl> - ASSERT_EQ ( Status : : NotFound ( ) , file_manager_ - > FileExists ( private_tmp_file ) ) ; <nl> - ASSERT_EQ ( Status : : NotFound ( ) , file_manager_ - > FileExists ( private_tmp_dir ) ) ; <nl> + for ( bool shared_checksum : { false , true } ) { <nl> + if ( shared_checksum ) { <nl> + OpenDBAndBackupEngineShareWithChecksum ( <nl> + false / * destroy_old_data * / , false / * dummy * / , <nl> + true / * share_table_files * / , true / * share_with_checksums * / ) ; <nl> + } else { <nl> + OpenDBAndBackupEngine ( ) ; <nl> + } <nl> + CloseDBAndBackupEngine ( ) ; <nl> + std : : string shared_tmp = backupdir_ ; <nl> + if ( shared_checksum ) { <nl> + shared_tmp + = " / shared_checksum " ; <nl> + } else { <nl> + shared_tmp + = " / shared " ; <nl> + } <nl> + shared_tmp + = " / 00006 . sst . tmp " ; <nl> + std : : string private_tmp_dir = backupdir_ + " / private / 10 . tmp " ; <nl> + std : : string private_tmp_file = private_tmp_dir + " / 00003 . sst " ; <nl> + file_manager_ - > WriteToFile ( shared_tmp , " tmp " ) ; <nl> + file_manager_ - > CreateDir ( private_tmp_dir ) ; <nl> + file_manager_ - > WriteToFile ( private_tmp_file , " tmp " ) ; <nl> + ASSERT_OK ( file_manager_ - > FileExists ( private_tmp_dir ) ) ; <nl> + if ( shared_checksum ) { <nl> + OpenDBAndBackupEngineShareWithChecksum ( <nl> + false / * destroy_old_data * / , false / * dummy * / , <nl> + true / * share_table_files * / , true / * share_with_checksums * / ) ; <nl> + } else { <nl> + OpenDBAndBackupEngine ( ) ; <nl> + } <nl> + / / Need to call this explicitly to delete tmp files <nl> + ( void ) backup_engine_ - > GarbageCollect ( ) ; <nl> + CloseDBAndBackupEngine ( ) ; <nl> + ASSERT_EQ ( Status : : NotFound ( ) , file_manager_ - > FileExists ( shared_tmp ) ) ; <nl> + ASSERT_EQ ( Status : : NotFound ( ) , file_manager_ - > FileExists ( private_tmp_file ) ) ; <nl> + ASSERT_EQ ( Status : : NotFound ( ) , file_manager_ - > FileExists ( private_tmp_dir ) ) ; <nl> + } <nl> } <nl> <nl> TEST_F ( BackupableDBTest , KeepLogFiles ) { <nl>

backup garbage collect shared_checksum tmp files

facebook/rocksdb

a9c86f51b7f47ee6b6ff278625c29642556407db

2017-03-30T21:54:12Z

mmm a / doc / classes / MultiMesh . xml <nl> ppp b / doc / classes / MultiMesh . xml <nl> <nl> < / description > <nl> < tutorials > <nl> < link > http : / / docs . godotengine . org / en / latest / tutorials / 3d / vertex_animation / animating_thousands_of_fish . html < / link > <nl> + < link > http : / / docs . godotengine . org / en / latest / tutorials / optimization / using_multimesh . html < / link > <nl> < / tutorials > <nl> < methods > <nl> < method name = " get_aabb " qualifiers = " const " > <nl> <nl> < argument index = " 1 " name = " custom_data " type = " Color " > <nl> < / argument > <nl> < description > <nl> - Sets custom data for a specific instance . Although [ Color ] is used , it is just a container for 4 numbers . <nl> + Sets custom data for a specific instance . Although [ Color ] is used , it is just a container for 4 floating point numbers . The format of the number can change depending on the [ enum CustomDataFormat ] used . <nl> < / description > <nl> < / method > <nl> < method name = " set_instance_transform " > <nl> <nl> Use when you are not using per - instance custom data . <nl> < / constant > <nl> < constant name = " CUSTOM_DATA_8BIT " value = " 1 " enum = " CustomDataFormat " > <nl> - Compress custom_data into 8 bits when passing to shader . This uses less memory and can be faster , but loses precision . <nl> + Compress custom_data into 8 bits when passing to shader . This uses less memory and can be faster , but loses precision and range . Floats packed into 8 bits can only represent values between 0 and 1 , numbers outside that range will be clamped . <nl> < / constant > <nl> < constant name = " CUSTOM_DATA_FLOAT " value = " 2 " enum = " CustomDataFormat " > <nl> The [ Color ] passed into [ method set_instance_custom_data ] will use 4 floats . Use this for highest precision . <nl> mmm a / doc / classes / VisualServer . xml <nl> ppp b / doc / classes / VisualServer . xml <nl> <nl> < description > <nl> Server for anything visible . The visual server is the API backend for everything visible . The whole scene system mounts on it to display . <nl> The visual server is completely opaque , the internals are entirely implementation specific and cannot be accessed . <nl> + The visual server can be used to bypass the scene system entirely . <nl> + Resources are created using the [ code ] * _create [ / code ] functions . <nl> + All objects are drawn to a viewport . You can use the [ Viewport ] attached to the [ SceneTree ] or you can create one yourself with [ method viewport_create ] . When using a custom scenario or canvas , the scenario or canvas needs to be attached to the viewport using [ method viewport_set_scenario ] or [ method viewport_attach_canvas ] . <nl> + In 3D , all visual objects must be associated with a scenario . The scenario is a visual representation of the world . If accessing the visual server from a running game , the scenario can be accessed from the scene tree from any [ Spatial ] node with [ method Spatial . get_world ] . Otherwise , a scenario can be created with [ method scenario_create ] . <nl> + Similarly in 2D , a canvas is needed to draw all canvas items . <nl> + In 3D , all visible objects are comprised of a resource and an instance . A resource can be a mesh , a particle system , a light , or any other 3D object . In order to be visible resources must be attached to an instance using [ method instance_set_base ] . The instance must also be attached to the scenario using [ method instance_set_scenario ] in order to be visible . <nl> + In 2D , all visible objects are some form of canvas item . In order to be visible , a canvas item needs to be the child of a canvas attached to a viewport , or it needs to be the child of another canvas item that is eventually attached to the canvas . <nl> < / description > <nl> < tutorials > <nl> + < link > http : / / docs . godotengine . org / en / latest / tutorials / optimization / using_servers . html < / link > <nl> < / tutorials > <nl> < methods > <nl> < method name = " black_bars_set_images " > <nl> <nl> < argument index = " 1 " name = " parent " type = " RID " > <nl> < / argument > <nl> < description > <nl> - Sets the parent for the [ CanvasItem ] . <nl> + Sets the parent for the [ CanvasItem ] . The parent can be another canvas item , or it can be the root canvas that is attached to the viewport . <nl> < / description > <nl> < / method > <nl> < method name = " canvas_item_set_self_modulate " > <nl> <nl> < argument index = " 0 " name = " capture " type = " RID " > <nl> < / argument > <nl> < description > <nl> + Returns the size of the lightmap capture area . <nl> < / description > <nl> < / method > <nl> < method name = " lightmap_capture_get_energy " qualifiers = " const " > <nl> <nl> < argument index = " 0 " name = " capture " type = " RID " > <nl> < / argument > <nl> < description > <nl> + Returns the energy multiplier used by the lightmap capture . <nl> < / description > <nl> < / method > <nl> < method name = " lightmap_capture_get_octree " qualifiers = " const " > <nl> <nl> < argument index = " 0 " name = " capture " type = " RID " > <nl> < / argument > <nl> < description > <nl> + Returns the octree used by the lightmap capture . <nl> < / description > <nl> < / method > <nl> < method name = " lightmap_capture_get_octree_cell_subdiv " qualifiers = " const " > <nl> <nl> < argument index = " 0 " name = " capture " type = " RID " > <nl> < / argument > <nl> < description > <nl> + Returns the cell subdivision amount used by this lightmap capture ' s octree . <nl> < / description > <nl> < / method > <nl> < method name = " lightmap_capture_get_octree_cell_transform " qualifiers = " const " > <nl> <nl> < argument index = " 0 " name = " capture " type = " RID " > <nl> < / argument > <nl> < description > <nl> + Returns the cell transform for this lightmap capture ' s octree . <nl> < / description > <nl> < / method > <nl> < method name = " lightmap_capture_set_bounds " > <nl> <nl> < argument index = " 1 " name = " bounds " type = " AABB " > <nl> < / argument > <nl> < description > <nl> + Sets the size of the area covered by the lightmap capture . Equivalent to [ member BakedLightmapData . bounds ] . <nl> < / description > <nl> < / method > <nl> < method name = " lightmap_capture_set_energy " > <nl> <nl> < argument index = " 1 " name = " energy " type = " float " > <nl> < / argument > <nl> < description > <nl> + Sets the energy multiplier for this lightmap capture . Equivalent to [ member BakedLightmapData . energy ] . <nl> < / description > <nl> < / method > <nl> < method name = " lightmap_capture_set_octree " > <nl> <nl> < argument index = " 1 " name = " octree " type = " PoolByteArray " > <nl> < / argument > <nl> < description > <nl> + Sets the octree to be used by this lightmap capture . This function is normally used by the [ BakedLightmap ] node . Equivalent to [ member BakedLightmapData . octree ] . <nl> < / description > <nl> < / method > <nl> < method name = " lightmap_capture_set_octree_cell_subdiv " > <nl> <nl> < argument index = " 1 " name = " subdiv " type = " int " > <nl> < / argument > <nl> < description > <nl> + Sets the subdivision level of this lightmap capture ' s octree . Equivalent to [ member BakedLightmapData . cell_subdiv ] . <nl> < / description > <nl> < / method > <nl> < method name = " lightmap_capture_set_octree_cell_transform " > <nl> <nl> < argument index = " 1 " name = " xform " type = " Transform " > <nl> < / argument > <nl> < description > <nl> + Sets the octree cell transform for this lightmap capture ' s octree . Equivalent to [ member BakedLightmapData . cell_space_transform ] . <nl> < / description > <nl> < / method > <nl> < method name = " make_sphere_mesh " > <nl> <nl> < argument index = " 1 " name = " enable " type = " bool " > <nl> < / argument > <nl> < description > <nl> + If [ code ] true [ / code ] , reflections will ignore sky contribution . Equivalent to [ member ReflectionProbe . interior_enable ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_cull_mask " > <nl> <nl> < argument index = " 1 " name = " layers " type = " int " > <nl> < / argument > <nl> < description > <nl> + Sets the render cull mask for this reflection probe . Only instances with a matching cull mask will be rendered by this probe . Equivalent to [ member ReflectionProbe . cull_mask ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_enable_box_projection " > <nl> <nl> < argument index = " 1 " name = " enable " type = " bool " > <nl> < / argument > <nl> < description > <nl> + If [ code ] true [ / code ] , uses box projection . This can make reflections look more correct in certain situations . Equivalent to [ member ReflectionProbe . box_projection ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_enable_shadows " > <nl> <nl> < argument index = " 1 " name = " enable " type = " bool " > <nl> < / argument > <nl> < description > <nl> + If [ code ] true [ / code ] , computes shadows in the reflection probe . This makes the reflection much slower to compute . Equivalent to [ member ReflectionProbe . enable_shadows ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_extents " > <nl> <nl> < argument index = " 1 " name = " extents " type = " Vector3 " > <nl> < / argument > <nl> < description > <nl> + Sets the size of the area that the reflection probe will capture . Equivalent to [ member ReflectionProbe . extents ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_intensity " > <nl> <nl> < argument index = " 1 " name = " intensity " type = " float " > <nl> < / argument > <nl> < description > <nl> + Sets the intensity of the reflection probe . Intensity modulates the strength of the reflection . Equivalent to [ member ReflectionProbe . intensity ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_interior_ambient " > <nl> <nl> < argument index = " 1 " name = " color " type = " Color " > <nl> < / argument > <nl> < description > <nl> + Sets the ambient light color for this reflection probe when set to interior mode . Equivalent to [ member ReflectionProbe . interior_ambient_color ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_interior_ambient_energy " > <nl> <nl> < argument index = " 1 " name = " energy " type = " float " > <nl> < / argument > <nl> < description > <nl> + Sets the energy multiplier for this reflection probes ambient light contribution when set to interior mode . Equivalent to [ member ReflectionProbe . interior_ambient_energy ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_interior_ambient_probe_contribution " > <nl> <nl> < argument index = " 1 " name = " contrib " type = " float " > <nl> < / argument > <nl> < description > <nl> + Sets the contribution value for how much the reflection affects the ambient light for this reflection probe when set to interior mode . Useful so that ambient light matches the color of the room . Equivalent to [ member ReflectionProbe . interior_ambient_contrib ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_max_distance " > <nl> <nl> < argument index = " 1 " name = " distance " type = " float " > <nl> < / argument > <nl> < description > <nl> + Sets the max distance away from the probe an object can be before it is culled . Equivalent to [ member ReflectionProbe . max_distance ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_origin_offset " > <nl> <nl> < argument index = " 1 " name = " offset " type = " Vector3 " > <nl> < / argument > <nl> < description > <nl> + Sets the origin offset to be used when this reflection probe is in box project mode . Equivalent to [ member ReflectionProbe . origin_offset ] . <nl> < / description > <nl> < / method > <nl> < method name = " reflection_probe_set_update_mode " > <nl> <nl> < argument index = " 1 " name = " mode " type = " int " enum = " VisualServer . ReflectionProbeUpdateMode " > <nl> < / argument > <nl> < description > <nl> + Sets how often the reflection probe updates . Can either be once or every frame . See [ enum ReflectionProbeUpdateMode ] for options . <nl> < / description > <nl> < / method > <nl> < method name = " request_frame_drawn_callback " > <nl> <nl> < argument index = " 2 " name = " is_2d_skeleton " type = " bool " default = " false " > <nl> < / argument > <nl> < description > <nl> + Allocates the GPU buffers for this skeleton . <nl> < / description > <nl> < / method > <nl> < method name = " skeleton_bone_get_transform " qualifiers = " const " > <nl> <nl> < argument index = " 1 " name = " bone " type = " int " > <nl> < / argument > <nl> < description > <nl> + Returns the [ Transform ] set for a specific bone of this skeleton . <nl> < / description > <nl> < / method > <nl> < method name = " skeleton_bone_get_transform_2d " qualifiers = " const " > <nl> <nl> < argument index = " 1 " name = " bone " type = " int " > <nl> < / argument > <nl> < description > <nl> + Returns the [ Transform2D ] set for a specific bone of this skeleton . <nl> < / description > <nl> < / method > <nl> < method name = " skeleton_bone_set_transform " > <nl> <nl> < argument index = " 2 " name = " transform " type = " Transform " > <nl> < / argument > <nl> < description > <nl> + Sets the [ Transform ] for a specific bone of this skeleton . <nl> < / description > <nl> < / method > <nl> < method name = " skeleton_bone_set_transform_2d " > <nl> <nl> < argument index = " 2 " name = " transform " type = " Transform2D " > <nl> < / argument > <nl> < description > <nl> + Sets the [ Transform2D ] for a specific bone of this skeleton . <nl> < / description > <nl> < / method > <nl> < method name = " skeleton_create " > <nl> <nl> < argument index = " 0 " name = " skeleton " type = " RID " > <nl> < / argument > <nl> < description > <nl> + Returns the number of bones allocated for this skeleton . <nl> < / description > <nl> < / method > <nl> < method name = " sky_create " > <nl> <nl> Marks an error that shows that the index array is empty . <nl> < / constant > <nl> < constant name = " ARRAY_WEIGHTS_SIZE " value = " 4 " > <nl> + Number of weights / bones per vertex . <nl> < / constant > <nl> < constant name = " CANVAS_ITEM_Z_MIN " value = " - 4096 " > <nl> The minimum Z - layer for canvas items . <nl> <nl> The maximum Z - layer for canvas items . <nl> < / constant > <nl> < constant name = " MAX_GLOW_LEVELS " value = " 7 " > <nl> + Max number of glow levels that can be used with glow post - process effect . <nl> < / constant > <nl> < constant name = " MAX_CURSORS " value = " 8 " > <nl> + Unused enum in Godot 3 . x . <nl> < / constant > <nl> < constant name = " MATERIAL_RENDER_PRIORITY_MIN " value = " - 128 " > <nl> The minimum renderpriority of all materials . <nl> <nl> Marks the back side of a cubemap . <nl> < / constant > <nl> < constant name = " TEXTURE_TYPE_2D " value = " 0 " enum = " TextureType " > <nl> + Normal texture with 2 dimensions , width and height . <nl> < / constant > <nl> < constant name = " TEXTURE_TYPE_CUBEMAP " value = " 1 " enum = " TextureType " > <nl> + Texture made up of six faces , can be looked up with a [ code ] vec3 [ / code ] in shader . <nl> < / constant > <nl> < constant name = " TEXTURE_TYPE_2D_ARRAY " value = " 2 " enum = " TextureType " > <nl> + An array of 2 - dimensional textures . <nl> < / constant > <nl> < constant name = " TEXTURE_TYPE_3D " value = " 3 " enum = " TextureType " > <nl> + A 3 - dimensional texture with width , height , and depth . <nl> < / constant > <nl> < constant name = " TEXTURE_FLAG_MIPMAPS " value = " 1 " enum = " TextureFlags " > <nl> Generates mipmaps , which are smaller versions of the same texture to use when zoomed out , keeping the aspect ratio . <nl> <nl> Flag used to mark a compressed ( half float ) UV coordinates array for the second UV coordinates . <nl> < / constant > <nl> < constant name = " ARRAY_COMPRESS_BONES " value = " 32768 " enum = " ArrayFormat " > <nl> + Flag used to mark a compressed bone array . <nl> < / constant > <nl> < constant name = " ARRAY_COMPRESS_WEIGHTS " value = " 65536 " enum = " ArrayFormat " > <nl> Flag used to mark a compressed ( half float ) weight array . <nl> < / constant > <nl> < constant name = " ARRAY_COMPRESS_INDEX " value = " 131072 " enum = " ArrayFormat " > <nl> + Flag used to mark a compressed index array . <nl> < / constant > <nl> < constant name = " ARRAY_FLAG_USE_2D_VERTICES " value = " 262144 " enum = " ArrayFormat " > <nl> Flag used to mark that the array contains 2D vertices . <nl> <nl> Represents the size of the [ enum PrimitiveType ] enum . <nl> < / constant > <nl> < constant name = " BLEND_SHAPE_MODE_NORMALIZED " value = " 0 " enum = " BlendShapeMode " > <nl> + Blend shapes are normalized . <nl> < / constant > <nl> < constant name = " BLEND_SHAPE_MODE_RELATIVE " value = " 1 " enum = " BlendShapeMode " > <nl> + Blend shapes are relative to base weight . <nl> < / constant > <nl> < constant name = " LIGHT_DIRECTIONAL " value = " 0 " enum = " LightType " > <nl> Is a directional ( sun ) light . <nl> <nl> Scales the shadow color . <nl> < / constant > <nl> < constant name = " LIGHT_PARAM_SHADOW_MAX_DISTANCE " value = " 8 " enum = " LightParam " > <nl> + Max distance that shadows will be rendered . <nl> < / constant > <nl> < constant name = " LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET " value = " 9 " enum = " LightParam " > <nl> + Proportion of shadow atlas occupied by the first split . <nl> < / constant > <nl> < constant name = " LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET " value = " 10 " enum = " LightParam " > <nl> + Proportion of shadow atlas occupied by the second split . <nl> < / constant > <nl> < constant name = " LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET " value = " 11 " enum = " LightParam " > <nl> + Proportion of shadow atlas occupied by the third split . The fourth split occupies the rest . <nl> < / constant > <nl> < constant name = " LIGHT_PARAM_SHADOW_NORMAL_BIAS " value = " 12 " enum = " LightParam " > <nl> + Normal bias used to offset shadow lookup by object normal . Can be used to fix self - shadowing artifacts . <nl> < / constant > <nl> < constant name = " LIGHT_PARAM_SHADOW_BIAS " value = " 13 " enum = " LightParam " > <nl> + Bias the shadow lookup to fix self - shadowing artifacts . <nl> < / constant > <nl> < constant name = " LIGHT_PARAM_SHADOW_BIAS_SPLIT_SCALE " value = " 14 " enum = " LightParam " > <nl> + Increases bias on further splits to fix self - shadowing that only occurs far away from the camera . <nl> < / constant > <nl> < constant name = " LIGHT_PARAM_MAX " value = " 15 " enum = " LightParam " > <nl> Represents the size of the [ enum LightParam ] enum . <nl> < / constant > <nl> < constant name = " LIGHT_OMNI_SHADOW_DUAL_PARABOLOID " value = " 0 " enum = " LightOmniShadowMode " > <nl> + Use a dual paraboloid shadow map for omni lights . <nl> < / constant > <nl> < constant name = " LIGHT_OMNI_SHADOW_CUBE " value = " 1 " enum = " LightOmniShadowMode " > <nl> + Use a cubemap shadow map for omni lights . Slower but better quality than dual paraboloid . <nl> < / constant > <nl> < constant name = " LIGHT_OMNI_SHADOW_DETAIL_VERTICAL " value = " 0 " enum = " LightOmniShadowDetail " > <nl> + Use more detail vertically when computing shadow map . <nl> < / constant > <nl> < constant name = " LIGHT_OMNI_SHADOW_DETAIL_HORIZONTAL " value = " 1 " enum = " LightOmniShadowDetail " > <nl> + Use more detail horizontally when computing shadow map . <nl> < / constant > <nl> < constant name = " LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL " value = " 0 " enum = " LightDirectionalShadowMode " > <nl> + Use orthogonal shadow projection for directional light . <nl> < / constant > <nl> < constant name = " LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS " value = " 1 " enum = " LightDirectionalShadowMode " > <nl> + Use 2 splits for shadow projection when using directional light . <nl> < / constant > <nl> < constant name = " LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS " value = " 2 " enum = " LightDirectionalShadowMode " > <nl> + Use 4 splits for shadow projection when using directional light . <nl> < / constant > <nl> < constant name = " LIGHT_DIRECTIONAL_SHADOW_DEPTH_RANGE_STABLE " value = " 0 " enum = " LightDirectionalShadowDepthRangeMode " > <nl> + Keeps shadows stable as camera moves but has lower effective resolution . <nl> < / constant > <nl> < constant name = " LIGHT_DIRECTIONAL_SHADOW_DEPTH_RANGE_OPTIMIZED " value = " 1 " enum = " LightDirectionalShadowDepthRangeMode " > <nl> + Optimize use of shadow maps , increasing the effective resolution . But may result in shadows moving or flickering slightly . <nl> < / constant > <nl> < constant name = " VIEWPORT_UPDATE_DISABLED " value = " 0 " enum = " ViewportUpdateMode " > <nl> + Do not update the viewport . <nl> < / constant > <nl> < constant name = " VIEWPORT_UPDATE_ONCE " value = " 1 " enum = " ViewportUpdateMode " > <nl> + Update the viewport once then set to disabled . <nl> < / constant > <nl> < constant name = " VIEWPORT_UPDATE_WHEN_VISIBLE " value = " 2 " enum = " ViewportUpdateMode " > <nl> + Update the viewport whenever it is visible . <nl> < / constant > <nl> < constant name = " VIEWPORT_UPDATE_ALWAYS " value = " 3 " enum = " ViewportUpdateMode " > <nl> + Always update the viewport . <nl> < / constant > <nl> < constant name = " VIEWPORT_CLEAR_ALWAYS " value = " 0 " enum = " ViewportClearMode " > <nl> The viewport is always cleared before drawing . <nl> <nl> The Viewport renders 3D but without effects . <nl> < / constant > <nl> < constant name = " VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME " value = " 0 " enum = " ViewportRenderInfo " > <nl> + Number of objects drawn in a single frame . <nl> < / constant > <nl> < constant name = " VIEWPORT_RENDER_INFO_VERTICES_IN_FRAME " value = " 1 " enum = " ViewportRenderInfo " > <nl> + Number of vertices drawn in a single frame . <nl> < / constant > <nl> < constant name = " VIEWPORT_RENDER_INFO_MATERIAL_CHANGES_IN_FRAME " value = " 2 " enum = " ViewportRenderInfo " > <nl> + Number of material changes during this frame . <nl> < / constant > <nl> < constant name = " VIEWPORT_RENDER_INFO_SHADER_CHANGES_IN_FRAME " value = " 3 " enum = " ViewportRenderInfo " > <nl> + Number of shader changes during this frame . <nl> < / constant > <nl> < constant name = " VIEWPORT_RENDER_INFO_SURFACE_CHANGES_IN_FRAME " value = " 4 " enum = " ViewportRenderInfo " > <nl> + Number of surface changes during this frame . <nl> < / constant > <nl> < constant name = " VIEWPORT_RENDER_INFO_DRAW_CALLS_IN_FRAME " value = " 5 " enum = " ViewportRenderInfo " > <nl> + Number of draw calls during this frame . <nl> < / constant > <nl> < constant name = " VIEWPORT_RENDER_INFO_MAX " value = " 6 " enum = " ViewportRenderInfo " > <nl> Represents the size of the [ enum ViewportRenderInfo ] enum . <nl> <nl> Debug draw draws objects in wireframe . <nl> < / constant > <nl> < constant name = " SCENARIO_DEBUG_DISABLED " value = " 0 " enum = " ScenarioDebugMode " > <nl> + Do not use a debug mode . <nl> < / constant > <nl> < constant name = " SCENARIO_DEBUG_WIREFRAME " value = " 1 " enum = " ScenarioDebugMode " > <nl> + Draw all objects as wireframe models . <nl> < / constant > <nl> < constant name = " SCENARIO_DEBUG_OVERDRAW " value = " 2 " enum = " ScenarioDebugMode " > <nl> + Draw all objects in a way that displays how much overdraw is occurring . Overdraw occurs when a section of pixels is drawn and shaded and then another object covers it up . To optimize a scene , you should reduce overdraw . <nl> < / constant > <nl> < constant name = " SCENARIO_DEBUG_SHADELESS " value = " 3 " enum = " ScenarioDebugMode " > <nl> + Draw all objects without shading . Equivalent to setting all objects shaders to [ code ] unshaded [ / code ] . <nl> < / constant > <nl> < constant name = " INSTANCE_NONE " value = " 0 " enum = " InstanceType " > <nl> The instance does not have a type . <nl> <nl> The light adds color depending on mask . <nl> < / constant > <nl> < constant name = " CANVAS_LIGHT_FILTER_NONE " value = " 0 " enum = " CanvasLightShadowFilter " > <nl> + Do not apply a filter to canvas light shadows . <nl> < / constant > <nl> < constant name = " CANVAS_LIGHT_FILTER_PCF3 " value = " 1 " enum = " CanvasLightShadowFilter " > <nl> + Use PCF3 filtering to filter canvas light shadows . <nl> < / constant > <nl> < constant name = " CANVAS_LIGHT_FILTER_PCF5 " value = " 2 " enum = " CanvasLightShadowFilter " > <nl> + Use PCF5 filtering to filter canvas light shadows . <nl> < / constant > <nl> < constant name = " CANVAS_LIGHT_FILTER_PCF7 " value = " 3 " enum = " CanvasLightShadowFilter " > <nl> + Use PCF7 filtering to filter canvas light shadows . <nl> < / constant > <nl> < constant name = " CANVAS_LIGHT_FILTER_PCF9 " value = " 4 " enum = " CanvasLightShadowFilter " > <nl> + Use PCF9 filtering to filter canvas light shadows . <nl> < / constant > <nl> < constant name = " CANVAS_LIGHT_FILTER_PCF13 " value = " 5 " enum = " CanvasLightShadowFilter " > <nl> + Use PCF13 filtering to filter canvas light shadows . <nl> < / constant > <nl> < constant name = " CANVAS_OCCLUDER_POLYGON_CULL_DISABLED " value = " 0 " enum = " CanvasOccluderPolygonCullMode " > <nl> Culling of the canvas occluder is disabled . <nl> <nl> The amount of vertex memory used . <nl> < / constant > <nl> < constant name = " FEATURE_SHADERS " value = " 0 " enum = " Features " > <nl> + Hardware supports shaders . This enum is currently unused in Godot 3 . x . <nl> < / constant > <nl> < constant name = " FEATURE_MULTITHREADED " value = " 1 " enum = " Features " > <nl> + Hardware supports multithreading . This enum is currently unused in Godot 3 . x . <nl> < / constant > <nl> < constant name = " MULTIMESH_TRANSFORM_2D " value = " 0 " enum = " MultimeshTransformFormat " > <nl> Use [ Transform2D ] to store MultiMesh transform . <nl> <nl> MultiMesh custom data uses a float per component . <nl> < / constant > <nl> < constant name = " REFLECTION_PROBE_UPDATE_ONCE " value = " 0 " enum = " ReflectionProbeUpdateMode " > <nl> + Reflection probe will update reflections once and then stop . <nl> < / constant > <nl> < constant name = " REFLECTION_PROBE_UPDATE_ALWAYS " value = " 1 " enum = " ReflectionProbeUpdateMode " > <nl> + Reflection probe will update each frame . This mode is necessary to capture moving objects . <nl> < / constant > <nl> < constant name = " PARTICLES_DRAW_ORDER_INDEX " value = " 0 " enum = " ParticlesDrawOrder " > <nl> + Draw particles in the order that they appear in the particles array . <nl> < / constant > <nl> < constant name = " PARTICLES_DRAW_ORDER_LIFETIME " value = " 1 " enum = " ParticlesDrawOrder " > <nl> + Sort particles based on their lifetime . <nl> < / constant > <nl> < constant name = " PARTICLES_DRAW_ORDER_VIEW_DEPTH " value = " 2 " enum = " ParticlesDrawOrder " > <nl> + Sort particles based on their distance to the camera . <nl> < / constant > <nl> < constant name = " ENV_BG_CLEAR_COLOR " value = " 0 " enum = " EnvironmentBG " > <nl> + Use the clear color as background . <nl> < / constant > <nl> < constant name = " ENV_BG_COLOR " value = " 1 " enum = " EnvironmentBG " > <nl> + Use a specified color as the background . <nl> < / constant > <nl> < constant name = " ENV_BG_SKY " value = " 2 " enum = " EnvironmentBG " > <nl> + Use a sky resource for the background . <nl> < / constant > <nl> < constant name = " ENV_BG_COLOR_SKY " value = " 3 " enum = " EnvironmentBG " > <nl> + Use a custom color for background , but use a sky for shading and reflections . <nl> < / constant > <nl> < constant name = " ENV_BG_CANVAS " value = " 4 " enum = " EnvironmentBG " > <nl> + Use a specified canvas layer as the background . This can be useful for instantiating a 2D scene in a 3D world . <nl> < / constant > <nl> < constant name = " ENV_BG_KEEP " value = " 5 " enum = " EnvironmentBG " > <nl> + Do not clear the background , use whatever was rendered last frame as the background . <nl> < / constant > <nl> < constant name = " ENV_BG_MAX " value = " 7 " enum = " EnvironmentBG " > <nl> Represents the size of the [ enum EnvironmentBG ] enum . <nl> < / constant > <nl> < constant name = " ENV_DOF_BLUR_QUALITY_LOW " value = " 0 " enum = " EnvironmentDOFBlurQuality " > <nl> + Use lowest blur quality . Fastest , but may look bad . <nl> < / constant > <nl> < constant name = " ENV_DOF_BLUR_QUALITY_MEDIUM " value = " 1 " enum = " EnvironmentDOFBlurQuality " > <nl> + Use medium blur quality . <nl> < / constant > <nl> < constant name = " ENV_DOF_BLUR_QUALITY_HIGH " value = " 2 " enum = " EnvironmentDOFBlurQuality " > <nl> + Used highest blur quality . Looks the best , but is the slowest . <nl> < / constant > <nl> < constant name = " GLOW_BLEND_MODE_ADDITIVE " value = " 0 " enum = " EnvironmentGlowBlendMode " > <nl> + Add the effect of the glow on top of the scene . <nl> < / constant > <nl> < constant name = " GLOW_BLEND_MODE_SCREEN " value = " 1 " enum = " EnvironmentGlowBlendMode " > <nl> + Blends the glow effect with the screen . Does not get as bright as additive . <nl> < / constant > <nl> < constant name = " GLOW_BLEND_MODE_SOFTLIGHT " value = " 2 " enum = " EnvironmentGlowBlendMode " > <nl> + Produces a subtle color disturbance around objects . <nl> < / constant > <nl> < constant name = " GLOW_BLEND_MODE_REPLACE " value = " 3 " enum = " EnvironmentGlowBlendMode " > <nl> + Shows the glow effect by itself without the underlying scene . <nl> < / constant > <nl> < constant name = " ENV_TONE_MAPPER_LINEAR " value = " 0 " enum = " EnvironmentToneMapper " > <nl> + Output color as they came in . <nl> < / constant > <nl> < constant name = " ENV_TONE_MAPPER_REINHARD " value = " 1 " enum = " EnvironmentToneMapper " > <nl> + Use the Reinhard tonemapper . <nl> < / constant > <nl> < constant name = " ENV_TONE_MAPPER_FILMIC " value = " 2 " enum = " EnvironmentToneMapper " > <nl> + Use the filmic tonemapper . <nl> < / constant > <nl> < constant name = " ENV_TONE_MAPPER_ACES " value = " 3 " enum = " EnvironmentToneMapper " > <nl> + Use the ACES tonemapper . <nl> < / constant > <nl> < constant name = " ENV_SSAO_QUALITY_LOW " value = " 0 " enum = " EnvironmentSSAOQuality " > <nl> + Lowest quality of screen space ambient occlusion . <nl> < / constant > <nl> < constant name = " ENV_SSAO_QUALITY_MEDIUM " value = " 1 " enum = " EnvironmentSSAOQuality " > <nl> + Medium quality screen space ambient occlusion . <nl> < / constant > <nl> < constant name = " ENV_SSAO_QUALITY_HIGH " value = " 2 " enum = " EnvironmentSSAOQuality " > <nl> + Highest quality screen space ambient occlusion . <nl> < / constant > <nl> < constant name = " ENV_SSAO_BLUR_DISABLED " value = " 0 " enum = " EnvironmentSSAOBlur " > <nl> + Disables the blur set for SSAO . Will make SSAO look noisier . <nl> < / constant > <nl> < constant name = " ENV_SSAO_BLUR_1x1 " value = " 1 " enum = " EnvironmentSSAOBlur " > <nl> + Perform a 1x1 blur on the SSAO output . <nl> < / constant > <nl> < constant name = " ENV_SSAO_BLUR_2x2 " value = " 2 " enum = " EnvironmentSSAOBlur " > <nl> + Performs a 2x2 blur on the SSAO output . <nl> < / constant > <nl> < constant name = " ENV_SSAO_BLUR_3x3 " value = " 3 " enum = " EnvironmentSSAOBlur " > <nl> + Performs a 3x3 blur on the SSAO output . Use this for smoothest SSAO . <nl> < / constant > <nl> < / constants > <nl> < / class > <nl>

Merge pull request from clayjohn / DOCS - VisualServer

godotengine/godot

7c3543380fe9ecd3d9a2d2dd3319e1c37e06820f

2020-01-06T07:38:32Z

mmm a / utils / sil - mode . el <nl> ppp b / utils / sil - mode . el <nl> <nl> ` ( , ( regexp - opt ' ( " init_existential_addr " " deinit_existential_addr " <nl> " open_existential_addr " " alloc_existential_box " <nl> " init_existential_ref " " project_existential_box " <nl> - " open_existential_ref " " open_existential_box " ) <nl> + " open_existential_ref " " open_existential_box " <nl> + " objc_protocol " ) <nl> ' words ) . font - lock - keyword - face ) <nl> ; ; Unchecked Conversions <nl> ` ( , ( regexp - opt ' ( " upcast " <nl>

Merge pull request from gottesmm / silmode_highlight_objcprotocol

apple/swift

e3cd5294df16227a98d7441f6da2f1aedfd91f42

2016-11-02T22:44:22Z

mmm a / taichi / platform / metal / metal_runtime . cpp <nl> ppp b / taichi / platform / metal / metal_runtime . cpp <nl> MetalRuntime : : CompiledMtlKernel : : CompiledMtlKernel ( <nl> const MetalKernelAttributes & md , <nl> MTLDevice * device , <nl> MTLFunction * func , <nl> - CPUProfiler * profiler ) <nl> + ProfilerBase * profiler ) <nl> : kernel_attribs_ ( md ) , <nl> pipeline_state_ ( new_compute_pipeline_state_with_function ( device , func ) ) , <nl> profiler_ ( profiler ) , <nl> MetalRuntime : : CompiledTaichiKernel : : CompiledTaichiKernel ( <nl> const MetalKernelArgsAttributes & args_attribs , <nl> MTLDevice * device , <nl> MemoryPool * mem_pool , <nl> - CPUProfiler * profiler ) <nl> + ProfilerBase * profiler ) <nl> : mtl_source_code_ ( source_code ) , <nl> global_tmps_mem_ ( global_tmps_size , mem_pool ) , <nl> args_attribs_ ( args_attribs ) , <nl> MetalRuntime : : CompiledTaichiKernel : : CompiledTaichiKernel ( <nl> <nl> MetalRuntime : : MetalRuntime ( size_t root_size , <nl> MemoryPool * mem_pool , <nl> - CPUProfiler * profiler ) <nl> + ProfilerBase * profiler ) <nl> : mem_pool_ ( mem_pool ) , <nl> profiler_ ( profiler ) , <nl> root_buffer_mem_ ( root_size , mem_pool ) { <nl> mmm a / taichi / platform / metal / metal_runtime . h <nl> ppp b / taichi / platform / metal / metal_runtime . h <nl> class BufferMemoryView { <nl> / / series of Metal kernels generated from a Taichi kernel . <nl> class MetalRuntime { <nl> public : <nl> - MetalRuntime ( size_t root_size , MemoryPool * mem_pool , CPUProfiler * profiler ) ; <nl> + MetalRuntime ( size_t root_size , MemoryPool * mem_pool , ProfilerBase * profiler ) ; <nl> <nl> / / Register a Taichi kernel to the Metal runtime . <nl> / / * | mtl_kernel_source_code | is the complete source code compiled from a <nl> class MetalRuntime { <nl> CompiledMtlKernel ( const MetalKernelAttributes & md , <nl> MTLDevice * device , <nl> MTLFunction * func , <nl> - CPUProfiler * profiler ) ; <nl> + ProfilerBase * profiler ) ; <nl> <nl> void launch ( MTLBuffer * root_buffer , <nl> MTLBuffer * global_tmp_buffer , <nl> class MetalRuntime { <nl> private : <nl> MetalKernelAttributes kernel_attribs_ ; <nl> nsobj_unique_ptr < MTLComputePipelineState > pipeline_state_ { nullptr } ; <nl> - CPUProfiler * const profiler_ ; <nl> + ProfilerBase * const profiler_ ; <nl> const std : : string profiler_id_ ; <nl> } ; <nl> <nl> class MetalRuntime { <nl> const MetalKernelArgsAttributes & args_attribs , <nl> MTLDevice * device , <nl> MemoryPool * mem_pool , <nl> - CPUProfiler * profiler ) ; <nl> + ProfilerBase * profiler ) ; <nl> <nl> private : <nl> friend void MetalRuntime : : launch_taichi_kernel ( <nl> class MetalRuntime { <nl> MetalKernelArgsAttributes args_attribs_ ; <nl> std : : unique_ptr < BufferMemoryView > args_mem_ { nullptr } ; <nl> nsobj_unique_ptr < MTLBuffer > args_buffer_ { nullptr } ; <nl> - CPUProfiler * const profiler_ ; <nl> + ProfilerBase * const profiler_ ; <nl> } ; <nl> <nl> MemoryPool * const mem_pool_ ; <nl> - CPUProfiler * const profiler_ ; <nl> + ProfilerBase * const profiler_ ; <nl> BufferMemoryView root_buffer_mem_ ; <nl> nsobj_unique_ptr < MTLDevice > device_ { nullptr } ; <nl> nsobj_unique_ptr < MTLCommandQueue > command_queue_ { nullptr } ; <nl> mmm a / taichi / profiler . cpp <nl> ppp b / taichi / profiler . cpp <nl> class CPUProfiler : public ProfilerBase { <nl> <nl> std : : unique_ptr < ProfilerBase > make_profiler ( Arch arch ) { <nl> if ( arch = = Arch : : x86_64 | | arch = = Arch : : arm ) { <nl> + / / TODO : Arch : : metal also uses CPUProfiler , rename it to DefaultProfiler ? <nl> return std : : make_unique < CPUProfiler > ( ) ; <nl> } else if ( arch = = Arch : : cuda ) { <nl> return std : : make_unique < CUDAProfiler > ( ) ; <nl>

Rename CPUProfiler to ProfilerBase in Metal runtime

taichi-dev/taichi

b972a2efebc361c582029d0c161933a72f46ff26

2020-02-05T15:05:49Z

mmm a / tests / webidl / output . txt <nl> ppp b / tests / webidl / output . txt <nl> unsigned short int : 65535 <nl> return unsigned long - 1 <nl> unsigned long int : 4294967295 <nl> void * 3 <nl> - array [ 0 ] = = 0 <nl> - array [ 7 ] = = 7 <nl> - array [ 0 ] = = 42 <nl> - array [ 7 ] = = 43 <nl> + int_array [ 0 ] = = 0 <nl> + int_array [ 7 ] = = 7 <nl> + int_array [ 0 ] = = 42 <nl> + int_array [ 7 ] = = 43 <nl> + idx - 1 : Array index - 1 out of bounds : [ 0 , 8 ) <nl> + idx 8 : Array index 8 out of bounds : [ 0 , 8 ) <nl> struct_array [ 0 ] . attr1 = = 0 <nl> struct_array [ 0 ] . attr2 = = 0 <nl> struct_array [ 7 ] . attr1 = = 7 <nl> mmm a / tests / webidl / post . js <nl> ppp b / tests / webidl / post . js <nl> TheModule . print ( ' void * ' + voidPointerUser . GetVoidPointer ( ) ) ; <nl> / / Array tests <nl> <nl> var arrayClass = new TheModule . ArrayClass ( ) ; <nl> - TheModule . print ( ' array [ 0 ] = = ' + arrayClass . get_int_array ( 0 ) ) ; <nl> - TheModule . print ( ' array [ 7 ] = = ' + arrayClass . get_int_array ( 7 ) ) ; <nl> + TheModule . print ( ' int_array [ 0 ] = = ' + arrayClass . get_int_array ( 0 ) ) ; <nl> + TheModule . print ( ' int_array [ 7 ] = = ' + arrayClass . get_int_array ( 7 ) ) ; <nl> arrayClass . set_int_array ( 0 , 42 ) ; <nl> arrayClass . set_int_array ( 7 , 43 ) ; <nl> - TheModule . print ( ' array [ 0 ] = = ' + arrayClass . get_int_array ( 0 ) ) ; <nl> - TheModule . print ( ' array [ 7 ] = = ' + arrayClass . get_int_array ( 7 ) ) ; <nl> + TheModule . print ( ' int_array [ 0 ] = = ' + arrayClass . get_int_array ( 0 ) ) ; <nl> + TheModule . print ( ' int_array [ 7 ] = = ' + arrayClass . get_int_array ( 7 ) ) ; <nl> + <nl> + try { <nl> + arrayClass . set_int_array ( - 1 , struct ) ; <nl> + } catch ( e ) { <nl> + TheModule . print ( ' idx - 1 : ' + e ) ; <nl> + } <nl> + <nl> + try { <nl> + arrayClass . set_int_array ( 8 , struct ) ; <nl> + } catch ( e ) { <nl> + TheModule . print ( ' idx 8 : ' + e ) ; <nl> + } <nl> <nl> TheModule . print ( ' struct_array [ 0 ] . attr1 = = ' + arrayClass . get_struct_array ( 0 ) . get_attr1 ( ) ) ; <nl> TheModule . print ( ' struct_array [ 0 ] . attr2 = = ' + arrayClass . get_struct_array ( 0 ) . get_attr2 ( ) ) ; <nl> TheModule . print ( ' struct_array [ 7 ] . attr1 = = ' + arrayClass . get_struct_array ( 7 ) . get_attr1 ( ) ) ; <nl> TheModule . print ( ' struct_array [ 7 ] . attr2 = = ' + arrayClass . get_struct_array ( 7 ) . get_attr2 ( ) ) ; <nl> <nl> + / / Verify that bounds checking is * not * enabled when not asked for . <nl> + / / This actually causes an illegal memory access , but as it ' s only a read , and the return <nl> + / / value is not used , it shouldn ' t cause any problems in practice . <nl> + arrayClass . get_struct_array ( 8 ) ; <nl> + <nl> var struct = new TheModule . StructInArray ( 13 , 17 ) ; <nl> arrayClass . set_struct_array ( 0 , struct ) ; <nl> struct = new TheModule . StructInArray ( 14 , 18 ) ; <nl> mmm a / tests / webidl / test . idl <nl> ppp b / tests / webidl / test . idl <nl> interface StructInArray { <nl> <nl> interface ArrayClass { <nl> void ArrayClass ( ) ; <nl> - attribute long [ ] int_array ; <nl> + [ BoundsChecked ] attribute long [ ] int_array ; <nl> [ Value ] attribute StructInArray [ ] struct_array ; <nl> attribute StructInArray [ ] struct_ptr_array ; <nl> } ; <nl> mmm a / third_party / WebIDL . py <nl> ppp b / third_party / WebIDL . py <nl> def handleExtendedAttribute ( self , attr ) : <nl> identifier = = " AvailableIn " or <nl> identifier = = " Const " or <nl> identifier = = " Value " or <nl> + identifier = = " BoundsChecked " or <nl> identifier = = " NewObject " ) : <nl> # Known attributes that we don ' t need to do anything with here <nl> pass <nl> mmm a / tools / webidl_binder . py <nl> ppp b / tools / webidl_binder . py <nl> def emit_constructor ( name ) : <nl> <nl> ' ' ' ] <nl> <nl> + mid_c + = [ ' ' ' <nl> + / / Not using size_t for array indices as the values used by the javascript code are signed . <nl> + void array_bounds_check ( const int array_size , const int array_idx ) { <nl> + if ( array_idx < 0 | | array_idx > = array_size ) { <nl> + EM_ASM_INT ( { <nl> + throw ' Array index ' + $ 0 + ' out of bounds : [ 0 , ' + $ 1 + ' ) ' ; <nl> + } , array_idx , array_size ) ; <nl> + } <nl> + } <nl> + ' ' ' ] <nl> + <nl> C_FLOATS = [ ' float ' , ' double ' ] <nl> <nl> def type_to_c ( t , non_pointing = False ) : <nl> def render_function ( class_name , func_name , sigs , return_type , non_pointer , copy , <nl> Dummy ( { ' type ' : m . type } ) ] } <nl> get_call_content = take_addr_if_nonpointer ( m ) + ' self - > ' + attr + ' [ arg0 ] ' <nl> set_call_content = ' self - > ' + attr + ' [ arg0 ] = ' + deref_if_nonpointer ( m ) + ' arg1 ' <nl> + if m . getExtendedAttribute ( ' BoundsChecked ' ) : <nl> + bounds_check = " array_bounds_check ( sizeof ( self - > % s ) / sizeof ( self - > % s [ 0 ] ) , arg0 ) " % ( attr , attr ) <nl> + get_call_content = " ( % s , % s ) " % ( bounds_check , get_call_content ) <nl> + set_call_content = " ( % s , % s ) " % ( bounds_check , set_call_content ) <nl> else : <nl> get_sigs = { 0 : [ ] } <nl> set_sigs = { 1 : [ Dummy ( { ' type ' : m . type } ) ] } <nl>

Bounds - checking for array attributes .

emscripten-core/emscripten

889c97822d9abd8ac8358821922c40ebc663cacc

2014-08-18T23:21:42Z

new file mode 100755 <nl> index 0000000000 . . 082ce0517e <nl> mmm / dev / null <nl> ppp b / android / playground / app / src / androidTest / java / com / alibaba / weex / pertest / WeexPerTestCaseListPerfWithAppendTree . java <nl> <nl> + package com . alibaba . weex . pertest ; <nl> + <nl> + import android . app . Activity ; <nl> + import android . app . Application ; <nl> + import android . app . Instrumentation ; <nl> + import android . content . Intent ; <nl> + import android . test . ActivityInstrumentationTestCase2 ; <nl> + import android . text . TextUtils ; <nl> + import android . util . Log ; <nl> + import android . view . View ; <nl> + import android . view . ViewGroup ; <nl> + import android . widget . TextView ; <nl> + <nl> + import com . alibaba . weex . R ; <nl> + import com . alibaba . weex . WXPageActivity ; <nl> + import com . alibaba . weex . WeappJsBaseTestCase ; <nl> + import com . alibaba . weex . constants . Constants ; <nl> + import com . alibaba . weex . util . ScreenShot ; <nl> + <nl> + import java . io . IOException ; <nl> + import java . util . ArrayList ; <nl> + <nl> + / * * <nl> + * Created by admin on 16 / 3 / 23 . <nl> + * / <nl> + public class WeexPerTestCaseListPerfWithAppendTree extends ActivityInstrumentationTestCase2 < WXPageActivity > { <nl> + public final String TAG = " TestScript_Guide = = " ; <nl> + public WeappJsBaseTestCase weappApplication ; <nl> + public WXPageActivity waTestPageActivity ; <nl> + public WXPageActivity waTestPageActivity2 ; <nl> + <nl> + public ViewGroup mViewGroup ; <nl> + public Application mApplication ; <nl> + public Instrumentation mInstrumentation ; <nl> + <nl> + public ArrayList < View > mCaseListIndexView = new ArrayList < View > ( ) ; <nl> + public WeexPerTestCaseListPerfWithAppendTree ( ) { <nl> + super ( WXPageActivity . class ) ; <nl> + } <nl> + <nl> + public void setUp ( ) throws Exception { <nl> + <nl> + Log . e ( " TestScript_Guide " , " setUp test ! ! " ) ; <nl> + setActivityInitialTouchMode ( false ) ; <nl> + weappApplication = new WeappJsBaseTestCase ( ) ; <nl> + mInstrumentation = getInstrumentation ( ) ; <nl> + <nl> + Intent intent = new Intent ( ) ; <nl> + intent . putExtra ( " bundleUrl " , Constants . BUNDLE_URL ) ; <nl> + launchActivityWithIntent ( " com . alibaba . weex " , WXPageActivity . class , intent ) ; <nl> + waTestPageActivity = getActivity ( ) ; <nl> + / / waTestPageActivity . getIntent ( ) . getData ( ) . toString ( ) ; <nl> + Log . e ( TAG , " activity1 = " + waTestPageActivity . toString ( ) ) ; <nl> + Thread . sleep ( 3000 ) ; <nl> + <nl> + mViewGroup = ( ViewGroup ) waTestPageActivity . findViewById ( R . id . container ) ; <nl> + setViewGroup ( mViewGroup ) ; <nl> + <nl> + mCaseListIndexView = getTestCaseListViewByText ( " TC_ " ) ; <nl> + } <nl> + <nl> + / / public void testPreConditions ( ) <nl> + / / { <nl> + / / assertNotNull ( waTestPageActivity ) ; <nl> + / / assertNotNull ( mViewGroup ) ; <nl> + / / assertNotNull ( mCaseListIndexView ) ; <nl> + / / <nl> + / / } <nl> + <nl> + public void testPerfMonitorListAppendTree ( ) { <nl> + <nl> + for ( final View caseView : mCaseListIndexView ) { <nl> + if ( ( ( TextView ) caseView ) . getText ( ) . toString ( ) . equals ( " TC_Monitor " ) ) { <nl> + Log . e ( TAG , " TC_Monitor find " ) ; <nl> + <nl> + final TextView inputView = ( TextView ) caseView ; <nl> + mInstrumentation . runOnMainSync ( new Runnable ( ) { <nl> + @ Override <nl> + public void run ( ) { <nl> + inputView . requestFocus ( ) ; <nl> + inputView . performClick ( ) ; <nl> + Log . e ( TAG , " TC_Monitor click ! ! " ) ; <nl> + } <nl> + } ) ; <nl> + <nl> + sleep ( 2000 ) ; <nl> + <nl> + setActivity ( WXPageActivity . wxPageActivityInstance ) ; <nl> + Activity activity2 = getActivity ( ) ; <nl> + Log . e ( TAG , " activity2 = " + activity2 . toString ( ) ) ; <nl> + <nl> + ViewGroup myGroup = ( ViewGroup ) ( activity2 . findViewById ( R . id . container ) ) ; <nl> + Log . e ( TAG , myGroup . toString ( ) ) ; <nl> + <nl> + ArrayList < View > inputListView = new ArrayList < View > ( ) ; <nl> + myGroup . findViewsWithText ( inputListView , " TC_Monitor_List_WithAppendTree " , View . FIND_VIEWS_WITH_TEXT ) ; <nl> + <nl> + Log . e ( TAG , " TC_Monitor_List_WithAppendTree size = = " + inputListView . size ( ) ) ; <nl> + <nl> + if ( inputListView . size ( ) ! = 0 ) { <nl> + final TextView inputTypeView = ( TextView ) inputListView . get ( 0 ) ; <nl> + <nl> + mInstrumentation . runOnMainSync ( new Runnable ( ) { <nl> + @ Override <nl> + public void run ( ) { <nl> + inputTypeView . requestFocus ( ) ; <nl> + inputTypeView . performClick ( ) ; <nl> + Log . e ( TAG , " TC_Monitor_List_WithAppendTree clcik ! " ) ; <nl> + / / screenShot ( " TC_Input_Type " ) ; <nl> + } <nl> + } ) ; <nl> + <nl> + <nl> + sleep ( 3000 ) ; <nl> + Log . e ( TAG , " TC_Monitor_List_WithAppendTree snap ! " ) ; <nl> + screenShot ( " TC_Monitor_List_WithAppendTree " ) ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + } <nl> + <nl> + <nl> + <nl> + / * * <nl> + * get tc list by text <nl> + * @ param byText <nl> + * @ return <nl> + * @ throws InterruptedException <nl> + * / <nl> + public ArrayList < View > getTestCaseListViewByText ( String byText ) throws InterruptedException { <nl> + Log . e ( " TestScript_Guide " , " byText = = " + byText ) ; <nl> + <nl> + if ( TextUtils . isEmpty ( byText ) ) { <nl> + return null ; <nl> + } <nl> + ArrayList < View > outViews = new ArrayList < View > ( ) ; <nl> + <nl> + mViewGroup . findViewsWithText ( outViews , byText , View . FIND_VIEWS_WITH_TEXT ) ; <nl> + sleep ( 2000 ) ; <nl> + <nl> + for ( View view : outViews ) { <nl> + String viewText = ( ( TextView ) view ) . getText ( ) . toString ( ) ; <nl> + Log . e ( TAG , " viewText = = " + viewText ) ; <nl> + <nl> + <nl> + } <nl> + return outViews ; <nl> + } <nl> + <nl> + / * * <nl> + * findMyCaseByText <nl> + * / <nl> + public View findMyCaseByText ( String caseText ) { <nl> + if ( mCaseListIndexView . size ( ) = = 0 ) return null ; <nl> + <nl> + TextView view = null ; <nl> + for ( int i = 0 ; i < mCaseListIndexView . size ( ) ; i + + ) { <nl> + <nl> + view = ( TextView ) mCaseListIndexView . get ( i ) ; <nl> + <nl> + if ( view . getText ( ) . toString ( ) . toLowerCase ( ) . contains ( caseText . toLowerCase ( ) ) ) { <nl> + return view ; <nl> + } <nl> + <nl> + } <nl> + return view ; <nl> + } <nl> + <nl> + / * * <nl> + * sleep <nl> + * / <nl> + public void sleep ( long time ) { <nl> + try { <nl> + Thread . sleep ( time ) ; <nl> + } catch ( InterruptedException e ) { <nl> + e . printStackTrace ( ) ; <nl> + } <nl> + } <nl> + <nl> + <nl> + / * * <nl> + * snapshot <nl> + * / <nl> + public void screenShot ( String shotName ) { <nl> + try { <nl> + ScreenShot . shoot ( WXPageActivity . wxPageActivityInstance , shotName ) ; <nl> + } catch ( IOException e ) { <nl> + e . printStackTrace ( ) ; <nl> + } <nl> + sleep ( 3000 ) ; <nl> + <nl> + } <nl> + <nl> + public void setViewGroup ( ViewGroup viewGroup ) { <nl> + mViewGroup = viewGroup ; <nl> + } <nl> + <nl> + <nl> + } <nl>

+ [ test ] android playground add perf list with append tree testcase

apache/incubator-weex

51688ac2ee87959db647f78ff69644d634ae8f18

2016-05-06T02:49:51Z

mmm a / hphp / runtime / vm / jit / normalized - instruction . cpp <nl> ppp b / hphp / runtime / vm / jit / normalized - instruction . cpp <nl> NormalizedInstruction : : NormalizedInstruction ( SrcKey sk , const Unit * u ) <nl> , m_unit ( u ) <nl> , immVec ( ) <nl> , endsRegion ( false ) <nl> - , ignoreInnerType ( false ) <nl> , interp ( false ) <nl> , forceSurpriseCheck ( false ) <nl> { <nl> mmm a / hphp / runtime / vm / jit / normalized - instruction . h <nl> ppp b / hphp / runtime / vm / jit / normalized - instruction . h <nl> struct NormalizedInstruction { <nl> IterTable immIters ; <nl> <nl> bool endsRegion : 1 ; <nl> - bool ignoreInnerType : 1 ; <nl> <nl> / * <nl> * Used with HHIR . Instruction shoud be interpreted , because previous attempt <nl> mmm a / hphp / runtime / vm / jit / region - tracelet . cpp <nl> ppp b / hphp / runtime / vm / jit / region - tracelet . cpp <nl> bool consumeInput ( Env & env , const InputInfo & input ) { <nl> } <nl> <nl> if ( ! ( type < = TBoxedCell ) | | <nl> - env . inst . ignoreInnerType | | <nl> - input . dontGuardInner ) { <nl> + input . dontGuardInner | | <nl> + opcodeIgnoresInnerType ( env . inst . op ( ) ) ) { <nl> return true ; <nl> } <nl> <nl> mmm a / hphp / runtime / vm / jit / translate - region . cpp <nl> ppp b / hphp / runtime / vm / jit / translate - region . cpp <nl> void initNormalizedInstruction ( <nl> / / its inputs , so we still populate the rest of the instruction even if <nl> / / this is true . <nl> inst . interp = toInterp ; <nl> - <nl> - auto const inputInfos = getInputs ( inst , irgs . irb - > fs ( ) . bcSPOff ( ) ) ; <nl> } <nl> <nl> bool shouldTrySingletonInline ( const RegionDesc & region , <nl> mmm a / hphp / runtime / vm / jit / translator - inl . h <nl> ppp b / hphp / runtime / vm / jit / translator - inl . h <nl> inline bool opcodeBreaksBB ( const Op op , bool inlining ) { <nl> return opcodeControlFlowInfo ( op , inlining ) = = ControlFlowInfo : : BreaksBB ; <nl> } <nl> <nl> + inline bool opcodeIgnoresInnerType ( const Op op ) { <nl> + switch ( op ) { <nl> + case Op : : BindL : <nl> + case Op : : PopV : <nl> + case Op : : RetC : <nl> + case Op : : RetCSuspended : <nl> + case Op : : RetM : <nl> + return true ; <nl> + default : <nl> + return false ; <nl> + } <nl> + } <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / Input and output information . <nl> <nl> mmm a / hphp / runtime / vm / jit / translator . cpp <nl> ppp b / hphp / runtime / vm / jit / translator . cpp <nl> static const struct { <nl> { OpPopC , { Stack1 | <nl> DontGuardStack1 , None , OutNone } } , <nl> { OpPopV , { Stack1 | <nl> - DontGuardStack1 | <nl> - IgnoreInnerType , None , OutNone } } , <nl> + DontGuardStack1 , None , OutNone } } , <nl> { OpPopU , { Stack1 | <nl> DontGuardStack1 , None , OutNone } } , <nl> { OpPopL , { Stack1 | Local , Local , OutNone } } , <nl> static const struct { <nl> * RetC and RetM consume values from the stack , and these values ' types needs <nl> * to be known at compile - time . <nl> * / <nl> - { OpRetC , { AllLocals , None , OutNone } } , <nl> - { OpRetM , { AllLocals , None , OutNone } } , <nl> + { OpRetC , { None , None , OutNone } } , <nl> + { OpRetM , { None , None , OutNone } } , <nl> { OpRetCSuspended , <nl> - { AllLocals , None , OutNone } } , <nl> + { None , None , OutNone } } , <nl> { OpThrow , { Stack1 , None , OutNone } } , <nl> { OpUnwind , { None , None , OutNone } } , <nl> <nl> static const struct { <nl> { OpIncDecL , { Local , Stack1 | Local , OutIncDec } } , <nl> { OpIncDecG , { Stack1 , Stack1 , OutUnknown } } , <nl> { OpIncDecS , { Stack1 , Stack1 , OutUnknown } } , <nl> - { OpBindL , { Stack1 | Local | <nl> - IgnoreInnerType , Stack1 | Local , OutSameAsInput1 } } , <nl> + { OpBindL , { Stack1 | Local , Stack1 | Local , OutSameAsInput1 } } , <nl> { OpBindG , { StackTop2 , Stack1 , OutSameAsInput1 } } , <nl> { OpBindS , { StackTop2 , Stack1 , OutSameAsInput1 } } , <nl> { OpUnsetL , { Local , Local , OutNone } } , <nl> const InstrInfo & getInstrInfo ( Op op ) { <nl> <nl> namespace { <nl> int64_t countOperands ( uint64_t mask ) { <nl> - const uint64_t ignore = Local | Iter | AllLocals | DontGuardStack1 | <nl> - IgnoreInnerType | DontGuardAny | This | MBase | StackI | MKey | LocalRange | <nl> + const uint64_t ignore = Local | Iter | DontGuardStack1 | <nl> + DontGuardAny | This | MBase | StackI | MKey | LocalRange | <nl> DontGuardBase ; <nl> mask & = ~ ignore ; <nl> <nl> size_t memberKeyImmIdx ( Op op ) { <nl> / * <nl> * Get location metadata for the inputs of ` ni ' . <nl> * / <nl> - InputInfoVec getInputs ( NormalizedInstruction & ni , FPInvOffset bcSPOff ) { <nl> + InputInfoVec getInputs ( const NormalizedInstruction & ni , FPInvOffset bcSPOff ) { <nl> InputInfoVec inputs ; <nl> if ( isAlwaysNop ( ni ) ) return inputs ; <nl> <nl> InputInfoVec getInputs ( NormalizedInstruction & ni , FPInvOffset bcSPOff ) { <nl> stackOff - = ( ni . imm [ 0 ] . u_FCA . hasUnpack ( ) ? 1 : 0 ) ; / / unpack <nl> stackOff - = kNumActRecCells ; / / ActRec is torn down as well <nl> } <nl> - if ( flags & IgnoreInnerType ) ni . ignoreInnerType = true ; <nl> <nl> if ( flags & Stack1 ) { <nl> SKTRACE ( 1 , sk , " getInputs : Stack1 % d \ n " , stackOff . offset ) ; <nl> InputInfoVec getInputs ( NormalizedInstruction & ni , FPInvOffset bcSPOff ) { <nl> inputs . emplace_back ( Location : : Local { uint32_t ( range . first + i ) } ) ; <nl> } <nl> } <nl> - if ( flags & AllLocals ) ni . ignoreInnerType = true ; <nl> <nl> if ( flags & MKey ) { <nl> auto mk = ni . imm [ memberKeyImmIdx ( ni . op ( ) ) ] . u_KA ; <nl> mmm a / hphp / runtime / vm / jit / translator . h <nl> ppp b / hphp / runtime / vm / jit / translator . h <nl> bool opcodeChangesPC ( const Op op ) ; <nl> * / <nl> bool opcodeBreaksBB ( const Op op , bool inlining ) ; <nl> <nl> + / * <nl> + * Return true if the instruction doesn ' t care about the inner types . <nl> + * / <nl> + bool opcodeIgnoresInnerType ( const Op op ) ; <nl> + <nl> / * <nl> * Similar to opcodeBreaksBB but more strict . We break profiling blocks after <nl> * any instruction that can side exit , including instructions with predicted <nl> struct InputInfoVec : public std : : vector < InputInfo > { <nl> } ; <nl> <nl> / * <nl> - * Get input location info and flags for a NormalizedInstruction . Some flags <nl> - * on ` ni ' may be updated . <nl> + * Get input location info and flags for a NormalizedInstruction . <nl> * / <nl> - InputInfoVec getInputs ( NormalizedInstruction & , FPInvOffset bcSPOff ) ; <nl> + InputInfoVec getInputs ( const NormalizedInstruction & , FPInvOffset bcSPOff ) ; <nl> <nl> / * <nl> * Return the index of op ' s local immediate . <nl> enum Operands { <nl> FStack = 1 < < 5 , / / output of FPushFuncD and friends <nl> Local = 1 < < 6 , / / Writes to a local <nl> Iter = 1 < < 7 , / / Iterator in imm [ 0 ] <nl> - AllLocals = 1 < < 8 , / / All locals ( used by RetC ) <nl> DontGuardStack1 = 1 < < 9 , / / Dont force a guard on behalf of stack1 input <nl> - IgnoreInnerType = 1 < < 10 , / / Instruction doesnt care about the inner types <nl> DontGuardAny = 1 < < 11 , / / Dont force a guard for any input <nl> This = 1 < < 12 , / / Input to CheckThis <nl> StackN = 1 < < 13 , / / pop N cells from stack ; n = imm [ 0 ] . u_IVA <nl>

Do not change NormalizedInstruction by getInputs ( )

facebook/hhvm

cb6d02b255da6b6f29edaca75e93d869810ad298

2019-03-05T07:22:39Z

mmm a / src / unittest / alt_test . cc <nl> ppp b / src / unittest / alt_test . cc <nl> TEST ( PageTest , OneWriteAcqWait ) { <nl> run_in_thread_pool ( run_OneWriteAcqWait , 4 ) ; <nl> } <nl> <nl> + void run_OneReadAcqWait ( ) { <nl> + mock_ser_t mock ; <nl> + page_cache_t page_cache ( mock . ser . get ( ) ) ; <nl> + page_txn_t txn ( & page_cache ) ; <nl> + current_page_acq_t acq ( & txn , alt_access_t : : read ) ; <nl> + page_acq_t page_acq ; <nl> + page_t * page = acq . current_page_for_read ( ) ; <nl> + page_acq . init ( page ) ; <nl> + ASSERT_TRUE ( page_acq . buf_ready_signal ( ) - > is_pulsed ( ) ) ; <nl> + const void * buf = page_acq . get_buf_read ( ) ; <nl> + ASSERT_TRUE ( buf ! = NULL ) ; <nl> + } <nl> + <nl> + TEST ( PageTest , OneReadAcqWait ) { <nl> + run_in_thread_pool ( run_OneReadAcqWait , 4 ) ; <nl> + } <nl> <nl> } / / namespace unittest <nl>

Added OneReadAcqWait .

rethinkdb/rethinkdb

c865c14572f14d773850e71db52e3536808dc0ac

2013-10-18T11:23:45Z

mmm a / xbmc / GUIInfoManager . cpp <nl> ppp b / xbmc / GUIInfoManager . cpp <nl> const infomap container_str [ ] = { { " property " , CONTAINER_PROPERTY } , <nl> / / / _string_ , <nl> / / / Todo <nl> / / / } <nl> + / / \ table_row3 { < b > ` ListItem . AddonOrigin ` < / b > , <nl> + / / / \ anchor ListItem_AddonOrigin <nl> + / / / _string_ , <nl> + / / / Name of the repository the add - on originates from . <nl> + / / / } <nl> / / / \ table_end <nl> / / / <nl> / / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> const infomap listitem_labels [ ] = { { " thumb " , LISTITEM_THUMB } , <nl> { " addoninstalldate " , LISTITEM_ADDON_INSTALL_DATE } , <nl> { " addonlastupdated " , LISTITEM_ADDON_LAST_UPDATED } , <nl> { " addonlastused " , LISTITEM_ADDON_LAST_USED } , <nl> - <nl> + { " addonorigin " , LISTITEM_ADDON_ORIGIN } , <nl> } ; <nl> <nl> / / / \ page modules__General__List_of_gui_access <nl> std : : string CGUIInfoManager : : GetItemLabel ( const CFileItem * item , int info , std : : <nl> if ( item - > HasAddonInfo ( ) & & item - > GetAddonInfo ( ) - > LastUsed ( ) . IsValid ( ) ) <nl> return item - > GetAddonInfo ( ) - > LastUsed ( ) . GetAsLocalizedDateTime ( ) ; <nl> break ; <nl> + case LISTITEM_ADDON_ORIGIN : <nl> + if ( item - > HasAddonInfo ( ) ) <nl> + { <nl> + if ( item - > GetAddonInfo ( ) - > Origin ( ) = = ORIGIN_SYSTEM ) <nl> + return g_localizeStrings . Get ( 24992 ) ; <nl> + AddonPtr origin ; <nl> + if ( CAddonMgr : : GetInstance ( ) . GetAddon ( item - > GetAddonInfo ( ) - > Origin ( ) , origin , ADDON_UNKNOWN , false ) ) <nl> + return origin - > Name ( ) ; <nl> + return g_localizeStrings . Get ( 13205 ) ; <nl> + } <nl> + break ; <nl> } <nl> <nl> return " " ; <nl> mmm a / xbmc / addons / Addon . h <nl> ppp b / xbmc / addons / Addon . h <nl> namespace ADDON <nl> typedef std : : vector < AddonPtr > VECADDONS ; <nl> typedef std : : vector < AddonPtr > : : iterator IVECADDONS ; <nl> <nl> + const char * const ORIGIN_SYSTEM = " b6a50484 - 93a0 - 4afb - a01c - 8d17e059feda " ; <nl> + <nl> / / utils <nl> std : : string TranslateType ( TYPE type , bool pretty = false ) ; <nl> std : : string GetIcon ( TYPE type ) ; <nl> class AddonProps <nl> CDateTime installDate ; <nl> CDateTime lastUpdated ; <nl> CDateTime lastUsed ; <nl> + std : : string origin ; <nl> } ; <nl> <nl> <nl> class CAddon : public IAddon <nl> CDateTime InstallDate ( ) const override { return m_props . installDate ; } <nl> CDateTime LastUpdated ( ) const override { return m_props . lastUpdated ; } <nl> CDateTime LastUsed ( ) const override { return m_props . lastUsed ; } <nl> + std : : string Origin ( ) const override { return m_props . origin ; } <nl> const InfoMap & ExtraInfo ( ) const override { return m_props . extrainfo ; } <nl> const ADDONDEPS & GetDeps ( ) const override { return m_props . dependencies ; } <nl> <nl> mmm a / xbmc / addons / AddonBuilder . h <nl> ppp b / xbmc / addons / AddonBuilder . h <nl> class CAddonBuilder <nl> void SetInstallDate ( CDateTime installDate ) { m_props . installDate = installDate ; } <nl> void SetLastUpdated ( CDateTime lastUpdated ) { m_props . lastUpdated = lastUpdated ; } <nl> void SetLastUsed ( CDateTime lastUsed ) { m_props . lastUsed = lastUsed ; } <nl> + void SetOrigin ( std : : string origin ) { m_props . origin = std : : move ( origin ) ; } <nl> <nl> const std : : string & GetId ( ) const { return m_props . id ; } <nl> const AddonVersion & GetVersion ( ) const { return m_props . version ; } <nl> mmm a / xbmc / addons / AddonDatabase . cpp <nl> ppp b / xbmc / addons / AddonDatabase . cpp <nl> int CAddonDatabase : : GetMinSchemaVersion ( ) const <nl> <nl> int CAddonDatabase : : GetSchemaVersion ( ) const <nl> { <nl> - return 24 ; <nl> + return 25 ; <nl> } <nl> <nl> void CAddonDatabase : : CreateTables ( ) <nl> void CAddonDatabase : : CreateTables ( ) <nl> <nl> CLog : : Log ( LOGINFO , " create installed table " ) ; <nl> m_pDS - > exec ( " CREATE TABLE installed ( id INTEGER PRIMARY KEY , addonID TEXT UNIQUE , " <nl> - " enabled BOOLEAN , installDate TEXT , lastUpdated TEXT , lastUsed TEXT ) \ n " ) ; <nl> + " enabled BOOLEAN , installDate TEXT , lastUpdated TEXT , lastUsed TEXT , " <nl> + " origin TEXT NOT NULL DEFAULT ' ' ) \ n " ) ; <nl> } <nl> <nl> void CAddonDatabase : : CreateAnalytics ( ) <nl> void CAddonDatabase : : UpdateTables ( int version ) <nl> m_pDS - > exec ( " DELETE FROM addonlinkrepo " ) ; <nl> m_pDS - > exec ( " DELETE FROM repo " ) ; <nl> } <nl> + if ( version < 25 ) <nl> + { <nl> + m_pDS - > exec ( " ALTER TABLE installed ADD origin TEXT NOT NULL DEFAULT ' ' " ) ; <nl> + } <nl> } <nl> <nl> void CAddonDatabase : : SyncInstalled ( const std : : set < std : : string > & ids , <nl> void CAddonDatabase : : SyncInstalled ( const std : : set < std : : string > & ids , <nl> } <nl> <nl> for ( const auto & id : system ) <nl> + { <nl> m_pDS - > exec ( PrepareSQL ( " UPDATE installed SET enabled = 1 WHERE addonID = ' % s ' " , id . c_str ( ) ) ) ; <nl> + / / Set origin * only * for addons that do not have one yet as it may have been changed by an update . <nl> + m_pDS - > exec ( PrepareSQL ( " UPDATE installed SET origin = ' % s ' WHERE addonID = ' % s ' AND origin = ' ' " , <nl> + ORIGIN_SYSTEM , id . c_str ( ) ) ) ; <nl> + } <nl> <nl> CommitTransaction ( ) ; <nl> } <nl> void CAddonDatabase : : GetInstalled ( std : : vector < CAddonBuilder > & addons ) <nl> it - > SetInstallDate ( CDateTime : : FromDBDateTime ( m_pDS - > fv ( 3 ) . get_asString ( ) ) ) ; <nl> it - > SetLastUpdated ( CDateTime : : FromDBDateTime ( m_pDS - > fv ( 4 ) . get_asString ( ) ) ) ; <nl> it - > SetLastUsed ( CDateTime : : FromDBDateTime ( m_pDS - > fv ( 5 ) . get_asString ( ) ) ) ; <nl> + it - > SetOrigin ( m_pDS - > fv ( 6 ) . get_asString ( ) ) ; <nl> m_pDS - > next ( ) ; <nl> } <nl> m_pDS - > close ( ) ; <nl> bool CAddonDatabase : : SetLastUpdated ( const std : : string & addonId , const CDateTime & <nl> return false ; <nl> } <nl> <nl> + bool CAddonDatabase : : SetOrigin ( const std : : string & addonId , const std : : string & origin ) <nl> + { <nl> + try <nl> + { <nl> + if ( NULL = = m_pDB . get ( ) ) return false ; <nl> + if ( NULL = = m_pDS . get ( ) ) return false ; <nl> + <nl> + m_pDS - > exec ( PrepareSQL ( " UPDATE installed SET origin = ' % s ' WHERE addonID = ' % s ' " , origin . c_str ( ) , addonId . c_str ( ) ) ) ; <nl> + return true ; <nl> + } <nl> + catch ( . . . ) <nl> + { <nl> + CLog : : Log ( LOGERROR , " % s failed on addon ' % s ' " , __FUNCTION__ , addonId . c_str ( ) ) ; <nl> + } <nl> + return false ; <nl> + } <nl> + <nl> bool CAddonDatabase : : SetLastUsed ( const std : : string & addonId , const CDateTime & dateTime ) <nl> { <nl> try <nl> mmm a / xbmc / addons / AddonDatabase . h <nl> ppp b / xbmc / addons / AddonDatabase . h <nl> class CAddonDatabase : public CDatabase <nl> void GetInstalled ( std : : vector < ADDON : : CAddonBuilder > & addons ) ; <nl> <nl> bool SetLastUpdated ( const std : : string & addonId , const CDateTime & dateTime ) ; <nl> + bool SetOrigin ( const std : : string & addonId , const std : : string & origin ) ; <nl> bool SetLastUsed ( const std : : string & addonId , const CDateTime & dateTime ) ; <nl> <nl> <nl> mmm a / xbmc / addons / AddonInstaller . cpp <nl> ppp b / xbmc / addons / AddonInstaller . cpp <nl> bool CAddonInstallJob : : DoWork ( ) <nl> / / Enable it if it was previously disabled <nl> CAddonMgr : : GetInstance ( ) . EnableAddon ( m_addon - > ID ( ) ) ; <nl> <nl> - if ( m_update ) <nl> { <nl> - auto & addon = m_addon ; <nl> - auto time = CDateTime : : GetCurrentDateTime ( ) ; <nl> - CJobManager : : GetInstance ( ) . Submit ( [ addon , time ] ( ) { <nl> - CAddonDatabase db ; <nl> - if ( db . Open ( ) ) <nl> - db . SetLastUpdated ( addon - > ID ( ) , time ) ; <nl> - } ) ; <nl> + CAddonDatabase database ; <nl> + database . Open ( ) ; <nl> + database . SetOrigin ( m_addon - > ID ( ) , m_repo ? m_repo - > ID ( ) : " " ) ; <nl> + if ( m_update ) <nl> + database . SetLastUpdated ( m_addon - > ID ( ) , CDateTime : : GetCurrentDateTime ( ) ) ; <nl> } <nl> <nl> / / notify any observers that add - ons have changed <nl> mmm a / xbmc / addons / GUIDialogAddonInfo . cpp <nl> ppp b / xbmc / addons / GUIDialogAddonInfo . cpp <nl> int CGUIDialogAddonInfo : : AskForVersion ( std : : vector < std : : pair < AddonVersion , std : : <nl> for ( const auto & versionInfo : versions ) <nl> { <nl> CFileItem item ( StringUtils : : Format ( g_localizeStrings . Get ( 21339 ) . c_str ( ) , versionInfo . first . asString ( ) . c_str ( ) ) ) ; <nl> - if ( m_localAddon & & m_localAddon - > Version ( ) = = versionInfo . first ) <nl> + if ( m_localAddon & & m_localAddon - > Version ( ) = = versionInfo . first <nl> + & & m_item - > GetAddonInfo ( ) - > Origin ( ) = = versionInfo . second ) <nl> item . Select ( true ) ; <nl> <nl> AddonPtr repo ; <nl> mmm a / xbmc / addons / IAddon . h <nl> ppp b / xbmc / addons / IAddon . h <nl> namespace ADDON <nl> virtual CDateTime InstallDate ( ) const = 0 ; <nl> virtual CDateTime LastUpdated ( ) const = 0 ; <nl> virtual CDateTime LastUsed ( ) const = 0 ; <nl> + virtual std : : string Origin ( ) const = 0 ; <nl> virtual const InfoMap & ExtraInfo ( ) const = 0 ; <nl> virtual bool HasSettings ( ) = 0 ; <nl> virtual void SaveSettings ( ) = 0 ; <nl> mmm a / xbmc / guiinfo / GUIInfoLabels . h <nl> ppp b / xbmc / guiinfo / GUIInfoLabels . h <nl> <nl> # define LISTITEM_ADDON_LAST_USED ( LISTITEM_START + 174 ) <nl> # define LISTITEM_STATUS ( LISTITEM_START + 175 ) <nl> # define LISTITEM_ENDTIME_RESUME ( LISTITEM_START + 176 ) <nl> + # define LISTITEM_ADDON_ORIGIN ( LISTITEM_START + 177 ) <nl> <nl> # define LISTITEM_PROPERTY_START ( LISTITEM_START + 200 ) <nl> # define LISTITEM_PROPERTY_END ( LISTITEM_PROPERTY_START + 1300 ) <nl>

[ addons ] add origin tracking

xbmc/xbmc

bcba27f26a8447388dd7cf03ee5f0fd74111bfad

2016-06-05T11:58:40Z

new file mode 100644 <nl> index 000000000 . . 787c246f4 <nl> mmm / dev / null <nl> ppp b / projects / SelfTest / Baselines / failingResults . txt <nl> <nl> + [ Started testing ] <nl> + [ Started group : ' . / failing * ' ] <nl> + <nl> + [ Running : . / failing / TestClass / failingCase ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ClassTests . cpp : 28 : s = = " world " failed for : " hello " = = " world " <nl> + [ Finished : ' . / failing / TestClass / failingCase ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / Fixture / failingCase ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ClassTests . cpp : 55 : m_a = = 2 failed for : 1 = = 2 <nl> + [ Finished : ' . / failing / Fixture / failingCase ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / conditions / equality ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 71 : data . int_seven = = 6 failed for : 7 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 72 : data . int_seven = = 8 failed for : 7 = = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 73 : data . int_seven = = 0 failed for : 7 = = 0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 74 : data . float_nine_point_one = = Approx ( 9 . 11f ) failed for : 9 . 1 = = Approx ( 9 . 11 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 75 : data . float_nine_point_one = = Approx ( 9 . 0f ) failed for : 9 . 1 = = Approx ( 9 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 76 : data . float_nine_point_one = = Approx ( 1 ) failed for : 9 . 1 = = Approx ( 1 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 77 : data . float_nine_point_one = = Approx ( 0 ) failed for : 9 . 1 = = Approx ( 0 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 78 : data . double_pi = = Approx ( 3 . 1415 ) failed for : 3 . 14159 = = Approx ( 3 . 1415 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 79 : data . str_hello = = " goodbye " failed for : " hello " = = " goodbye " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 80 : data . str_hello = = " hell " failed for : " hello " = = " hell " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 81 : data . str_hello = = " hello1 " failed for : " hello " = = " hello1 " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 82 : data . str_hello . size ( ) = = 6 failed for : 5 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 85 : x = = Approx ( 1 . 301 ) failed for : 1 . 3 = = Approx ( 1 . 301 ) <nl> + [ Finished : ' . / failing / conditions / equality ' 1 test case failed ( All 13 assertions failed ) ] <nl> + <nl> + [ Running : . / failing / conditions / inequality ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 111 : data . int_seven ! = 7 failed for : 7 ! = 7 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 112 : data . float_nine_point_one ! = Approx ( 9 . 1f ) failed for : 9 . 1 ! = Approx ( 9 . 1 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 113 : data . double_pi ! = Approx ( 3 . 1415926535 ) failed for : 3 . 14159 ! = Approx ( 3 . 14159 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 114 : data . str_hello ! = " hello " failed for : " hello " ! = " hello " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 115 : data . str_hello . size ( ) ! = 5 failed for : 5 ! = 5 <nl> + [ Finished : ' . / failing / conditions / inequality ' 1 test case failed ( All 5 assertions failed ) ] <nl> + <nl> + [ Running : . / failing / conditions / ordered ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 152 : data . int_seven > 7 failed for : 7 > 7 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 153 : data . int_seven < 7 failed for : 7 < 7 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 154 : data . int_seven > 8 failed for : 7 > 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 155 : data . int_seven < 6 failed for : 7 < 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 156 : data . int_seven < 0 failed for : 7 < 0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 157 : data . int_seven < - 1 failed for : 7 < - 1 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 159 : data . int_seven > = 8 failed for : 7 > = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 160 : data . int_seven < = 6 failed for : 7 < = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 162 : data . float_nine_point_one < 9 failed for : 9 . 1 < 9 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 163 : data . float_nine_point_one > 10 failed for : 9 . 1 > 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 164 : data . float_nine_point_one > 9 . 2 failed for : 9 . 1 > 9 . 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 166 : data . str_hello > " hello " failed for : " hello " > " hello " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 167 : data . str_hello < " hello " failed for : " hello " < " hello " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 168 : data . str_hello > " hellp " failed for : " hello " > " hellp " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 169 : data . str_hello > " z " failed for : " hello " > " z " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 170 : data . str_hello < " hellm " failed for : " hello " < " hellm " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 171 : data . str_hello < " a " failed for : " hello " < " a " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 173 : data . str_hello > = " z " failed for : " hello " > = " z " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 174 : data . str_hello < = " a " failed for : " hello " < = " a " <nl> + [ Finished : ' . / failing / conditions / ordered ' 1 test case failed ( All 19 assertions failed ) ] <nl> + <nl> + [ Running : . / failing / conditions / not ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 320 : false ! = false failed <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 321 : true ! = true failed <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 322 : ! true failed for : false <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 323 : ! true failed <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 325 : ! trueValue failed for : false <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 326 : ! trueValue failed for : ! true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 328 : ! ( 1 = = 1 ) failed for : false <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 329 : ! 1 = = 1 failed for : ! ( 1 = = 1 ) <nl> + [ Finished : ' . / failing / conditions / not ' 1 test case failed ( All 8 assertions failed ) ] <nl> + <nl> + [ Running : . / failing / exceptions / explicit ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 47 : thisThrows ( ) failed with unexpected exception with message : ' expected exception ' <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 48 : thisDoesntThrow ( ) failed because no exception was thrown where one was expected <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 49 : thisThrows ( ) failed with unexpected exception with message : ' expected exception ' <nl> + [ Finished : ' . / failing / exceptions / explicit ' 1 test case failed ( All 3 assertions failed ) ] <nl> + <nl> + [ Running : . / failing / exceptions / implicit ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 52 : Unexpected exception with message : ' unexpected exception ' <nl> + [ Finished : ' . / failing / exceptions / implicit ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / exceptions / custom ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 95 : Unexpected exception with message : ' custom exception ' <nl> + [ Finished : ' . / failing / exceptions / custom ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / exceptions / custom / nothrow ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 102 : throw CustomException ( " unexpected custom exception " ) failed with unexpected exception with message : ' unexpected custom exception ' <nl> + [ Finished : ' . / failing / exceptions / custom / nothrow ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / exceptions / custom / throw ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 107 : throw CustomException ( " custom exception - not std " ) failed with unexpected exception with message : ' custom exception - not std ' <nl> + [ Finished : ' . / failing / exceptions / custom / throw ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / exceptions / custom / double ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 111 : Unexpected exception with message : ' 3 . 14 ' <nl> + [ Finished : ' . / failing / exceptions / custom / double ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / exceptions / in - section ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 125 : Unexpected exception with message : ' Exception from section ' <nl> + [ Finished : ' . / failing / exceptions / in - section ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / message / info / 1 ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MessageTests . cpp : 19 : [ info : this message should be logged ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MessageTests . cpp : 20 : [ info : so should this ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MessageTests . cpp : 22 : a = = 1 failed for : 2 = = 1 <nl> + [ Finished : ' . / failing / message / info / 1 ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / message / fail ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MessageTests . cpp : 46 : failed with message : ' This is a failure ' <nl> + [ Finished : ' . / failing / message / fail ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / message / sections ] <nl> + <nl> + [ Started section : ' one ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MessageTests . cpp : 53 : failed with message : ' Message from section one ' <nl> + [ End of section : ' one ' 1 assertion failed ] <nl> + <nl> + [ Started section : ' two ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MessageTests . cpp : 58 : failed with message : ' Message from section two ' <nl> + [ End of section : ' two ' 1 assertion failed ] <nl> + <nl> + [ Finished : ' . / failing / message / sections ' 1 test case failed ( All 2 assertions failed ) ] <nl> + <nl> + [ Running : . / failing / info ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 169 : [ info : hi ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 171 : [ info : i : = 7 ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 172 : false failed <nl> + [ Finished : ' . / failing / info ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / checkedif ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 177 : flag failed for : false <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 190 : testCheckedIf ( false ) failed for : false <nl> + [ Finished : ' . / failing / checkedif ' 1 test case failed ( All 2 assertions failed ) ] <nl> + <nl> + [ Running : . / failing / checkedelse ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 195 : flag failed for : false <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 208 : testCheckedElse ( false ) failed for : false <nl> + [ Finished : ' . / failing / checkedelse ' 1 test case failed ( All 2 assertions failed ) ] <nl> + <nl> + [ Running : . / failing / matchers / Contains ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 255 : testStringForMatching ( ) Contains ( " not there " ) failed for : <nl> + " this string contains ' abc ' as a substring " contains : " not there " <nl> + [ Finished : ' . / failing / matchers / Contains ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / matchers / StartsWith ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 260 : testStringForMatching ( ) StartsWith ( " string " ) failed for : <nl> + " this string contains ' abc ' as a substring " starts with : " string " <nl> + [ Finished : ' . / failing / matchers / StartsWith ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / matchers / EndsWith ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 265 : testStringForMatching ( ) EndsWith ( " this " ) failed for : <nl> + " this string contains ' abc ' as a substring " ends with : " this " <nl> + [ Finished : ' . / failing / matchers / EndsWith ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / matchers / Equals ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 270 : testStringForMatching ( ) Equals ( " something else " ) failed for : <nl> + " this string contains ' abc ' as a substring " equals : " something else " <nl> + [ Finished : ' . / failing / matchers / Equals ' 1 test case failed ( 1 assertion failed ) ] <nl> + <nl> + [ Running : . / failing / Tricky / non streamable type ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 95 : & o1 = = & o2 failed for : 0x7fff522b88b8 = = 0x7fff522b88b0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 96 : o1 = = o2 failed for : { ? } = = { ? } <nl> + [ Finished : ' . / failing / Tricky / non streamable type ' 1 test case failed ( All 2 assertions failed ) ] <nl> + <nl> + [ Running : . / failing / string literals ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 106 : std : : string ( " first " ) = = " second " failed for : " first " = = " second " <nl> + [ Finished : ' . / failing / string literals ' 1 test case failed ( 1 assertion failed ) ] <nl> + [ End of group : ' . / failing * ' . All 25 test cases failed ( All 72 assertions failed ) ] <nl> + <nl> + <nl> + [ Testing completed . All 25 test cases failed ( All 72 assertions failed ) ] <nl> + <nl> new file mode 100644 <nl> index 000000000 . . 1c4e8fef6 <nl> mmm / dev / null <nl> ppp b / projects / SelfTest / Baselines / successfulResults . txt <nl> <nl> + [ Started testing ] <nl> + [ Started group : ' . / succeeding * ' ] <nl> + <nl> + [ Running : . / succeeding / Approx / simple ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 20 : d = = Approx ( 1 . 23 ) succeeded for : 1 . 23 = = Approx ( 1 . 23 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 21 : d ! = Approx ( 1 . 22 ) succeeded for : 1 . 23 ! = Approx ( 1 . 22 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 22 : d ! = Approx ( 1 . 24 ) succeeded for : 1 . 23 ! = Approx ( 1 . 24 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 24 : Approx ( d ) = = 1 . 23 succeeded for : Approx ( 1 . 23 ) = = 1 . 23 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 25 : Approx ( d ) ! = 1 . 22 succeeded for : Approx ( 1 . 23 ) ! = 1 . 22 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 26 : Approx ( d ) ! = 1 . 24 succeeded for : Approx ( 1 . 23 ) ! = 1 . 24 <nl> + [ Finished : ' . / succeeding / Approx / simple ' All tests passed ( 6 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / Approx / epsilon ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 38 : d ! = Approx ( 1 . 231 ) succeeded for : 1 . 23 ! = Approx ( 1 . 231 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 39 : d = = Approx ( 1 . 231 ) . epsilon ( 0 . 1 ) succeeded for : 1 . 23 = = Approx ( 1 . 231 ) <nl> + [ Finished : ' . / succeeding / Approx / epsilon ' All tests passed ( 2 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / Approx / float ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 49 : 1 . 23f = = Approx ( 1 . 23f ) succeeded for : 1 . 23 = = Approx ( 1 . 23 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 50 : 0 . 0f = = Approx ( 0 . 0f ) succeeded for : 0 = = Approx ( 0 ) <nl> + [ Finished : ' . / succeeding / Approx / float ' All tests passed ( 2 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / Approx / int ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 60 : 1 = = Approx ( 1 ) succeeded <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 61 : 0 = = Approx ( 0 ) succeeded <nl> + [ Finished : ' . / succeeding / Approx / int ' All tests passed ( 2 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / Approx / mixed ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 75 : 1 . 0f = = Approx ( 1 ) succeeded for : 1 = = Approx ( 1 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 76 : 0 = = Approx ( dZero ) succeeded for : 0 = = Approx ( 0 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 77 : 0 = = Approx ( dSmall ) . epsilon ( 0 . 001 ) succeeded for : 0 = = Approx ( 1e - 05 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 78 : 1 . 234f = = Approx ( dMedium ) succeeded for : 1 . 234 = = Approx ( 1 . 234 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 79 : dMedium = = Approx ( 1 . 234f ) succeeded for : 1 . 234 = = Approx ( 1 . 234 ) <nl> + [ Finished : ' . / succeeding / Approx / mixed ' All tests passed ( 5 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / Approx / custom ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 93 : d = = approx ( 1 . 23 ) succeeded for : 1 . 23 = = Approx ( 1 . 23 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 94 : d = = approx ( 1 . 22 ) succeeded for : 1 . 23 = = Approx ( 1 . 22 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 95 : d = = approx ( 1 . 24 ) succeeded for : 1 . 23 = = Approx ( 1 . 24 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 96 : d ! = approx ( 1 . 25 ) succeeded for : 1 . 23 ! = Approx ( 1 . 25 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 98 : approx ( d ) = = 1 . 23 succeeded for : Approx ( 1 . 23 ) = = 1 . 23 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 99 : approx ( d ) = = 1 . 22 succeeded for : Approx ( 1 . 23 ) = = 1 . 22 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 100 : approx ( d ) = = 1 . 24 succeeded for : Approx ( 1 . 23 ) = = 1 . 24 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ApproxTests . cpp : 101 : approx ( d ) ! = 1 . 25 succeeded for : Approx ( 1 . 23 ) ! = 1 . 25 <nl> + [ Finished : ' . / succeeding / Approx / custom ' All tests passed ( 8 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / TestClass / succeedingCase ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ClassTests . cpp : 24 : s = = " hello " succeeded for : " hello " = = " hello " <nl> + [ Finished : ' . / succeeding / TestClass / succeedingCase ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / Fixture / succeedingCase ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ClassTests . cpp : 47 : m_a = = 1 succeeded for : 1 = = 1 <nl> + [ Finished : ' . / succeeding / Fixture / succeedingCase ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / conditions / equality ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 55 : data . int_seven = = 7 succeeded for : 7 = = 7 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 56 : data . float_nine_point_one = = Approx ( 9 . 1f ) succeeded for : 9 . 1 = = Approx ( 9 . 1 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 57 : data . double_pi = = Approx ( 3 . 1415926535 ) succeeded for : 3 . 14159 = = Approx ( 3 . 14159 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 58 : data . str_hello = = " hello " succeeded for : " hello " = = " hello " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 59 : " hello " = = data . str_hello succeeded for : " hello " = = " hello " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 60 : data . str_hello . size ( ) = = 5 succeeded for : 5 = = 5 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 63 : x = = Approx ( 1 . 3 ) succeeded for : 1 . 3 = = Approx ( 1 . 3 ) <nl> + [ Finished : ' . / succeeding / conditions / equality ' All tests passed ( 7 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / conditions / inequality ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 93 : data . int_seven ! = 6 succeeded for : 7 ! = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 94 : data . int_seven ! = 8 succeeded for : 7 ! = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 95 : data . float_nine_point_one ! = Approx ( 9 . 11f ) succeeded for : 9 . 1 ! = Approx ( 9 . 11 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 96 : data . float_nine_point_one ! = Approx ( 9 . 0f ) succeeded for : 9 . 1 ! = Approx ( 9 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 97 : data . float_nine_point_one ! = Approx ( 1 ) succeeded for : 9 . 1 ! = Approx ( 1 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 98 : data . float_nine_point_one ! = Approx ( 0 ) succeeded for : 9 . 1 ! = Approx ( 0 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 99 : data . double_pi ! = Approx ( 3 . 1415 ) succeeded for : 3 . 14159 ! = Approx ( 3 . 1415 ) <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 100 : data . str_hello ! = " goodbye " succeeded for : " hello " ! = " goodbye " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 101 : data . str_hello ! = " hell " succeeded for : " hello " ! = " hell " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 102 : data . str_hello ! = " hello1 " succeeded for : " hello " ! = " hello1 " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 103 : data . str_hello . size ( ) ! = 6 succeeded for : 5 ! = 6 <nl> + [ Finished : ' . / succeeding / conditions / inequality ' All tests passed ( 11 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / conditions / ordered ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 124 : data . int_seven < 8 succeeded for : 7 < 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 125 : data . int_seven > 6 succeeded for : 7 > 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 126 : data . int_seven > 0 succeeded for : 7 > 0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 127 : data . int_seven > - 1 succeeded for : 7 > - 1 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 129 : data . int_seven > = 7 succeeded for : 7 > = 7 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 130 : data . int_seven > = 6 succeeded for : 7 > = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 131 : data . int_seven < = 7 succeeded for : 7 < = 7 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 132 : data . int_seven < = 8 succeeded for : 7 < = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 134 : data . float_nine_point_one > 9 succeeded for : 9 . 1 > 9 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 135 : data . float_nine_point_one < 10 succeeded for : 9 . 1 < 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 136 : data . float_nine_point_one < 9 . 2 succeeded for : 9 . 1 < 9 . 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 138 : data . str_hello < = " hello " succeeded for : " hello " < = " hello " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 139 : data . str_hello > = " hello " succeeded for : " hello " > = " hello " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 141 : data . str_hello < " hellp " succeeded for : " hello " < " hellp " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 142 : data . str_hello < " zebra " succeeded for : " hello " < " zebra " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 143 : data . str_hello > " hellm " succeeded for : " hello " > " hellm " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 144 : data . str_hello > " a " succeeded for : " hello " > " a " <nl> + [ Finished : ' . / succeeding / conditions / ordered ' All tests passed ( 17 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / conditions / int literals ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 188 : i = = 1 succeeded for : 1 = = 1 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 189 : ui = = 2 succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 190 : l = = 3 succeeded for : 3 = = 3 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 191 : ul = = 4 succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 192 : c = = 5 succeeded for : 5 = = 5 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 193 : uc = = 6 succeeded for :  = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 195 : 1 = = i succeeded for : 1 = = 1 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 196 : 2 = = ui succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 197 : 3 = = l succeeded for : 3 = = 3 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 198 : 4 = = ul succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 199 : 5 = = c succeeded for : 5 = = 5 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 200 : 6 = = uc succeeded for : 6 = =  <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 202 : ( std : : numeric_limits < unsigned long > : : max ) ( ) > ul succeeded for : 0xffffffffffffffff > 4 <nl> + [ Finished : ' . / succeeding / conditions / int literals ' All tests passed ( 13 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / conditions / / long_to_unsigned_x ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 223 : long_var = = unsigned_char_var succeeded for : 1 = =
<nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 224 : long_var = = unsigned_short_var succeeded for : 1 = = 1 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 225 : long_var = = unsigned_int_var succeeded for : 1 = = 1 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 226 : long_var = = unsigned_long_var succeeded for : 1 = = 1 <nl> + [ Finished : ' . / succeeding / conditions / / long_to_unsigned_x ' All tests passed ( 4 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / conditions / negative ints ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 232 : ( - 1 > 2u ) succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 233 : - 1 > 2u succeeded for : - 1 > 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 235 : ( 2u < - 1 ) succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 236 : 2u < - 1 succeeded for : 2 < - 1 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 239 : ( minInt > 2u ) succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 240 : minInt > 2u succeeded for : - 2147483648 > 2 <nl> + [ Finished : ' . / succeeding / conditions / negative ints ' All tests passed ( 6 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / conditions / computed ints ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 255 : 54 = = 6 * 9 succeeded for : 54 = = 54 <nl> + [ Finished : ' . / succeeding / conditions / computed ints ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / conditions / ptr ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 271 : p = = __null succeeded for : __null = = 0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 272 : p = = pNULL succeeded for : __null = = __null <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 277 : p ! = __null succeeded for : 0x7fff556be0f8 ! = 0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 280 : cp ! = __null succeeded for : 0x7fff556be0f8 ! = 0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 283 : cpc ! = __null succeeded for : 0x7fff556be0f8 ! = 0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 285 : returnsNull ( ) = = __null succeeded for : { null string } = = 0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 286 : returnsConstNull ( ) = = __null succeeded for : { null string } = = 0 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 288 : __null ! = p succeeded for : 0 ! = 0x7fff556be0f8 <nl> + [ Finished : ' . / succeeding / conditions / ptr ' All tests passed ( 8 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / conditions / not ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 303 : false = = false succeeded <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 304 : true = = true succeeded <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 305 : ! false succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 306 : ! false succeeded <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 308 : ! falseValue succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 309 : ! falseValue succeeded for : ! false <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 311 : ! ( 1 = = 2 ) succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ConditionTests . cpp : 312 : ! 1 = = 2 succeeded for : ! ( 1 = = 2 ) <nl> + [ Finished : ' . / succeeding / conditions / not ' All tests passed ( 8 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / exceptions / explicit ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 39 : thisThrows ( ) succeeded <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 40 : thisDoesntThrow ( ) succeeded <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 41 : thisThrows ( ) succeeded <nl> + [ Finished : ' . / succeeding / exceptions / explicit ' All tests passed ( 3 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / exceptions / error messages ] <nl> + <nl> + [ Started section : ' custom , unexpected ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 145 : runner . getLog ( ) Contains ( " custom exception " ) succeeded for : <nl> + " \ [ g ] . / failing / exceptions / custom <nl> + \ [ tc ] . / failing / exceptions / custom <nl> + ThrewException ' custom exception ' / [ tc ] . / failing / exceptions / custom <nl> + / [ g ] . / failing / exceptions / custom <nl> + " contains : " custom exception " <nl> + [ End of section : ' custom , unexpected ' 1 assertion passed ] <nl> + <nl> + [ Started section : ' in section ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 153 : runner . getLog ( ) Contains ( " Exception from section " ) succeeded for : <nl> + " \ [ g ] . / failing / exceptions / in - section <nl> + \ [ tc ] . / failing / exceptions / in - section <nl> + \ [ s ] the section <nl> + \ [ s ] the section2 <nl> + / [ s ] the section2 <nl> + / [ s ] the section <nl> + ThrewException ' Exception from section ' \ [ s ] the section <nl> + / [ s ] the section <nl> + / [ tc ] . / failing / exceptions / in - section <nl> + / [ g ] . / failing / exceptions / in - section <nl> + " contains : " Exception from section " <nl> + [ End of section : ' in section ' 1 assertion passed ] <nl> + <nl> + [ Finished : ' . / succeeding / exceptions / error messages ' All tests passed ( 2 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / exceptions / notimplemented ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / ExceptionTests . cpp : 165 : thisFunctionNotImplemented ( 7 ) succeeded <nl> + [ Finished : ' . / succeeding / exceptions / notimplemented ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / generators / 1 ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 200 = = 200 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 200 = = 200 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 6 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 200 = = 200 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 8 = = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 200 = = 200 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 10 = = 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 200 = = 200 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 30 = = 30 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 200 = = 200 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 40 = = 40 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 200 = = 200 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 42 = = 42 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 200 = = 200 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 72 = = 72 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 200 = = 200 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 202 = = 202 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 202 = = 202 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 6 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 202 = = 202 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 8 = = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 202 = = 202 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 10 = = 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 202 = = 202 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 30 = = 30 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 202 = = 202 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 40 = = 40 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 202 = = 202 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 42 = = 42 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 202 = = 202 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 72 = = 72 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 202 = = 202 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 204 = = 204 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 204 = = 204 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 6 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 204 = = 204 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 8 = = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 204 = = 204 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 10 = = 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 204 = = 204 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 30 = = 30 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 204 = = 204 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 40 = = 40 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 204 = = 204 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 42 = = 42 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 204 = = 204 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 72 = = 72 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 204 = = 204 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 206 = = 206 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 206 = = 206 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 6 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 206 = = 206 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 8 = = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 206 = = 206 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 10 = = 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 206 = = 206 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 30 = = 30 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 206 = = 206 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 40 = = 40 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 206 = = 206 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 42 = = 42 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 206 = = 206 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 72 = = 72 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 206 = = 206 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 208 = = 208 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 208 = = 208 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 6 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 208 = = 208 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 8 = = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 208 = = 208 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 10 = = 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 208 = = 208 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 30 = = 30 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 208 = = 208 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 40 = = 40 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 208 = = 208 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 42 = = 42 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 208 = = 208 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 72 = = 72 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 208 = = 208 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 210 = = 210 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 210 = = 210 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 6 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 210 = = 210 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 8 = = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 210 = = 210 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 10 = = 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 210 = = 210 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 30 = = 30 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 210 = = 210 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 40 = = 40 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 210 = = 210 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 42 = = 42 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 210 = = 210 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 72 = = 72 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 210 = = 210 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 212 = = 212 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 212 = = 212 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 6 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 212 = = 212 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 8 = = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 212 = = 212 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 10 = = 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 212 = = 212 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 30 = = 30 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 212 = = 212 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 40 = = 40 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 212 = = 212 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 42 = = 42 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 212 = = 212 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 72 = = 72 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 212 = = 212 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 2 = = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 214 = = 214 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 4 = = 4 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 214 = = 214 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 6 = = 6 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 214 = = 214 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 8 = = 8 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 214 = = 214 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 10 = = 10 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 214 = = 214 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 30 = = 30 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 214 = = 214 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 40 = = 40 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 214 = = 214 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 42 = = 42 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 214 = = 214 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 26 : multiply ( i , 2 ) = = i * 2 succeeded for : 72 = = 72 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / GeneratorTests . cpp : 27 : multiply ( j , 2 ) = = j * 2 succeeded for : 214 = = 214 <nl> + [ Finished : ' . / succeeding / generators / 1 ' All tests passed ( 144 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / message ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MessageTests . cpp : 14 : [ warning : this is a warning ] <nl> + [ Finished : ' . / succeeding / message ' No tests ran ] <nl> + <nl> + [ Running : . / succeeding / Misc / Sections ] <nl> + [ Started section : ' s1 ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 25 : a ! = b succeeded for : 1 ! = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 26 : b ! = a succeeded for : 2 ! = 1 <nl> + [ End of section : ' s1 ' All 2 assertions passed ] <nl> + <nl> + [ Started section : ' s2 ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 31 : a ! = b succeeded for : 1 ! = 2 <nl> + [ End of section : ' s2 ' 1 assertion passed ] <nl> + <nl> + [ Finished : ' . / succeeding / Misc / Sections ' All tests passed ( 3 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / Misc / Sections / nested ] <nl> + [ Started section : ' s1 ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 42 : a ! = b succeeded for : 1 ! = 2 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 43 : b ! = a succeeded for : 2 ! = 1 <nl> + [ Started section : ' s2 ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 47 : a ! = b succeeded for : 1 ! = 2 <nl> + [ End of section : ' s2 ' 1 assertion passed ] <nl> + <nl> + [ End of section : ' s1 ' All 3 assertions passed ] <nl> + <nl> + [ Finished : ' . / succeeding / Misc / Sections / nested ' All tests passed ( 3 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / Misc / null strings ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 163 : makeString ( false ) ! = static_cast < char * > ( __null ) succeeded for : " valid string " ! = { null string } <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 164 : makeString ( true ) = = static_cast < char * > ( __null ) succeeded for : { null string } = = { null string } <nl> + [ Finished : ' . / succeeding / Misc / null strings ' All tests passed ( 2 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / checkedif ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 177 : flag succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 185 : testCheckedIf ( true ) succeeded for : true <nl> + [ Finished : ' . / succeeding / checkedif ' All tests passed ( 2 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / checkedelse ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 195 : flag succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 203 : testCheckedElse ( true ) succeeded for : true <nl> + [ Finished : ' . / succeeding / checkedelse ' All tests passed ( 2 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / atomic if ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 236 : x = = 0 succeeded for : 0 = = 0 <nl> + [ Finished : ' . / succeeding / atomic if ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / matchers ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 246 : testStringForMatching ( ) Contains ( " string " ) succeeded for : <nl> + " this string contains ' abc ' as a substring " contains : " string " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 247 : testStringForMatching ( ) Contains ( " abc " ) succeeded for : <nl> + " this string contains ' abc ' as a substring " contains : " abc " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 249 : testStringForMatching ( ) StartsWith ( " this " ) succeeded for : <nl> + " this string contains ' abc ' as a substring " starts with : " this " <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 250 : testStringForMatching ( ) EndsWith ( " substring " ) succeeded for : <nl> + " this string contains ' abc ' as a substring " ends with : " substring " <nl> + [ Finished : ' . / succeeding / matchers ' All tests passed ( 4 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / matchers / Equals ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / MiscTests . cpp : 285 : testStringForMatching ( ) Equals ( " this string contains ' abc ' as a substring " ) succeeded for : <nl> + " this string contains ' abc ' as a substring " equals : " this string contains ' abc ' as a substring " <nl> + [ Finished : ' . / succeeding / matchers / Equals ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / Tricky / std : : pair ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 37 : ( std : : pair < int , int > ( 1 , 2 ) ) = = aNicePair succeeded for : <nl> + <nl> + std : : pair ( 1 , 2 ) <nl> + = = <nl> + std : : pair ( 1 , 2 ) <nl> + [ Finished : ' . / succeeding / Tricky / std : : pair ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / side - effects ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 119 : i + + = = 7 succeeded for : 7 = = 7 <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 120 : i + + = = 8 succeeded for : 8 = = 8 <nl> + [ Finished : ' . / succeeding / side - effects ' All tests passed ( 2 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / koenig ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 186 : 0xc0000000 = = o succeeded for : 0xc0000000 = = { ? } <nl> + [ Finished : ' . / succeeding / koenig ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / non - const = = ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 212 : t = = 1u succeeded for : { ? } = = 1 <nl> + [ Finished : ' . / succeeding / non - const = = ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / enum / bits ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 224 : 0xc0000000 = = bit30and31 succeeded for : 0xc0000000 = = 3221225472 <nl> + [ Finished : ' . / succeeding / enum / bits ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / boolean member ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 239 : obj . prop ! = __null succeeded for : 0x7fff556be8e0 ! = 0 <nl> + [ Finished : ' . / succeeding / boolean member ' All tests passed ( 1 assertion in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / unimplemented static bool ] <nl> + [ Started section : ' compare to true ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 259 : is_true < true > : : value = = true succeeded for : true = = true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 260 : true = = is_true < true > : : value succeeded for : true = = true <nl> + [ End of section : ' compare to true ' All 2 assertions passed ] <nl> + <nl> + [ Started section : ' compare to false ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 264 : is_true < false > : : value = = false succeeded for : false = = false <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 265 : false = = is_true < false > : : value succeeded for : false = = false <nl> + [ End of section : ' compare to false ' All 2 assertions passed ] <nl> + <nl> + [ Started section : ' negation ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 270 : ! is_true < false > : : value succeeded for : true <nl> + [ End of section : ' negation ' 1 assertion passed ] <nl> + <nl> + [ Started section : ' double negation ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 275 : ! ! is_true < true > : : value succeeded for : true <nl> + [ End of section : ' double negation ' 1 assertion passed ] <nl> + <nl> + [ Started section : ' direct ' ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 280 : is_true < true > : : value succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 281 : ! is_true < false > : : value succeeded for : ! false <nl> + [ End of section : ' direct ' All 2 assertions passed ] <nl> + <nl> + [ Finished : ' . / succeeding / unimplemented static bool ' All tests passed ( 8 assertions in 1 test case ) ] <nl> + <nl> + [ Running : . / succeeding / SafeBool ] <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 313 : True succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 314 : ! False succeeded for : true <nl> + / Users / Phil / Dev / OSS / Catch / projects / XCode4 / CatchSelfTest / CatchSelfTest / . . / . . / . . / SelfTest / TrickyTests . cpp : 315 : ! False succeeded for : ! false <nl> + [ Finished : ' . / succeeding / SafeBool ' All tests passed ( 3 assertions in 1 test case ) ] <nl> + [ End of group : ' . / succeeding * ' . All tests passed ( 288 assertions in 41 test cases ) ] <nl> + <nl> + <nl> + [ Testing completed . All tests passed ( 288 assertions in 41 test cases ) ] <nl> + <nl>

Added regression test baselines

catchorg/Catch2

8f4cc541d55cf55b2a67b5d6b77b5c4ceb4d99ee

2012-10-29T19:55:34Z

new file mode 100644 <nl> index 0000000000 . . 3b369f11dd <nl> mmm / dev / null <nl> ppp b / FDBLibTLS / FDBLibTLS . vcxproj <nl> <nl> + < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> + < Project DefaultTargets = " Build " ToolsVersion = " 14 . 0 " xmlns = " http : / / schemas . microsoft . com / developer / msbuild / 2003 " > <nl> + < ItemGroup Label = " ProjectConfigurations " > <nl> + < ProjectConfiguration Include = " Debug | X64 " > <nl> + < Configuration > Debug < / Configuration > <nl> + < Platform > X64 < / Platform > <nl> + < / ProjectConfiguration > <nl> + < ProjectConfiguration Include = " Release | X64 " > <nl> + < Configuration > Release < / Configuration > <nl> + < Platform > X64 < / Platform > <nl> + < / ProjectConfiguration > <nl> + < / ItemGroup > <nl> + < ItemGroup > <nl> + < ClInclude Include = " FDBLibTLSPlugin . h " / > <nl> + < ClCompile Include = " FDBLibTLSPlugin . cpp " / > <nl> + < ClInclude Include = " FDBLibTLSPolicy . h " / > <nl> + < ClCompile Include = " FDBLibTLSPolicy . cpp " / > <nl> + < ClInclude Include = " FDBLibTLSSession . h " / > <nl> + < ClCompile Include = " FDBLibTLSSession . cpp " / > <nl> + < / ItemGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | X64 ' " Label = " Configuration " > <nl> + < ConfigurationType > DynamicLibrary < / ConfigurationType > <nl> + < CharacterSet > MultiByte < / CharacterSet > <nl> + < PlatformToolset > v140_xp < / PlatformToolset > <nl> + < / PropertyGroup > <nl> + < PropertyGroup Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | X64 ' " Label = " Configuration " > <nl> + < ConfigurationType > DynamicLibrary < / ConfigurationType > <nl> + < CharacterSet > MultiByte < / CharacterSet > <nl> + < PlatformToolset > v140_xp < / PlatformToolset > <nl> + < / PropertyGroup > <nl> + < / Project > <nl> new file mode 100644 <nl> index 0000000000 . . 0b6eac817c <nl> mmm / dev / null <nl> ppp b / FDBLibTLS / local . mk <nl> <nl> + FDBLibTLS_CFLAGS : = - fPIC - I / usr / local / include - I $ ( BOOSTDIR ) <nl> + FDBLibTLS_STATIC_LIBS : = - ltls - lssl - lcrypto <nl> + FDBLibTLS_LDFLAGS : = - L / usr / local / lib - static - libstdc + + - static - libgcc - lrt <nl> + FDBLibTLS_LDFLAGS + = - Wl , - soname , FDBLibTLS . so - Wl , - - version - script = FDBLibTLS / FDBLibTLS . map <nl> + <nl> + # The plugin isn ' t a typical library , so it feels more sensible to have a copy <nl> + # of it in bin / . <nl> + bin / FDBLibTLS . $ ( DLEXT ) : lib / libFDBLibTLS . $ ( DLEXT ) <nl> + @ cp $ < $ @ <nl> + <nl> + TARGETS + = bin / FDBLibTLS . $ ( DLEXT ) <nl> mmm a / Makefile <nl> ppp b / Makefile <nl> STATIC_LIBS : = <nl> VPATH + = $ ( addprefix : , $ ( filter - out lib , $ ( patsubst - L % , % , $ ( filter - L % , $ ( LDFLAGS ) ) ) ) ) <nl> <nl> CS_PROJECTS : = flow / actorcompiler flow / coveragetool fdbclient / vexillographer <nl> - CPP_PROJECTS : = flow fdbrpc fdbclient fdbbackup fdbserver fdbcli bindings / c bindings / java fdbmonitor bindings / flow / tester bindings / flow <nl> + CPP_PROJECTS : = flow fdbrpc fdbclient fdbbackup fdbserver fdbcli bindings / c bindings / java fdbmonitor bindings / flow / tester bindings / flow FDBLibTLS <nl> OTHER_PROJECTS : = bindings / python bindings / ruby bindings / go <nl> <nl> CS_MK_GENERATED : = $ ( CS_PROJECTS : = / generated . mk ) <nl> clean : $ ( CLEAN_TARGETS ) docpreview_clean <nl> @ echo " Cleaning toplevel " <nl> @ rm - rf $ ( OBJDIR ) <nl> @ rm - rf $ ( DEPSDIR ) <nl> - @ rm - rf lib / libstdc + + . a <nl> + @ rm - rf lib / <nl> @ rm - rf bin / coverage . * . xml <nl> <nl> targets : <nl>

Integrate FDBLibTLS into the FoundationDB build system .

apple/foundationdb

5efd9fe3c43043aeaa0417ba857f1282e6465955

2018-04-12T21:13:02Z

mmm a / . circleci / config . yml <nl> ppp b / . circleci / config . yml <nl> docker_config_defaults : & docker_config_defaults <nl> <nl> # NOTE : We only perform the merge in build step and not in test step , because <nl> # all source files will be shared from build to test <nl> - merge_pull_request_onto_master : & merge_pull_request_onto_master <nl> - name : Merge Onto Master <nl> - command : | <nl> - set - ex <nl> - if [ [ " $ { CIRCLE_BRANCH } " ! = " master " ] ] ; then <nl> - git config - - global user . email " circleci . ossci @ gmail . com " <nl> - git config - - global user . name " CircleCI " <nl> - <nl> - git config remote . origin . url https : / / github . com / pytorch / pytorch . git <nl> - git config - - add remote . origin . fetch + refs / heads / master : refs / remotes / origin / master <nl> - git fetch - - tags https : / / github . com / pytorch / pytorch . git + refs / heads / master : refs / remotes / origin / master - - quiet <nl> - if [ [ " $ { CIRCLE_BRANCH } " = = pull / * ] ] ; then # if this is a forked PR <nl> - git fetch - - tags https : / / github . com / pytorch / pytorch . git + refs / $ { CIRCLE_BRANCH } / head : refs / remotes / origin / $ { CIRCLE_BRANCH } <nl> - else <nl> - git fetch - - tags https : / / github . com / pytorch / pytorch . git + refs / heads / $ { CIRCLE_BRANCH } : refs / remotes / origin / $ { CIRCLE_BRANCH } <nl> - fi <nl> - <nl> - export GIT_MERGE_TARGET = ` git log - n 1 - - pretty = format : " % H " origin / master ` <nl> - echo " GIT_MERGE_TARGET : " $ { GIT_MERGE_TARGET } <nl> - export GIT_COMMIT = $ { CIRCLE_SHA1 } <nl> - echo " GIT_COMMIT : " $ { GIT_COMMIT } <nl> - <nl> - git merge - - no - edit - - no - ff $ { GIT_MERGE_TARGET } <nl> - fi <nl> - <nl> install_official_git_client : & install_official_git_client <nl> name : Install Official Git Client <nl> no_output_timeout : " 1h " <nl> pytorch_linux_cpu_build_test_defaults : & pytorch_linux_cpu_build_test_defaults <nl> - run : <nl> < < : * install_official_git_client <nl> - checkout <nl> - - run : <nl> - < < : * merge_pull_request_onto_master <nl> - run : <nl> name : Build And Test <nl> no_output_timeout : " 1h " <nl> pytorch_linux_build_defaults : & pytorch_linux_build_defaults <nl> - run : <nl> < < : * install_official_git_client <nl> - checkout <nl> - - run : <nl> - < < : * merge_pull_request_onto_master <nl> - run : <nl> < < : * setup_ci_environment <nl> - run : <nl> caffe2_linux_build_defaults : & caffe2_linux_build_defaults <nl> - run : <nl> < < : * install_official_git_client <nl> - checkout <nl> - - run : <nl> - < < : * merge_pull_request_onto_master <nl> - run : <nl> < < : * setup_ci_environment <nl> - run : <nl> caffe2_macos_build_defaults : & caffe2_macos_build_defaults <nl> xcode : " 9 . 0 " <nl> steps : <nl> - checkout <nl> - - run : <nl> - < < : * merge_pull_request_onto_master <nl> - run : <nl> name : Build <nl> no_output_timeout : " 1h " <nl> jobs : <nl> xcode : " 9 . 0 " <nl> steps : <nl> - checkout <nl> - - run : <nl> - < < : * merge_pull_request_onto_master <nl> - run : <nl> name : Build <nl> environment : <nl> jobs : <nl> xcode : " 9 . 0 " <nl> steps : <nl> - checkout <nl> - - run : <nl> - < < : * merge_pull_request_onto_master <nl> - run : <nl> name : Build <nl> environment : <nl>

Disable CircleCI merging to master . ( )

pytorch/pytorch

c368f26f889ebea9b09360fe8f16c40dd63a6c1e

2018-10-25T15:07:45Z

mmm a / src / builtins / base . tq <nl> ppp b / src / builtins / base . tq <nl> extern operator ' - ' macro Int32Sub ( int32 , int32 ) : int32 ; <nl> extern operator ' * ' macro Int32Mul ( int32 , int32 ) : int32 ; <nl> extern operator ' % ' macro Int32Mod ( int32 , int32 ) : int32 ; <nl> extern operator ' & ' macro Word32And ( word32 , word32 ) : int32 ; <nl> + extern operator ' = = ' macro <nl> + ConstexprInt31Equal ( constexpr int31 , constexpr int31 ) : constexpr bool ; <nl> <nl> extern operator ' = = ' macro Word32Equal ( word32 , word32 ) : bool ; <nl> extern operator ' ! = ' macro Word32NotEqual ( word32 , word32 ) : bool ; <nl> mmm a / src / code - stub - assembler . h <nl> ppp b / src / code - stub - assembler . h <nl> class V8_EXPORT_PRIVATE CodeStubAssembler : public compiler : : CodeAssembler { <nl> <nl> bool ConstexprBoolNot ( bool value ) { return ! value ; } <nl> <nl> + bool ConstexprInt31Equal ( int31_t a , int31_t b ) { return a = = b ; } <nl> + <nl> void PerformStackCheck ( TNode < Context > context ) ; <nl> <nl> protected : <nl> mmm a / src / torque / implementation - visitor . cc <nl> ppp b / src / torque / implementation - visitor . cc <nl> VisitResult ImplementationVisitor : : Visit ( ConditionalExpression * expr ) { <nl> <nl> VisitResult condition_result = Visit ( expr - > condition ) ; <nl> if ( ! condition_result . type ( ) - > IsNever ( ) ) { <nl> + condition_result = <nl> + GenerateImplicitConvert ( TypeOracle : : GetBoolType ( ) , condition_result ) ; <nl> GenerateBranch ( condition_result , true_label , false_label ) ; <nl> } <nl> - <nl> GenerateLabelBind ( true_label ) ; <nl> GenerateIndent ( ) ; <nl> source_out ( ) < < result - > GetValueForWrite ( ) < < " = " < < f1 < < " ( ) ; " <nl>

[ torque ] Add constexpr int31 equality operator

v8/v8

d020584ac7a6691b7af3e782cf8978aca2e8a449

2018-06-20T09:56:20Z

mmm a / src / core / hle / kernel / process . h <nl> ppp b / src / core / hle / kernel / process . h <nl> class Process final : public Object { <nl> ProcessFlags flags ; <nl> / / / Kernel compatibility version for this process <nl> u16 kernel_version = 0 ; <nl> + / / / The default CPU for this process , threads are scheduled on this cpu by default . <nl> + u8 ideal_processor = 0 ; <nl> <nl> / / / The id of this process <nl> u32 process_id = next_process_id + + ; <nl> mmm a / src / core / hle / svc . cpp <nl> ppp b / src / core / hle / svc . cpp <nl> static ResultCode CreateThread ( Handle * out_handle , s32 priority , u32 entry_point <nl> break ; <nl> } <nl> <nl> + if ( processor_id = = THREADPROCESSORID_1 | | processor_id = = THREADPROCESSORID_ALL | | <nl> + ( processor_id = = THREADPROCESSORID_DEFAULT & & Kernel : : g_current_process - > ideal_processor = = THREADPROCESSORID_1 ) ) { <nl> + LOG_WARNING ( Kernel_SVC , " Newly created thread is allowed to be run in the SysCore , unimplemented . " ) ; <nl> + } <nl> + <nl> CASCADE_RESULT ( SharedPtr < Thread > thread , Kernel : : Thread : : Create ( <nl> name , entry_point , priority , arg , processor_id , stack_top ) ) ; <nl> CASCADE_RESULT ( * out_handle , Kernel : : g_handle_table . Create ( std : : move ( thread ) ) ) ; <nl> mmm a / src / core / loader / ncch . cpp <nl> ppp b / src / core / loader / ncch . cpp <nl> ResultStatus AppLoader_NCCH : : LoadExec ( ) { <nl> Kernel : : g_current_process - > resource_limit = Kernel : : ResourceLimit : : GetForCategory ( <nl> static_cast < Kernel : : ResourceLimitCategory > ( exheader_header . arm11_system_local_caps . resource_limit_category ) ) ; <nl> <nl> + / / Set the default CPU core for this process <nl> + Kernel : : g_current_process - > ideal_processor = exheader_header . arm11_system_local_caps . ideal_processor ; <nl> + <nl> / / Copy data while converting endianess <nl> std : : array < u32 , ARRAY_SIZE ( exheader_header . arm11_kernel_caps . descriptors ) > kernel_caps ; <nl> std : : copy_n ( exheader_header . arm11_kernel_caps . descriptors , kernel_caps . size ( ) , begin ( kernel_caps ) ) ; <nl>

Merge pull request from Subv / log_cpu

yuzu-emu/yuzu

282a2ad539223d61067a1957fab8c45571075987

2016-05-08T19:03:08Z

mmm a / cyber / transport / transmitter / hybrid_transmitter . h <nl> ppp b / cyber / transport / transmitter / hybrid_transmitter . h <nl> class HybridTransmitter : public Transmitter < M > { <nl> using HistoryPtr = std : : shared_ptr < History < M > > ; <nl> <nl> using TransmitterPtr = std : : shared_ptr < Transmitter < M > > ; <nl> - using TransmitterMap = std : : map < OptionalMode , TransmitterPtr > ; <nl> + using TransmitterMap = <nl> + std : : unordered_map < OptionalMode , TransmitterPtr , std : : hash < int > > ; <nl> <nl> using MappingTable = <nl> std : : unordered_map < Relation , OptionalMode , std : : hash < int > > ; <nl>

Revert " framework : ensure order of transmission ( ) "

ApolloAuto/apollo

53833eaafb645c2abbc77462d77fb15cd73a800b

2018-12-13T23:20:00Z

mmm a / tensorflow / lite / delegates / gpu / metal / BUILD <nl> ppp b / tensorflow / lite / delegates / gpu / metal / BUILD <nl> <nl> load ( " @ build_bazel_rules_apple / / apple : ios . bzl " , " ios_application " , " ios_unit_test " ) <nl> - load ( " / / tensorflow / lite : special_rules . bzl " , " tflite_ios_per_kernel_test " , " tflite_portable_test_suite " ) <nl> + load ( <nl> + " / / tensorflow / lite : special_rules . bzl " , <nl> + " tflite_ios_lab_runner " , <nl> + " tflite_ios_per_kernel_test " , <nl> + " tflite_portable_test_suite " , <nl> + ) <nl> load ( <nl> " / / tensorflow / core / platform : build_config_root . bzl " , <nl> " tf_gpu_tests_tags " , <nl> ios_unit_test ( <nl> name = " common_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " compiled_model_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " environment_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " inference_context_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> objc_library ( <nl> ios_unit_test ( <nl> name = " ComponentsTests " , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ " notap " ] , <nl> test_host = " : TestApplication " , <nl> deps = [ <nl> mmm a / tensorflow / lite / delegates / gpu / metal / kernels / BUILD <nl> ppp b / tensorflow / lite / delegates / gpu / metal / kernels / BUILD <nl> <nl> load ( " @ build_bazel_rules_apple / / apple : ios . bzl " , " ios_unit_test " ) <nl> - load ( " / / tensorflow / lite : special_rules . bzl " , " tflite_ios_per_kernel_test " , " tflite_portable_test_suite " ) <nl> + load ( <nl> + " / / tensorflow / lite : special_rules . bzl " , <nl> + " tflite_ios_lab_runner " , <nl> + " tflite_ios_per_kernel_test " , <nl> + " tflite_portable_test_suite " , <nl> + ) <nl> load ( <nl> " / / tensorflow / core / platform : build_config_root . bzl " , <nl> " tf_gpu_tests_tags " , <nl> ios_unit_test ( <nl> name = " add_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " concat_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " conv_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " depthwise_conv_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " elementwise_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " fully_connected_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " max_unpooling_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " mean_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " mul_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 9 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " padding_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " pooling_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " prelu_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " relu_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " resize_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " reshape_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " slice_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " softmax_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> ios_unit_test ( <nl> name = " transpose_conv_test " , <nl> testonly = 1 , <nl> minimum_os_version = " 10 . 0 " , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = tf_gpu_tests_tags ( ) + [ <nl> " notap " , <nl> " tflite_not_portable_android " , <nl> mmm a / tensorflow / lite / experimental / objc / BUILD . apple <nl> ppp b / tensorflow / lite / experimental / objc / BUILD . apple <nl> <nl> # TensorFlow Lite for Objective - C <nl> <nl> - load ( " / / tensorflow / lite : special_rules . bzl " , " ios_visibility_whitelist " ) <nl> + load ( " / / tensorflow / lite : special_rules . bzl " , " ios_visibility_whitelist " , " tflite_ios_lab_runner " ) <nl> load ( " / / tensorflow / lite / experimental / ios : ios . bzl " , " TFL_DEFAULT_TAGS " , " TFL_DISABLED_SANITIZER_TAGS " , " TFL_MINIMUM_OS_VERSION " ) <nl> load ( " @ build_bazel_rules_apple / / apple : ios . bzl " , " ios_application " , " ios_unit_test " ) <nl> <nl> ios_unit_test ( <nl> name = " Tests " , <nl> size = " medium " , <nl> minimum_os_version = TFL_MINIMUM_OS_VERSION , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = TFL_DEFAULT_TAGS + TFL_DISABLED_SANITIZER_TAGS + [ <nl> " nozapfhahn " , # TODO ( b / 145984659 ) : Enable after solving tool failure . <nl> ] , <nl> mmm a / tensorflow / lite / experimental / swift / BUILD . apple <nl> ppp b / tensorflow / lite / experimental / swift / BUILD . apple <nl> <nl> # TensorFlow Lite for Swift <nl> <nl> - load ( " / / tensorflow / lite : special_rules . bzl " , " ios_visibility_whitelist " ) <nl> + load ( " / / tensorflow / lite : special_rules . bzl " , " ios_visibility_whitelist " , " tflite_ios_lab_runner " ) <nl> load ( " / / tensorflow / lite / experimental / ios : ios . bzl " , " TFL_DEFAULT_TAGS " , " TFL_DISABLED_SANITIZER_TAGS " , " TFL_MINIMUM_OS_VERSION " ) <nl> load ( " @ build_bazel_rules_apple / / apple : ios . bzl " , " ios_application " , " ios_unit_test " ) <nl> load ( " @ build_bazel_rules_swift / / swift : swift . bzl " , " swift_library " ) <nl> ios_unit_test ( <nl> name = " Tests " , <nl> size = " small " , <nl> minimum_os_version = TFL_MINIMUM_OS_VERSION , <nl> + runner = tflite_ios_lab_runner ( " IOS_LATEST " ) , <nl> tags = TFL_DEFAULT_TAGS + TFL_DISABLED_SANITIZER_TAGS , <nl> deps = [ <nl> " : TestsLibrary " , <nl> mmm a / tensorflow / lite / special_rules . bzl <nl> ppp b / tensorflow / lite / special_rules . bzl <nl> def ios_visibility_whitelist ( ) : <nl> def tflite_extra_gles_deps ( ) : <nl> " " " This is a no - op outside of Google . " " " <nl> return [ ] <nl> + <nl> + def tflite_ios_lab_runner ( version ) : <nl> + " " " This is a no - op outside of Google . " " " <nl> + return None <nl>

Internal change

tensorflow/tensorflow

b0c8a2ee1d27336bddae5475ab382df21cb910f1

2020-02-22T00:52:48Z

mmm a / Code / CryEngine / CryAudioSystem / ATL . cpp <nl> ppp b / Code / CryEngine / CryAudioSystem / ATL . cpp <nl> ERequestStatus CAudioTranslationLayer : : ClearControlsData ( EDataScope const dataSc <nl> m_xmlProcessor . ClearControlsData ( dataScope ) ; <nl> if ( dataScope = = EDataScope : : All | | dataScope = = EDataScope : : Global ) <nl> { <nl> - InitInternalControls ( ) ; <nl> + CreateInternalControls ( ) ; <nl> } <nl> <nl> return ERequestStatus : : Success ; <nl> ERequestStatus CAudioTranslationLayer : : SetImpl ( Impl : : IImpl * const pIImpl ) <nl> CATLControlImpl : : SetImpl ( m_pIImpl ) ; <nl> <nl> SetImplLanguage ( ) ; <nl> - InitInternalControls ( ) ; <nl> + CreateInternalControls ( ) ; <nl> <nl> return result ; <nl> } <nl> bool CAudioTranslationLayer : : OnInputEvent ( SInputEvent const & event ) <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - void CAudioTranslationLayer : : InitInternalControls ( ) <nl> + void CAudioTranslationLayer : : CreateInternalControls ( ) <nl> { <nl> m_internalControls . m_switchStates . clear ( ) ; <nl> - m_internalControls . m_parameters . clear ( ) ; <nl> + m_internalControls . m_triggers . clear ( ) ; <nl> <nl> / / Occlusion <nl> - COcclusionObstructionState * pOcclusionIgnore = new COcclusionObstructionState ( IgnoreStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> + COcclusionObstructionState const * const pOcclusionIgnore = new COcclusionObstructionState ( IgnoreStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> m_internalControls . m_switchStates [ std : : make_pair ( OcclusionCalcSwitchId , IgnoreStateId ) ] = pOcclusionIgnore ; <nl> <nl> - COcclusionObstructionState * pOcclusionAdaptive = new COcclusionObstructionState ( AdaptiveStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> + COcclusionObstructionState const * const pOcclusionAdaptive = new COcclusionObstructionState ( AdaptiveStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> m_internalControls . m_switchStates [ std : : make_pair ( OcclusionCalcSwitchId , AdaptiveStateId ) ] = pOcclusionAdaptive ; <nl> <nl> - COcclusionObstructionState * pOcclusionLow = new COcclusionObstructionState ( LowStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> + COcclusionObstructionState const * const pOcclusionLow = new COcclusionObstructionState ( LowStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> m_internalControls . m_switchStates [ std : : make_pair ( OcclusionCalcSwitchId , LowStateId ) ] = pOcclusionLow ; <nl> <nl> - COcclusionObstructionState * pOcclusionMedium = new COcclusionObstructionState ( MediumStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> + COcclusionObstructionState const * const pOcclusionMedium = new COcclusionObstructionState ( MediumStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> m_internalControls . m_switchStates [ std : : make_pair ( OcclusionCalcSwitchId , MediumStateId ) ] = pOcclusionMedium ; <nl> <nl> - COcclusionObstructionState * pOcclusionHigh = new COcclusionObstructionState ( HighStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> + COcclusionObstructionState const * const pOcclusionHigh = new COcclusionObstructionState ( HighStateId , m_audioListenerMgr , * m_pGlobalAudioObject ) ; <nl> m_internalControls . m_switchStates [ std : : make_pair ( OcclusionCalcSwitchId , HighStateId ) ] = pOcclusionHigh ; <nl> <nl> / / Relative Velocity Tracking <nl> - CRelativeVelocityTrackingState * const pRelativeVelocityTrackingOn = new CRelativeVelocityTrackingState ( OnStateId , * m_pGlobalAudioObject ) ; <nl> + CRelativeVelocityTrackingState const * const pRelativeVelocityTrackingOn = new CRelativeVelocityTrackingState ( OnStateId , * m_pGlobalAudioObject ) ; <nl> m_internalControls . m_switchStates [ std : : make_pair ( RelativeVelocityTrackingSwitchId , OnStateId ) ] = pRelativeVelocityTrackingOn ; <nl> <nl> - CRelativeVelocityTrackingState * const pRelativeVelocityTrackingOff = new CRelativeVelocityTrackingState ( OffStateId , * m_pGlobalAudioObject ) ; <nl> + CRelativeVelocityTrackingState const * const pRelativeVelocityTrackingOff = new CRelativeVelocityTrackingState ( OffStateId , * m_pGlobalAudioObject ) ; <nl> m_internalControls . m_switchStates [ std : : make_pair ( RelativeVelocityTrackingSwitchId , OffStateId ) ] = pRelativeVelocityTrackingOff ; <nl> <nl> / / Absolute Velocity Tracking <nl> - CAbsoluteVelocityTrackingState * const pAbsoluteVelocityTrackingOn = new CAbsoluteVelocityTrackingState ( OnStateId , * m_pGlobalAudioObject ) ; <nl> + CAbsoluteVelocityTrackingState const * const pAbsoluteVelocityTrackingOn = new CAbsoluteVelocityTrackingState ( OnStateId , * m_pGlobalAudioObject ) ; <nl> m_internalControls . m_switchStates [ std : : make_pair ( AbsoluteVelocityTrackingSwitchId , OnStateId ) ] = pAbsoluteVelocityTrackingOn ; <nl> <nl> - CAbsoluteVelocityTrackingState * const pAbsoluteVelocityTrackingOff = new CAbsoluteVelocityTrackingState ( OffStateId , * m_pGlobalAudioObject ) ; <nl> + CAbsoluteVelocityTrackingState const * const pAbsoluteVelocityTrackingOff = new CAbsoluteVelocityTrackingState ( OffStateId , * m_pGlobalAudioObject ) ; <nl> m_internalControls . m_switchStates [ std : : make_pair ( AbsoluteVelocityTrackingSwitchId , OffStateId ) ] = pAbsoluteVelocityTrackingOff ; <nl> + <nl> + / / Do Nothing <nl> + CATLTriggerImpl const * const pDoNothingTrigger = new CATLTriggerImpl ( DoNothingTriggerId ) ; <nl> + m_internalControls . m_triggers [ DoNothingTriggerId ] = pDoNothingTrigger ; <nl> + <nl> + / / Create internal controls . <nl> + std : : vector < char const * > const occlStates { <nl> + s_szIgnoreStateName , s_szAdaptiveStateName , s_szLowStateName , s_szMediumStateName , s_szHighStateName <nl> + } ; <nl> + CreateInternalSwitch ( s_szOcclCalcSwitchName , OcclusionCalcSwitchId , occlStates ) ; <nl> + <nl> + std : : vector < char const * > const onOffStates { <nl> + s_szOnStateName , s_szOffStateName <nl> + } ; <nl> + CreateInternalSwitch ( s_szRelativeVelocityTrackingSwitchName , RelativeVelocityTrackingSwitchId , onOffStates ) ; <nl> + CreateInternalSwitch ( s_szAbsoluteVelocityTrackingSwitchName , AbsoluteVelocityTrackingSwitchId , onOffStates ) ; <nl> + <nl> + CreateInternalTrigger ( s_szDoNothingTriggerName , DoNothingTriggerId ) ; <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + void CAudioTranslationLayer : : CreateInternalTrigger ( char const * const szTriggerName , ControlId const triggerId ) <nl> + { <nl> + if ( ( triggerId ! = CryAudio : : InvalidControlId ) & & ( stl : : find_in_map ( m_triggers , triggerId , nullptr ) = = nullptr ) ) <nl> + { <nl> + CATLTrigger : : ImplPtrVec implPtrs ; <nl> + implPtrs . reserve ( 1 ) ; <nl> + <nl> + CATLTriggerImpl const * const pTriggerImpl = stl : : find_in_map ( m_internalControls . m_triggers , triggerId , nullptr ) ; <nl> + <nl> + if ( pTriggerImpl ! = nullptr ) <nl> + { <nl> + implPtrs . push_back ( pTriggerImpl ) ; <nl> + } <nl> + <nl> + CATLTrigger * const pNewTrigger = new CATLTrigger ( triggerId , EDataScope : : Global , implPtrs , 0 . 0f ) ; <nl> + # if defined ( INCLUDE_AUDIO_PRODUCTION_CODE ) <nl> + pNewTrigger - > m_name = szTriggerName ; <nl> + # endif / / INCLUDE_AUDIO_PRODUCTION_CODE <nl> + <nl> + m_triggers [ triggerId ] = pNewTrigger ; <nl> + } <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + void CAudioTranslationLayer : : CreateInternalSwitch ( char const * const szSwitchName , ControlId const switchId , std : : vector < char const * > const & stateNames ) <nl> + { <nl> + if ( ( switchId ! = CryAudio : : InvalidControlId ) & & ( stl : : find_in_map ( m_switches , switchId , nullptr ) = = nullptr ) ) <nl> + { <nl> + CATLSwitch * const pNewSwitch = new CATLSwitch ( switchId , EDataScope : : Global ) ; <nl> + # if defined ( INCLUDE_AUDIO_PRODUCTION_CODE ) <nl> + pNewSwitch - > m_name = szSwitchName ; <nl> + # endif / / INCLUDE_AUDIO_PRODUCTION_CODE <nl> + <nl> + for ( auto const szStateName : stateNames ) <nl> + { <nl> + SwitchStateId const stateId = static_cast < SwitchStateId const > ( StringToId ( szStateName ) ) ; <nl> + <nl> + if ( stateId ! = CryAudio : : InvalidSwitchStateId ) <nl> + { <nl> + CATLSwitchState : : ImplPtrVec switchStateImplVec ; <nl> + switchStateImplVec . reserve ( 1 ) ; <nl> + <nl> + IAudioSwitchStateImpl const * const pSwitchStateImpl = stl : : find_in_map ( m_internalControls . m_switchStates , std : : make_pair ( switchId , stateId ) , nullptr ) ; <nl> + <nl> + if ( pSwitchStateImpl ! = nullptr ) <nl> + { <nl> + switchStateImplVec . push_back ( pSwitchStateImpl ) ; <nl> + } <nl> + <nl> + CATLSwitchState * const pNewState = new CATLSwitchState ( switchId , stateId , switchStateImplVec ) ; <nl> + pNewSwitch - > audioSwitchStates [ stateId ] = pNewState ; <nl> + # if defined ( INCLUDE_AUDIO_PRODUCTION_CODE ) <nl> + pNewState - > m_name = szStateName ; <nl> + # endif / / INCLUDE_AUDIO_PRODUCTION_CODE <nl> + } <nl> + } <nl> + <nl> + m_switches [ switchId ] = pNewSwitch ; <nl> + } <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> mmm a / Code / CryEngine / CryAudioSystem / ATL . h <nl> ppp b / Code / CryEngine / CryAudioSystem / ATL . h <nl> class CAudioTranslationLayer final : public IInputEventListener <nl> <nl> ERequestStatus RefreshAudioSystem ( char const * const szLevelName ) ; <nl> void SetImplLanguage ( ) ; <nl> - void InitInternalControls ( ) ; <nl> + void CreateInternalControls ( ) ; <nl> void SetCurrentEnvironmentsOnObject ( CATLAudioObject * const pObject , EntityId const entityToIgnore , Vec3 const & position ) ; <nl> <nl> + void CreateInternalTrigger ( char const * const szTriggerName , ControlId const triggerId ) ; <nl> + void CreateInternalSwitch ( char const * const szSwitchName , ControlId const switchId , std : : vector < char const * > const & stateNames ) ; <nl> + <nl> / / ATLObject containers <nl> AudioTriggerLookup m_triggers ; <nl> AudioParameterLookup m_parameters ; <nl> mmm a / Code / CryEngine / CryAudioSystem / InternalEntities . h <nl> ppp b / Code / CryEngine / CryAudioSystem / InternalEntities . h <nl> struct SInternalControls <nl> using SwitchState = std : : pair < ControlId const , SwitchStateId const > ; <nl> <nl> std : : map < SwitchState , IAudioSwitchStateImpl const * > m_switchStates ; <nl> - std : : map < ControlId , IParameterImpl * > m_parameters ; <nl> + std : : map < ControlId , CATLTriggerImpl const * > m_triggers ; <nl> } ; <nl> <nl> class COcclusionObstructionState final : public IAudioSwitchStateImpl <nl> mmm a / Code / CryEngine / CryCommon / CryAudio / IAudioSystem . h <nl> ppp b / Code / CryEngine / CryCommon / CryAudio / IAudioSystem . h <nl> static constexpr char * s_szMuteAllTriggerName = " mute_all " ; <nl> static constexpr char * s_szUnmuteAllTriggerName = " unmute_all " ; <nl> static constexpr char * s_szDoNothingTriggerName = " do_nothing " ; <nl> static constexpr char * s_szOcclCalcSwitchName = " occlusion_calculation_type " ; <nl> - static constexpr char * s_szOcclCalcSwitchRequestName = " occlusion_calculation_request_type " ; <nl> static constexpr char * s_szIgnoreStateName = " ignore " ; <nl> static constexpr char * s_szAdaptiveStateName = " adaptive " ; <nl> static constexpr char * s_szLowStateName = " low " ; <nl> static constexpr char * s_szOnStateName = " on " ; <nl> static constexpr char * s_szOffStateName = " off " ; <nl> static constexpr char * s_szGlobalPreloadRequestName = " global_audio_system_preload " ; <nl> static constexpr char * s_szDefaultLibraryName = " default_controls " ; <nl> + static constexpr char * s_szInternalLibraryName = " internal_default_controls " ; <nl> <nl> static constexpr char * s_szRootNodeTag = " AudioSystemData " ; <nl> static constexpr char * s_szEditorDataTag = " EditorData " ; <nl> static constexpr ControlId GetFocusTriggerId = StringToId ( s_szGetFocusTriggerNam <nl> static constexpr ControlId MuteAllTriggerId = StringToId ( s_szMuteAllTriggerName ) ; <nl> static constexpr ControlId UnmuteAllTriggerId = StringToId ( s_szUnmuteAllTriggerName ) ; <nl> static constexpr ControlId DoNothingTriggerId = StringToId ( s_szDoNothingTriggerName ) ; <nl> - static constexpr ControlId OcclusionCalcSwitchId = StringToId ( s_szOcclCalcSwitchRequestName ) ; <nl> + static constexpr ControlId OcclusionCalcSwitchId = StringToId ( s_szOcclCalcSwitchName ) ; <nl> static constexpr SwitchStateId IgnoreStateId = StringToId ( s_szIgnoreStateName ) ; <nl> static constexpr SwitchStateId AdaptiveStateId = StringToId ( s_szAdaptiveStateName ) ; <nl> static constexpr SwitchStateId LowStateId = StringToId ( s_szLowStateName ) ; <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / AudioControlsLoader . cpp <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / AudioControlsLoader . cpp <nl> CSystemControl * CAudioControlsLoader : : LoadControl ( XmlNodeRef const pNode , Scope <nl> string const name = pNode - > getAttr ( " atl_name " ) ; <nl> ESystemItemType const controlType = TagToType_BackwardsComp ( pNode - > getTag ( ) ) ; <nl> <nl> - if ( ! ( ( controlType = = ESystemItemType : : Switch ) & & ( name = = " ObstrOcclCalcType " ) ) ) <nl> + if ( ! ( ( controlType = = ESystemItemType : : Switch ) & & ( name = = " ObstrOcclCalcType " ) ) & & <nl> + ! ( ( controlType = = ESystemItemType : : Trigger ) & & ( name = = CryAudio : : s_szDoNothingTriggerName ) ) ) <nl> { <nl> pControl = m_pAssetsManager - > FindControl ( name , controlType ) ; <nl> <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / AudioControlsLoader . h <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / AudioControlsLoader . h <nl> class CAudioControlsLoader <nl> EErrorCode m_errorCodeMask ; <nl> bool m_loadOnlyDefaultControls ; <nl> <nl> - std : : set < string > m_defaultTriggerNames { CryAudio : : s_szGetFocusTriggerName , CryAudio : : s_szLoseFocusTriggerName , CryAudio : : s_szMuteAllTriggerName , CryAudio : : s_szUnmuteAllTriggerName , CryAudio : : s_szDoNothingTriggerName } ; <nl> + std : : set < string > m_defaultTriggerNames { CryAudio : : s_szGetFocusTriggerName , CryAudio : : s_szLoseFocusTriggerName , CryAudio : : s_szMuteAllTriggerName , CryAudio : : s_szUnmuteAllTriggerName } ; <nl> std : : set < string > m_defaultParameterNames { CryAudio : : s_szAbsoluteVelocityParameterName , " object_speed " , CryAudio : : s_szRelativeVelocityParameterName , " object_doppler " } ; <nl> } ; <nl> } / / namespace ACE <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / FileLoader . cpp <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / FileLoader . cpp <nl> void CFileLoader : : LoadAll ( ) <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> void CFileLoader : : LoadControls ( ) <nl> { <nl> + CreateInternalControls ( ) ; <nl> + <nl> / / load the global controls <nl> LoadAllLibrariesInFolder ( m_assetsManager . GetConfigFolderPath ( ) , " " ) ; <nl> <nl> std : : set < string > CFileLoader : : GetLoadedFilenamesList ( ) <nl> return m_loadedFilenames ; <nl> } <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + void CFileLoader : : CreateInternalControls ( ) <nl> + { <nl> + / / Create internal default controls . <nl> + / / These controls are hidden in the ACE and don ' t get written to XML ! <nl> + CSystemAsset * const pLibrary = static_cast < CSystemAsset * > ( m_assetsManager . CreateLibrary ( CryAudio : : s_szInternalLibraryName ) ) ; <nl> + <nl> + if ( pLibrary ! = nullptr ) <nl> + { <nl> + pLibrary - > SetInternalControl ( true ) ; <nl> + <nl> + CreateInternalControl ( pLibrary , CryAudio : : s_szDoNothingTriggerName , ESystemItemType : : Trigger ) ; <nl> + <nl> + SwitchStates const occlStates { CryAudio : : s_szIgnoreStateName , CryAudio : : s_szAdaptiveStateName , CryAudio : : s_szLowStateName , CryAudio : : s_szMediumStateName , CryAudio : : s_szHighStateName } ; <nl> + CreateInternalSwitch ( pLibrary , CryAudio : : s_szOcclCalcSwitchName , occlStates ) ; <nl> + <nl> + SwitchStates const onOffStates { CryAudio : : s_szOnStateName , CryAudio : : s_szOffStateName } ; <nl> + CreateInternalSwitch ( pLibrary , CryAudio : : s_szAbsoluteVelocityTrackingSwitchName , onOffStates ) ; <nl> + CreateInternalSwitch ( pLibrary , CryAudio : : s_szRelativeVelocityTrackingSwitchName , onOffStates ) ; <nl> + } <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + void CFileLoader : : CreateInternalControl ( CSystemAsset * const pLibrary , char const * const szName , ESystemItemType const type ) <nl> + { <nl> + CSystemControl * const pControl = m_assetsManager . CreateControl ( szName , type , pLibrary ) ; <nl> + <nl> + if ( pControl ! = nullptr ) <nl> + { <nl> + pControl - > SetDefaultControl ( true ) ; <nl> + pControl - > SetInternalControl ( true ) ; <nl> + } <nl> + } <nl> + <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + void CFileLoader : : CreateInternalSwitch ( CSystemAsset * const pLibrary , char const * const szSwitchName , SwitchStates const & stateNames ) <nl> + { <nl> + CSystemControl * const pSwitch = m_assetsManager . CreateControl ( szSwitchName , ESystemItemType : : Switch , pLibrary ) ; <nl> + <nl> + if ( pSwitch ! = nullptr ) <nl> + { <nl> + for ( auto const & szStateName : stateNames ) <nl> + { <nl> + m_assetsManager . CreateControl ( szStateName , ESystemItemType : : State , pSwitch ) ; <nl> + } <nl> + <nl> + pSwitch - > SetDefaultControl ( true ) ; <nl> + pSwitch - > SetInternalControl ( true ) ; <nl> + } <nl> + } <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> void CFileLoader : : CreateDefaultControls ( ) <nl> { <nl> void CFileLoader : : CreateDefaultControls ( ) <nl> pControl - > SetDefaultControl ( true ) ; <nl> } <nl> <nl> - pControl = m_assetsManager . FindControl ( CryAudio : : s_szDoNothingTriggerName , ESystemItemType : : Trigger ) ; <nl> - <nl> - if ( pControl = = nullptr ) <nl> - { <nl> - pControl = m_assetsManager . CreateControl ( CryAudio : : s_szDoNothingTriggerName , ESystemItemType : : Trigger , pLibrary ) ; <nl> - wasModified = true ; <nl> - } <nl> - <nl> - if ( pControl ! = nullptr ) <nl> - { <nl> - pControl - > SetDefaultControl ( true ) ; <nl> - } <nl> - <nl> pControl = m_assetsManager . FindControl ( CryAudio : : s_szAbsoluteVelocityParameterName , ESystemItemType : : Parameter ) ; <nl> <nl> if ( pControl = = nullptr ) <nl> void CFileLoader : : CreateDefaultControls ( ) <nl> pControl - > SetDefaultControl ( true ) ; <nl> } <nl> <nl> - { <nl> - SwitchStates const states { CryAudio : : s_szIgnoreStateName , CryAudio : : s_szAdaptiveStateName , CryAudio : : s_szLowStateName , CryAudio : : s_szMediumStateName , CryAudio : : s_szHighStateName } ; <nl> - <nl> - if ( CreateDefaultSwitch ( pLibrary , CryAudio : : s_szOcclCalcSwitchName , CryAudio : : s_szOcclCalcSwitchRequestName , states ) ) <nl> - { <nl> - wasModified = true ; <nl> - } <nl> - } <nl> - <nl> - { <nl> - SwitchStates const states { CryAudio : : s_szOnStateName , CryAudio : : s_szOffStateName } ; <nl> - <nl> - if ( CreateDefaultSwitch ( pLibrary , CryAudio : : s_szAbsoluteVelocityTrackingSwitchName , CryAudio : : s_szAbsoluteVelocityTrackingSwitchName , states ) ) <nl> - { <nl> - wasModified = true ; <nl> - } <nl> - if ( CreateDefaultSwitch ( pLibrary , CryAudio : : s_szRelativeVelocityTrackingSwitchName , CryAudio : : s_szRelativeVelocityTrackingSwitchName , states ) ) <nl> - { <nl> - wasModified = true ; <nl> - } <nl> - } <nl> - <nl> if ( pLibrary - > ChildCount ( ) = = 0 ) <nl> { <nl> m_assetsManager . DeleteItem ( pLibrary ) ; <nl> void CFileLoader : : CreateDefaultControls ( ) <nl> } <nl> } <nl> <nl> - / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - bool CFileLoader : : CreateDefaultSwitch ( CSystemAsset * const pLibrary , char const * const szExternalName , char const * const szInternalName , SwitchStates const & states ) <nl> - { <nl> - bool wasModified = false ; <nl> - CSystemControl * pSwitch = m_assetsManager . FindControl ( szExternalName , ESystemItemType : : Switch ) ; <nl> - <nl> - if ( pSwitch ! = nullptr ) <nl> - { <nl> - / / Remove any states that shouldn ' t be part of the default control <nl> - size_t childIndex = 0 ; <nl> - size_t childCount = pSwitch - > ChildCount ( ) ; <nl> - <nl> - while ( childIndex < childCount ) <nl> - { <nl> - CSystemAsset const * const pChild = pSwitch - > GetChild ( childIndex ) ; <nl> - <nl> - if ( pChild ! = nullptr ) <nl> - { <nl> - bool shouldRemoveChild = true ; <nl> - <nl> - for ( auto const & szStateName : states ) <nl> - { <nl> - if ( strcmp ( pChild - > GetName ( ) . c_str ( ) , szStateName ) = = 0 ) <nl> - { <nl> - + + childIndex ; <nl> - shouldRemoveChild = false ; <nl> - break ; <nl> - } <nl> - } <nl> - <nl> - if ( shouldRemoveChild ) <nl> - { <nl> - pSwitch - > RemoveChild ( pChild ) ; <nl> - childCount = pSwitch - > ChildCount ( ) ; <nl> - wasModified = true ; <nl> - } <nl> - } <nl> - } <nl> - } <nl> - else <nl> - { <nl> - pSwitch = m_assetsManager . CreateControl ( szExternalName , ESystemItemType : : Switch , pLibrary ) ; <nl> - wasModified = true ; <nl> - } <nl> - <nl> - for ( auto const & szStateName : states ) <nl> - { <nl> - CSystemControl * pState = nullptr ; <nl> - <nl> - size_t const stateCount = pSwitch - > ChildCount ( ) ; <nl> - <nl> - for ( size_t i = 0 ; i < stateCount ; + + i ) <nl> - { <nl> - CSystemControl * pChild = static_cast < CSystemControl * > ( pSwitch - > GetChild ( i ) ) ; <nl> - if ( ( pChild ! = nullptr ) & & ( strcmp ( pChild - > GetName ( ) . c_str ( ) , szStateName ) = = 0 ) & & ( pChild - > GetType ( ) = = ESystemItemType : : State ) ) <nl> - { <nl> - pState = pChild ; <nl> - break ; <nl> - } <nl> - } <nl> - <nl> - if ( pState = = nullptr ) <nl> - { <nl> - pState = m_assetsManager . CreateControl ( szStateName , ESystemItemType : : State , pSwitch ) ; <nl> - <nl> - XmlNodeRef const pRequestNode = GetISystem ( ) - > CreateXmlNode ( CryAudio : : s_szSwitchRequestTag ) ; <nl> - pRequestNode - > setAttr ( CryAudio : : s_szNameAttribute , szInternalName ) ; <nl> - XmlNodeRef const pValueNode = pRequestNode - > createNode ( CryAudio : : s_szValueTag ) ; <nl> - pValueNode - > setAttr ( CryAudio : : s_szNameAttribute , szStateName ) ; <nl> - pRequestNode - > addChild ( pValueNode ) ; <nl> - <nl> - pState - > AddRawXMLConnection ( pRequestNode , false ) ; <nl> - } <nl> - } <nl> - <nl> - pSwitch - > SetDefaultControl ( true ) ; <nl> - pSwitch - > SetHiddenDefault ( true ) ; <nl> - return wasModified ; <nl> - } <nl> - <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> void CFileLoader : : LoadConnections ( XmlNodeRef const pRoot , CSystemControl * const pControl ) <nl> { <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / FileLoader . h <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / FileLoader . h <nl> class CFileLoader <nl> void LoadPreloadConnections ( XmlNodeRef const pNode , CSystemControl * const pControl , uint32 const version ) ; <nl> void LoadConnections ( XmlNodeRef const root , CSystemControl * const pControl ) ; <nl> <nl> + void CreateInternalControls ( ) ; <nl> + void CreateInternalControl ( CSystemAsset * const pLibrary , char const * const szName , ESystemItemType const type ) ; <nl> + void CreateInternalSwitch ( CSystemAsset * const pLibrary , char const * const szSwitchName , SwitchStates const & StateNames ) ; <nl> void CreateDefaultControls ( ) ; <nl> - bool CreateDefaultSwitch ( CSystemAsset * const pLibrary , char const * const szExternalName , char const * const szInternalName , SwitchStates const & states ) ; <nl> <nl> void LoadScopesImpl ( string const & path ) ; <nl> <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / FileWriter . cpp <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / FileWriter . cpp <nl> void CFileWriter : : WriteAll ( ) <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> void CFileWriter : : WriteLibrary ( CSystemLibrary const & library ) <nl> { <nl> - if ( library . IsModified ( ) ) <nl> + if ( ! library . IsInternalControl ( ) ) / / Don ' t write internal controls library to XML . <nl> { <nl> - LibraryStorage libraryXmlNodes ; <nl> - <nl> - size_t const itemCount = library . ChildCount ( ) ; <nl> - <nl> - for ( size_t i = 0 ; i < itemCount ; + + i ) <nl> - { <nl> - WriteItem ( library . GetChild ( i ) , " " , libraryXmlNodes ) ; <nl> - } <nl> - <nl> - / / If empty , force it to write an empty library at the root <nl> - if ( libraryXmlNodes . empty ( ) ) <nl> - { <nl> - libraryXmlNodes [ Utils : : GetGlobalScope ( ) ] . isDirty = true ; <nl> - } <nl> - <nl> - for ( auto const & libraryPair : libraryXmlNodes ) <nl> + if ( library . IsModified ( ) ) <nl> { <nl> - string libraryPath = m_assetsManager . GetConfigFolderPath ( ) ; <nl> - Scope const scope = libraryPair . first ; <nl> + LibraryStorage libraryXmlNodes ; <nl> + size_t const itemCount = library . ChildCount ( ) ; <nl> <nl> - if ( scope = = Utils : : GetGlobalScope ( ) ) <nl> + for ( size_t i = 0 ; i < itemCount ; + + i ) <nl> { <nl> - / / no scope , file at the root level <nl> - libraryPath + = library . GetName ( ) ; <nl> + WriteItem ( library . GetChild ( i ) , " " , libraryXmlNodes ) ; <nl> } <nl> - else <nl> + <nl> + / / If empty , force it to write an empty library at the root <nl> + if ( libraryXmlNodes . empty ( ) ) <nl> { <nl> - / / with scope , inside level folder <nl> - libraryPath + = CryAudio : : s_szLevelsFolderName ; <nl> - libraryPath + = CRY_NATIVE_PATH_SEPSTR + m_assetsManager . GetScopeInfo ( scope ) . name + CRY_NATIVE_PATH_SEPSTR + library . GetName ( ) ; <nl> + libraryXmlNodes [ Utils : : GetGlobalScope ( ) ] . isDirty = true ; <nl> } <nl> <nl> - m_foundLibraryPaths . insert ( libraryPath . MakeLower ( ) + " . xml " ) ; <nl> + for ( auto const & libraryPair : libraryXmlNodes ) <nl> + { <nl> + string libraryPath = m_assetsManager . GetConfigFolderPath ( ) ; <nl> + Scope const scope = libraryPair . first ; <nl> <nl> - SLibraryScope const & libScope = libraryPair . second ; <nl> + if ( scope = = Utils : : GetGlobalScope ( ) ) <nl> + { <nl> + / / no scope , file at the root level <nl> + libraryPath + = library . GetName ( ) ; <nl> + } <nl> + else <nl> + { <nl> + / / with scope , inside level folder <nl> + libraryPath + = CryAudio : : s_szLevelsFolderName ; <nl> + libraryPath + = CRY_NATIVE_PATH_SEPSTR + m_assetsManager . GetScopeInfo ( scope ) . name + CRY_NATIVE_PATH_SEPSTR + library . GetName ( ) ; <nl> + } <nl> <nl> - if ( libScope . isDirty ) <nl> - { <nl> - XmlNodeRef pFileNode = GetISystem ( ) - > CreateXmlNode ( CryAudio : : s_szRootNodeTag ) ; <nl> - pFileNode - > setAttr ( CryAudio : : s_szNameAttribute , library . GetName ( ) ) ; <nl> - pFileNode - > setAttr ( CryAudio : : s_szVersionAttribute , s_currentFileVersion ) ; <nl> + m_foundLibraryPaths . insert ( libraryPath . MakeLower ( ) + " . xml " ) ; <nl> <nl> - int const numTypes = static_cast < int > ( ESystemItemType : : NumTypes ) ; <nl> + SLibraryScope const & libScope = libraryPair . second ; <nl> <nl> - for ( int i = 0 ; i < numTypes ; + + i ) <nl> + if ( libScope . isDirty ) <nl> { <nl> - if ( i ! = static_cast < int > ( ESystemItemType : : State ) ) / / switch_states are written inside the switches <nl> - { <nl> - XmlNodeRef node = libScope . GetXmlNode ( ( ESystemItemType ) i ) ; <nl> + XmlNodeRef pFileNode = GetISystem ( ) - > CreateXmlNode ( CryAudio : : s_szRootNodeTag ) ; <nl> + pFileNode - > setAttr ( CryAudio : : s_szNameAttribute , library . GetName ( ) ) ; <nl> + pFileNode - > setAttr ( CryAudio : : s_szVersionAttribute , s_currentFileVersion ) ; <nl> <nl> - if ( ( node ! = nullptr ) & & ( node - > getChildCount ( ) > 0 ) ) <nl> + int const numTypes = static_cast < int > ( ESystemItemType : : NumTypes ) ; <nl> + <nl> + for ( int i = 0 ; i < numTypes ; + + i ) <nl> + { <nl> + if ( i ! = static_cast < int > ( ESystemItemType : : State ) ) / / switch_states are written inside the switches <nl> { <nl> - pFileNode - > addChild ( node ) ; <nl> + XmlNodeRef node = libScope . GetXmlNode ( ( ESystemItemType ) i ) ; <nl> + <nl> + if ( ( node ! = nullptr ) & & ( node - > getChildCount ( ) > 0 ) ) <nl> + { <nl> + pFileNode - > addChild ( node ) ; <nl> + } <nl> } <nl> } <nl> - } <nl> - <nl> - / / Editor data <nl> - XmlNodeRef const pEditorData = pFileNode - > createNode ( CryAudio : : s_szEditorDataTag ) ; <nl> <nl> - if ( pEditorData ! = nullptr ) <nl> - { <nl> - XmlNodeRef const pLibraryNode = pEditorData - > createNode ( s_szLibraryNodeTag ) ; <nl> + / / Editor data <nl> + XmlNodeRef const pEditorData = pFileNode - > createNode ( CryAudio : : s_szEditorDataTag ) ; <nl> <nl> - if ( pLibraryNode ! = nullptr ) <nl> + if ( pEditorData ! = nullptr ) <nl> { <nl> - WriteLibraryEditorData ( library , pLibraryNode ) ; <nl> - pEditorData - > addChild ( pLibraryNode ) ; <nl> - } <nl> + XmlNodeRef const pLibraryNode = pEditorData - > createNode ( s_szLibraryNodeTag ) ; <nl> <nl> - XmlNodeRef const pFoldersNode = pEditorData - > createNode ( s_szFoldersNodeTag ) ; <nl> + if ( pLibraryNode ! = nullptr ) <nl> + { <nl> + WriteLibraryEditorData ( library , pLibraryNode ) ; <nl> + pEditorData - > addChild ( pLibraryNode ) ; <nl> + } <nl> <nl> - if ( pFoldersNode ! = nullptr ) <nl> - { <nl> - WriteFolderEditorData ( library , pFoldersNode ) ; <nl> - pEditorData - > addChild ( pFoldersNode ) ; <nl> - } <nl> + XmlNodeRef const pFoldersNode = pEditorData - > createNode ( s_szFoldersNodeTag ) ; <nl> + <nl> + if ( pFoldersNode ! = nullptr ) <nl> + { <nl> + WriteFolderEditorData ( library , pFoldersNode ) ; <nl> + pEditorData - > addChild ( pFoldersNode ) ; <nl> + } <nl> <nl> - XmlNodeRef const pControlsNode = pEditorData - > createNode ( s_szControlsNodeTag ) ; <nl> + XmlNodeRef const pControlsNode = pEditorData - > createNode ( s_szControlsNodeTag ) ; <nl> <nl> - if ( pControlsNode ! = nullptr ) <nl> - { <nl> - WriteControlsEditorData ( library , pControlsNode ) ; <nl> - pEditorData - > addChild ( pControlsNode ) ; <nl> + if ( pControlsNode ! = nullptr ) <nl> + { <nl> + WriteControlsEditorData ( library , pControlsNode ) ; <nl> + pEditorData - > addChild ( pControlsNode ) ; <nl> + } <nl> + <nl> + pFileNode - > addChild ( pEditorData ) ; <nl> } <nl> <nl> - pFileNode - > addChild ( pEditorData ) ; <nl> - } <nl> + string const fullFilePath = PathUtil : : GetGameFolder ( ) + CRY_NATIVE_PATH_SEPSTR + libraryPath + " . xml " ; <nl> <nl> - string const fullFilePath = PathUtil : : GetGameFolder ( ) + CRY_NATIVE_PATH_SEPSTR + libraryPath + " . xml " ; <nl> + DWORD const fileAttributes = GetFileAttributesA ( fullFilePath . c_str ( ) ) ; <nl> <nl> - DWORD const fileAttributes = GetFileAttributesA ( fullFilePath . c_str ( ) ) ; <nl> + if ( fileAttributes & FILE_ATTRIBUTE_READONLY ) <nl> + { <nl> + / / file is read - only <nl> + SetFileAttributesA ( fullFilePath . c_str ( ) , FILE_ATTRIBUTE_NORMAL ) ; <nl> + } <nl> <nl> - if ( fileAttributes & FILE_ATTRIBUTE_READONLY ) <nl> - { <nl> - / / file is read - only <nl> - SetFileAttributesA ( fullFilePath . c_str ( ) , FILE_ATTRIBUTE_NORMAL ) ; <nl> + / / TODO : Check out firlin source control . <nl> + pFileNode - > saveToFile ( fullFilePath ) ; <nl> } <nl> - <nl> - / / TODO : Check out firlin source control . <nl> - pFileNode - > saveToFile ( fullFilePath ) ; <nl> } <nl> } <nl> - } <nl> - else <nl> - { <nl> - std : : unordered_set < Scope > scopes ; <nl> - <nl> - size_t const numChildren = library . ChildCount ( ) ; <nl> - <nl> - for ( size_t i = 0 ; i < numChildren ; + + i ) <nl> - { <nl> - CSystemAsset * const pItem = library . GetChild ( i ) ; <nl> - GetScopes ( pItem , scopes ) ; <nl> - } <nl> - <nl> - for ( auto const scope : scopes ) <nl> + else <nl> { <nl> - string libraryPath = m_assetsManager . GetConfigFolderPath ( ) ; <nl> + std : : unordered_set < Scope > scopes ; <nl> + size_t const numChildren = library . ChildCount ( ) ; <nl> <nl> - if ( scope = = Utils : : GetGlobalScope ( ) ) <nl> + for ( size_t i = 0 ; i < numChildren ; + + i ) <nl> { <nl> - / / no scope , file at the root level <nl> - libraryPath + = library . GetName ( ) ; <nl> + CSystemAsset * const pItem = library . GetChild ( i ) ; <nl> + GetScopes ( pItem , scopes ) ; <nl> } <nl> - else <nl> + <nl> + for ( auto const scope : scopes ) <nl> { <nl> - / / with scope , inside level folder <nl> - libraryPath + = CryAudio : : s_szLevelsFolderName ; <nl> - libraryPath + = CRY_NATIVE_PATH_SEPSTR + m_assetsManager . GetScopeInfo ( scope ) . name + CRY_NATIVE_PATH_SEPSTR + library . GetName ( ) ; <nl> - } <nl> + string libraryPath = m_assetsManager . GetConfigFolderPath ( ) ; <nl> <nl> - m_foundLibraryPaths . insert ( libraryPath . MakeLower ( ) + " . xml " ) ; <nl> + if ( scope = = Utils : : GetGlobalScope ( ) ) <nl> + { <nl> + / / no scope , file at the root level <nl> + libraryPath + = library . GetName ( ) ; <nl> + } <nl> + else <nl> + { <nl> + / / with scope , inside level folder <nl> + libraryPath + = CryAudio : : s_szLevelsFolderName ; <nl> + libraryPath + = CRY_NATIVE_PATH_SEPSTR + m_assetsManager . GetScopeInfo ( scope ) . name + CRY_NATIVE_PATH_SEPSTR + library . GetName ( ) ; <nl> + } <nl> + <nl> + m_foundLibraryPaths . insert ( libraryPath . MakeLower ( ) + " . xml " ) ; <nl> + } <nl> } <nl> } <nl> } <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / ResourceSelectorDialog . cpp <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / ResourceSelectorDialog . cpp <nl> void CResourceSelectorDialog : : OnContextMenu ( QPoint const & pos ) <nl> <nl> if ( ( pAsset ! = nullptr ) & & ( pAsset - > GetType ( ) = = ESystemItemType : : Trigger ) ) <nl> { <nl> - pContextMenu - > addAction ( tr ( " Execute Trigger " ) , [ & ] ( ) <nl> + pContextMenu - > addAction ( tr ( " Execute Trigger " ) , [ = ] ( ) <nl> { <nl> CAudioControlsEditorPlugin : : ExecuteTrigger ( pAsset - > GetName ( ) ) ; <nl> } ) ; <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / SystemAssets . cpp <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / SystemAssets . cpp <nl> void CSystemAsset : : SetDescription ( string const & description ) <nl> } <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - void CSystemAsset : : SetHiddenDefault ( bool const isHiddenDefault ) <nl> + void CSystemAsset : : SetInternalControl ( bool const isInternal ) <nl> { <nl> - if ( isHiddenDefault ) <nl> + if ( isInternal ) <nl> { <nl> - m_flags | = ESystemAssetFlags : : IsHiddenDefault ; <nl> + m_flags | = ESystemAssetFlags : : IsInternalControl ; <nl> } <nl> else <nl> { <nl> - m_flags & = ~ ESystemAssetFlags : : IsHiddenDefault ; <nl> + m_flags & = ~ ESystemAssetFlags : : IsInternalControl ; <nl> } <nl> <nl> if ( m_type = = ESystemItemType : : Switch ) <nl> { <nl> for ( auto const pChild : m_children ) <nl> { <nl> - pChild - > SetHiddenDefault ( isHiddenDefault ) ; <nl> + pChild - > SetInternalControl ( isInternal ) ; <nl> } <nl> } <nl> } <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / SystemAssets . h <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / SystemAssets . h <nl> enum class ESystemAssetFlags <nl> { <nl> None = 0 , <nl> IsDefaultControl = BIT ( 0 ) , <nl> - IsHiddenDefault = BIT ( 1 ) , <nl> + IsInternalControl = BIT ( 1 ) , <nl> IsModified = BIT ( 2 ) , <nl> HasPlaceholderConnection = BIT ( 3 ) , <nl> HasConnection = BIT ( 4 ) , <nl> class CSystemAsset <nl> bool IsDefaultControl ( ) const { return ( m_flags & ESystemAssetFlags : : IsDefaultControl ) ! = 0 ; } <nl> void SetDefaultControl ( bool const isDefaultControl ) ; <nl> <nl> - bool IsHiddenDefault ( ) const { return ( m_flags & ESystemAssetFlags : : IsHiddenDefault ) ! = 0 ; } <nl> - void SetHiddenDefault ( bool const isHiddenDefault ) ; <nl> + bool IsInternalControl ( ) const { return ( m_flags & ESystemAssetFlags : : IsInternalControl ) ! = 0 ; } <nl> + void SetInternalControl ( bool const isInternal ) ; <nl> <nl> virtual bool IsModified ( ) const { return ( m_flags & ESystemAssetFlags : : IsModified ) ! = 0 ; } <nl> virtual void SetModified ( bool const isModified , bool const isForced = false ) ; <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / SystemAssetsManager . cpp <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / SystemAssetsManager . cpp <nl> void CSystemAssetsManager : : UpdateAssetConnectionStates ( CSystemAsset * const pAsse <nl> { <nl> pControl - > SetHasControl ( true ) ; <nl> <nl> - if ( pControl - > IsHiddenDefault ( ) ) <nl> - { <nl> - pControl - > SetHasConnection ( true ) ; <nl> - } <nl> - else <nl> + bool hasPlaceholder = false ; <nl> + bool hasConnection = false ; <nl> + int const connectionCount = pControl - > GetConnectionCount ( ) ; <nl> + <nl> + for ( int i = 0 ; i < connectionCount ; + + i ) <nl> { <nl> - bool hasPlaceholder = false ; <nl> - bool hasConnection = false ; <nl> - int const connectionCount = pControl - > GetConnectionCount ( ) ; <nl> + hasConnection = true ; <nl> + IEditorImpl const * const pEditorImpl = CAudioControlsEditorPlugin : : GetImplementationManger ( ) - > GetImplementation ( ) ; <nl> <nl> - for ( int i = 0 ; i < connectionCount ; + + i ) <nl> + if ( pEditorImpl ! = nullptr ) <nl> { <nl> - hasConnection = true ; <nl> - IEditorImpl const * const pEditorImpl = CAudioControlsEditorPlugin : : GetImplementationManger ( ) - > GetImplementation ( ) ; <nl> + CImplItem const * const pImpleControl = pEditorImpl - > GetControl ( pControl - > GetConnectionAt ( i ) - > GetID ( ) ) ; <nl> <nl> - if ( pEditorImpl ! = nullptr ) <nl> + if ( pImpleControl ! = nullptr ) <nl> { <nl> - CImplItem const * const pImpleControl = pEditorImpl - > GetControl ( pControl - > GetConnectionAt ( i ) - > GetID ( ) ) ; <nl> - <nl> - if ( pImpleControl ! = nullptr ) <nl> + if ( pImpleControl - > IsPlaceholder ( ) ) <nl> { <nl> - if ( pImpleControl - > IsPlaceholder ( ) ) <nl> - { <nl> - hasPlaceholder = true ; <nl> - } <nl> + hasPlaceholder = true ; <nl> } <nl> } <nl> } <nl> - <nl> - pControl - > SetHasPlaceholderConnection ( hasPlaceholder ) ; <nl> - pControl - > SetHasConnection ( hasConnection ) ; <nl> } <nl> + <nl> + pControl - > SetHasPlaceholderConnection ( hasPlaceholder ) ; <nl> + pControl - > SetHasConnection ( hasConnection ) ; <nl> } <nl> } <nl> } <nl> mmm a / Code / Sandbox / Plugins / EditorAudioControlsEditor / SystemControlsModel . cpp <nl> ppp b / Code / Sandbox / Plugins / EditorAudioControlsEditor / SystemControlsModel . cpp <nl> bool CSystemFilterProxyModel : : rowMatchesFilter ( int sourceRow , QModelIndex const & <nl> { <nl> CSystemAsset const * const pAsset = SystemModelUtils : : GetAssetFromIndex ( index , static_cast < int > ( SystemModelUtils : : EColumns : : Name ) ) ; <nl> <nl> - if ( ( pAsset ! = nullptr ) & & pAsset - > IsHiddenDefault ( ) ) <nl> + if ( ( pAsset ! = nullptr ) & & pAsset - > IsInternalControl ( ) ) <nl> { <nl> - / / Hide default controls that should not be connected to any middleware control . <nl> + / / Hide internal controls . <nl> matchesFilter = false ; <nl> } <nl> else <nl>

! XO ( Audio ) Removed internal default controls from XML .

CRYTEK/CRYENGINE

5ae501fb8c45222a17265006f560d8b19c0d9176

2018-01-09T16:58:13Z

mmm a / modules / objdetect / src / hog . cpp <nl> ppp b / modules / objdetect / src / hog . cpp <nl> void HOGDescriptor : : groupRectangles ( vector < cv : : Rect > & rectList , vector < double > & <nl> vector < cv : : Rect_ < double > > rrects ( nclasses ) ; <nl> vector < int > numInClass ( nclasses , 0 ) ; <nl> vector < double > foundWeights ( nclasses , DBL_MIN ) ; <nl> - vector < double > totalFactorsPerClass ( nclasses , 1 ) ; <nl> int i , j , nlabels = ( int ) labels . size ( ) ; <nl> <nl> for ( i = 0 ; i < nlabels ; i + + ) <nl>

remove unused variable in HOGDescriptor : : groupRectangles ( )

opencv/opencv

9b52b614516a0a7286fee08dddf574e1ec6e6188

2014-04-09T19:56:19Z

mmm a / src / app / application . cpp <nl> ppp b / src / app / application . cpp <nl> void Application : : sendNotificationEmail ( const BitTorrent : : TorrentHandle * torrent <nl> <nl> / / Send the notification email <nl> const Preferences * pref = Preferences : : instance ( ) ; <nl> - Net : : Smtp * smtp = new Net : : Smtp ( this ) ; <nl> + auto * smtp = new Net : : Smtp ( this ) ; <nl> smtp - > sendMail ( pref - > getMailNotificationSender ( ) , <nl> pref - > getMailNotificationEmail ( ) , <nl> tr ( " [ qBittorrent ] ' % 1 ' has finished downloading " ) . arg ( torrent - > name ( ) ) , <nl> mmm a / src / base / http / server . cpp <nl> ppp b / src / base / http / server . cpp <nl> Server : : Server ( IRequestHandler * requestHandler , QObject * parent ) <nl> setProxy ( QNetworkProxy : : NoProxy ) ; <nl> QSslSocket : : setDefaultCiphers ( safeCipherList ( ) ) ; <nl> <nl> - QTimer * dropConnectionTimer = new QTimer ( this ) ; <nl> + auto * dropConnectionTimer = new QTimer ( this ) ; <nl> connect ( dropConnectionTimer , & QTimer : : timeout , this , & Server : : dropTimedOutConnection ) ; <nl> dropConnectionTimer - > start ( CONNECTIONS_SCAN_INTERVAL * 1000 ) ; <nl> } <nl> void Server : : incomingConnection ( qintptr socketDescriptor ) <nl> static_cast < QSslSocket * > ( serverSocket ) - > startServerEncryption ( ) ; <nl> } <nl> <nl> - Connection * c = new Connection ( serverSocket , m_requestHandler , this ) ; <nl> + auto * c = new Connection ( serverSocket , m_requestHandler , this ) ; <nl> m_connections . append ( c ) ; <nl> } <nl> <nl> mmm a / src / base / net / private / geoipdatabase . cpp <nl> ppp b / src / base / net / private / geoipdatabase . cpp <nl> QString GeoIPDatabase : : lookup ( const QHostAddress & hostAddr ) const <nl> ptr + = m_recordBytes ; <nl> <nl> quint32 id = 0 ; <nl> - uchar * idPtr = reinterpret_cast < uchar * > ( & id ) ; <nl> + auto * idPtr = reinterpret_cast < uchar * > ( & id ) ; <nl> memcpy ( & idPtr [ 4 - m_recordBytes ] , ptr , m_recordBytes ) ; <nl> fromBigEndian ( idPtr , 4 ) ; <nl> <nl> QVariantHash GeoIPDatabase : : readMetadata ( ) const <nl> if ( index > = 0 ) { <nl> if ( m_size > MAX_METADATA_SIZE ) <nl> index + = ( m_size - MAX_METADATA_SIZE ) ; / / from begin of all data <nl> - quint32 offset = static_cast < quint32 > ( index + strlen ( METADATA_BEGIN_MARK ) ) ; <nl> + auto offset = static_cast < quint32 > ( index + strlen ( METADATA_BEGIN_MARK ) ) ; <nl> QVariant metadata = readDataField ( offset ) ; <nl> if ( metadata . userType ( ) = = QMetaType : : QVariantHash ) <nl> return metadata . toHash ( ) ; <nl> mmm a / src / base / scanfoldersmodel . cpp <nl> ppp b / src / base / scanfoldersmodel . cpp <nl> bool ScanFoldersModel : : setData ( const QModelIndex & index , const QVariant & value , <nl> return false ; <nl> <nl> if ( role = = Qt : : UserRole ) { <nl> - PathType type = static_cast < PathType > ( value . toInt ( ) ) ; <nl> + auto type = static_cast < PathType > ( value . toInt ( ) ) ; <nl> if ( type = = CUSTOM_LOCATION ) <nl> return false ; <nl> <nl> mmm a / src / base / utils / misc . cpp <nl> ppp b / src / base / utils / misc . cpp <nl> namespace <nl> if ( sizeInBytes < 0 ) return false ; <nl> <nl> int i = 0 ; <nl> - qreal rawVal = static_cast < qreal > ( sizeInBytes ) ; <nl> + auto rawVal = static_cast < qreal > ( sizeInBytes ) ; <nl> <nl> while ( ( rawVal > = 1024 . ) & & ( i < = static_cast < int > ( Utils : : Misc : : SizeUnit : : ExbiByte ) ) ) { <nl> rawVal / = 1024 . ; <nl> mmm a / src / gui / categoryfilterwidget . cpp <nl> ppp b / src / gui / categoryfilterwidget . cpp <nl> namespace <nl> CategoryFilterWidget : : CategoryFilterWidget ( QWidget * parent ) <nl> : QTreeView ( parent ) <nl> { <nl> - CategoryFilterProxyModel * proxyModel = new CategoryFilterProxyModel ( this ) ; <nl> + auto * proxyModel = new CategoryFilterProxyModel ( this ) ; <nl> proxyModel - > setSortCaseSensitivity ( Qt : : CaseInsensitive ) ; <nl> proxyModel - > setSourceModel ( new CategoryFilterModel ( this ) ) ; <nl> setModel ( proxyModel ) ; <nl> mmm a / src / gui / fspathedit . cpp <nl> ppp b / src / gui / fspathedit . cpp <nl> FileSystemPathEdit : : FileSystemPathEdit ( Private : : FileEditorWithCompletion * editor <nl> Q_D ( FileSystemPathEdit ) ; <nl> editor - > widget ( ) - > setParent ( this ) ; <nl> <nl> - QHBoxLayout * layout = new QHBoxLayout ( this ) ; <nl> + auto * layout = new QHBoxLayout ( this ) ; <nl> layout - > setContentsMargins ( 0 , 0 , 0 , 0 ) ; <nl> layout - > addWidget ( editor - > widget ( ) ) ; <nl> layout - > addWidget ( d - > m_browseBtn ) ; <nl> mmm a / src / gui / fspathedit_p . cpp <nl> ppp b / src / gui / fspathedit_p . cpp <nl> void Private : : FileLineEdit : : keyPressEvent ( QKeyEvent * e ) <nl> showCompletionPopup ( ) ; <nl> } <nl> <nl> - const FileSystemPathValidator * validator = <nl> - qobject_cast < const FileSystemPathValidator * > ( this - > validator ( ) ) ; <nl> + auto * validator = qobject_cast < const FileSystemPathValidator * > ( this - > validator ( ) ) ; <nl> if ( validator ) { <nl> FileSystemPathValidator : : TestResult lastTestResult = validator - > lastTestResult ( ) ; <nl> QValidator : : State lastState = validator - > lastValidationState ( ) ; <nl> mmm a / src / gui / loglistwidget . cpp <nl> ppp b / src / gui / loglistwidget . cpp <nl> void LogListWidget : : keyPressEvent ( QKeyEvent * event ) <nl> <nl> void LogListWidget : : appendLine ( const QString & line , const Log : : MsgType & type ) <nl> { <nl> - QListWidgetItem * item = new QListWidgetItem ; <nl> + auto * item = new QListWidgetItem ; <nl> / / We need to use QLabel here to support rich text <nl> QLabel * lbl = new QLabel ( line ) ; <nl> lbl - > setContentsMargins ( 4 , 2 , 4 , 2 ) ; <nl> mmm a / src / gui / mainwindow . cpp <nl> ppp b / src / gui / mainwindow . cpp <nl> MainWindow : : MainWindow ( QWidget * parent ) <nl> m_ui - > menuAutoShutdownOnDownloadsCompletion - > setIcon ( GuiIconProvider : : instance ( ) - > getIcon ( " application - exit " ) ) ; <nl> m_ui - > actionManageCookies - > setIcon ( GuiIconProvider : : instance ( ) - > getIcon ( " preferences - web - browser - cookies " ) ) ; <nl> <nl> - QMenu * lockMenu = new QMenu ( this ) ; <nl> + auto * lockMenu = new QMenu ( this ) ; <nl> QAction * defineUiLockPasswdAct = lockMenu - > addAction ( tr ( " & Set Password " ) ) ; <nl> connect ( defineUiLockPasswdAct , & QAction : : triggered , this , & MainWindow : : defineUILockPassword ) ; <nl> QAction * clearUiLockPasswdAct = lockMenu - > addAction ( tr ( " & Clear Password " ) ) ; <nl> MainWindow : : MainWindow ( QWidget * parent ) <nl> m_splitter = new QSplitter ( Qt : : Horizontal , this ) ; <nl> / / vSplitter - > setChildrenCollapsible ( false ) ; <nl> <nl> - QSplitter * hSplitter = new QSplitter ( Qt : : Vertical , this ) ; <nl> + auto * hSplitter = new QSplitter ( Qt : : Vertical , this ) ; <nl> hSplitter - > setChildrenCollapsible ( false ) ; <nl> hSplitter - > setFrameShape ( QFrame : : NoFrame ) ; <nl> <nl> MainWindow : : MainWindow ( QWidget * parent ) <nl> QTimer : : singleShot ( 0 , this , & MainWindow : : on_actionSearchWidget_triggered ) ; <nl> <nl> / / Auto shutdown actions <nl> - QActionGroup * autoShutdownGroup = new QActionGroup ( this ) ; <nl> + auto * autoShutdownGroup = new QActionGroup ( this ) ; <nl> autoShutdownGroup - > setExclusive ( true ) ; <nl> autoShutdownGroup - > addAction ( m_ui - > actionAutoShutdownDisabled ) ; <nl> autoShutdownGroup - > addAction ( m_ui - > actionAutoExit ) ; <nl> void MainWindow : : addToolbarContextMenu ( ) <nl> m_toolbarMenu - > addAction ( textBesideIcons ) ; <nl> m_toolbarMenu - > addAction ( textUnderIcons ) ; <nl> m_toolbarMenu - > addAction ( followSystemStyle ) ; <nl> - QActionGroup * textPositionGroup = new QActionGroup ( m_toolbarMenu ) ; <nl> + auto * textPositionGroup = new QActionGroup ( m_toolbarMenu ) ; <nl> textPositionGroup - > addAction ( iconsOnly ) ; <nl> iconsOnly - > setCheckable ( true ) ; <nl> textPositionGroup - > addAction ( textOnly ) ; <nl> void MainWindow : : addToolbarContextMenu ( ) <nl> textPositionGroup - > addAction ( followSystemStyle ) ; <nl> followSystemStyle - > setCheckable ( true ) ; <nl> <nl> - const Qt : : ToolButtonStyle buttonStyle = static_cast < Qt : : ToolButtonStyle > ( pref - > getToolbarTextPosition ( ) ) ; <nl> + const auto buttonStyle = static_cast < Qt : : ToolButtonStyle > ( pref - > getToolbarTextPosition ( ) ) ; <nl> if ( ( buttonStyle > = Qt : : ToolButtonIconOnly ) & & ( buttonStyle < = Qt : : ToolButtonFollowStyle ) ) <nl> m_ui - > toolBar - > setToolButtonStyle ( buttonStyle ) ; <nl> switch ( buttonStyle ) { <nl> void MainWindow : : cleanup ( ) <nl> # endif <nl> <nl> / / remove all child widgets <nl> - while ( QWidget * w = findChild < QWidget * > ( ) ) <nl> + while ( auto * w = findChild < QWidget * > ( ) ) <nl> delete w ; <nl> } <nl> <nl> mmm a / src / gui / optionsdialog . cpp <nl> ppp b / src / gui / optionsdialog . cpp <nl> OptionsDialog : : OptionsDialog ( QWidget * parent ) <nl> m_ui - > textTempPath - > setMode ( FileSystemPathEdit : : Mode : : DirectorySave ) ; <nl> <nl> / / disable mouse wheel event on widgets to avoid mis - selection <nl> - WheelEventEater * wheelEventEater = new WheelEventEater ( this ) ; <nl> + auto * wheelEventEater = new WheelEventEater ( this ) ; <nl> for ( QComboBox * widget : asConst ( findChildren < QComboBox * > ( ) ) ) <nl> widget - > installEventFilter ( wheelEventEater ) ; <nl> for ( QSpinBox * widget : asConst ( findChildren < QSpinBox * > ( ) ) ) <nl> void OptionsDialog : : saveOptions ( ) <nl> / / Load the translation <nl> QString locale = getLocale ( ) ; <nl> if ( pref - > getLocale ( ) ! = locale ) { <nl> - QTranslator * translator = new QTranslator ; <nl> + auto * translator = new QTranslator ; <nl> if ( translator - > load ( QLatin1String ( " : / lang / qbittorrent_ " ) + locale ) ) <nl> qDebug ( " % s locale recognized , using translation . " , qUtf8Printable ( locale ) ) ; <nl> else <nl> void OptionsDialog : : saveOptions ( ) <nl> m_ui - > checkAssociateMagnetLinks - > setEnabled ( ! m_ui - > checkAssociateMagnetLinks - > isChecked ( ) ) ; <nl> } <nl> # endif <nl> - Application * const app = static_cast < Application * > ( QCoreApplication : : instance ( ) ) ; <nl> + auto * const app = static_cast < Application * > ( QCoreApplication : : instance ( ) ) ; <nl> app - > setFileLoggerPath ( m_ui - > textFileLogPath - > selectedPath ( ) ) ; <nl> app - > setFileLoggerBackup ( m_ui - > checkFileLogBackup - > isChecked ( ) ) ; <nl> app - > setFileLoggerMaxSize ( m_ui - > spinFileLogSize - > value ( ) * 1024 ) ; <nl> mmm a / src / gui / powermanagement / powermanagement_x11 . cpp <nl> ppp b / src / gui / powermanagement / powermanagement_x11 . cpp <nl> void PowerManagementInhibitor : : requestIdle ( ) <nl> call . setArguments ( args ) ; <nl> <nl> QDBusPendingCall pcall = QDBusConnection : : sessionBus ( ) . asyncCall ( call , 1000 ) ; <nl> - QDBusPendingCallWatcher * watcher = new QDBusPendingCallWatcher ( pcall , this ) ; <nl> + auto * watcher = new QDBusPendingCallWatcher ( pcall , this ) ; <nl> connect ( watcher , & QDBusPendingCallWatcher : : finished , this , & PowerManagementInhibitor : : onAsyncReply ) ; <nl> } <nl> <nl> void PowerManagementInhibitor : : requestBusy ( ) <nl> call . setArguments ( args ) ; <nl> <nl> QDBusPendingCall pcall = QDBusConnection : : sessionBus ( ) . asyncCall ( call , 1000 ) ; <nl> - QDBusPendingCallWatcher * watcher = new QDBusPendingCallWatcher ( pcall , this ) ; <nl> + auto * watcher = new QDBusPendingCallWatcher ( pcall , this ) ; <nl> connect ( watcher , & QDBusPendingCallWatcher : : finished , this , & PowerManagementInhibitor : : onAsyncReply ) ; <nl> } <nl> <nl> mmm a / src / gui / properties / propertieswidget . cpp <nl> ppp b / src / gui / properties / propertieswidget . cpp <nl> void PropertiesWidget : : showPiecesDownloaded ( bool show ) <nl> void PropertiesWidget : : setVisibility ( bool visible ) <nl> { <nl> if ( ! visible & & ( m_state = = VISIBLE ) ) { <nl> - QSplitter * hSplitter = static_cast < QSplitter * > ( parentWidget ( ) ) ; <nl> + auto * hSplitter = static_cast < QSplitter * > ( parentWidget ( ) ) ; <nl> m_ui - > stackedProperties - > setVisible ( false ) ; <nl> m_slideSizes = hSplitter - > sizes ( ) ; <nl> hSplitter - > handle ( 1 ) - > setVisible ( false ) ; <nl> void PropertiesWidget : : setVisibility ( bool visible ) <nl> <nl> if ( visible & & ( m_state = = REDUCED ) ) { <nl> m_ui - > stackedProperties - > setVisible ( true ) ; <nl> - QSplitter * hSplitter = static_cast < QSplitter * > ( parentWidget ( ) ) ; <nl> + auto * hSplitter = static_cast < QSplitter * > ( parentWidget ( ) ) ; <nl> hSplitter - > handle ( 1 ) - > setDisabled ( false ) ; <nl> hSplitter - > handle ( 1 ) - > setVisible ( true ) ; <nl> hSplitter - > setSizes ( m_slideSizes ) ; <nl> void PropertiesWidget : : readSettings ( ) <nl> if ( sizesStr . size ( ) = = 2 ) { <nl> m_slideSizes < < sizesStr . first ( ) . toInt ( ) ; <nl> m_slideSizes < < sizesStr . last ( ) . toInt ( ) ; <nl> - QSplitter * hSplitter = static_cast < QSplitter * > ( parentWidget ( ) ) ; <nl> + auto * hSplitter = static_cast < QSplitter * > ( parentWidget ( ) ) ; <nl> hSplitter - > setSizes ( m_slideSizes ) ; <nl> } <nl> const int currentTab = pref - > getPropCurTab ( ) ; <nl> void PropertiesWidget : : saveSettings ( ) <nl> Preferences * const pref = Preferences : : instance ( ) ; <nl> pref - > setPropVisible ( m_state = = VISIBLE ) ; <nl> / / Splitter sizes <nl> - QSplitter * hSplitter = static_cast < QSplitter * > ( parentWidget ( ) ) ; <nl> + auto * hSplitter = static_cast < QSplitter * > ( parentWidget ( ) ) ; <nl> QList < int > sizes ; <nl> if ( m_state = = VISIBLE ) <nl> sizes = hSplitter - > sizes ( ) ; <nl> mmm a / src / gui / properties / proplistdelegate . cpp <nl> ppp b / src / gui / properties / proplistdelegate . cpp <nl> void PropListDelegate : : paint ( QPainter * painter , const QStyleOptionViewItem & opti <nl> <nl> void PropListDelegate : : setEditorData ( QWidget * editor , const QModelIndex & index ) const <nl> { <nl> - QComboBox * combobox = static_cast < QComboBox * > ( editor ) ; <nl> + auto * combobox = static_cast < QComboBox * > ( editor ) ; <nl> / / Set combobox index <nl> switch ( static_cast < BitTorrent : : FilePriority > ( index . data ( ) . toInt ( ) ) ) { <nl> case BitTorrent : : FilePriority : : Ignored : <nl> QWidget * PropListDelegate : : createEditor ( QWidget * parent , const QStyleOptionViewI <nl> if ( index . data ( ) . toInt ( ) = = static_cast < int > ( BitTorrent : : FilePriority : : Mixed ) ) <nl> return nullptr ; <nl> <nl> - QComboBox * editor = new QComboBox ( parent ) ; <nl> + auto * editor = new QComboBox ( parent ) ; <nl> editor - > setFocusPolicy ( Qt : : StrongFocus ) ; <nl> editor - > addItem ( tr ( " Do not download " , " Do not download ( priority ) " ) ) ; <nl> editor - > addItem ( tr ( " Normal " , " Normal ( priority ) " ) ) ; <nl> QWidget * PropListDelegate : : createEditor ( QWidget * parent , const QStyleOptionViewI <nl> <nl> void PropListDelegate : : setModelData ( QWidget * editor , QAbstractItemModel * model , const QModelIndex & index ) const <nl> { <nl> - QComboBox * combobox = static_cast < QComboBox * > ( editor ) ; <nl> + auto * combobox = static_cast < QComboBox * > ( editor ) ; <nl> int value = combobox - > currentIndex ( ) ; <nl> qDebug ( " PropListDelegate : setModelData ( % d ) " , value ) ; <nl> <nl> mmm a / src / gui / rss / articlelistwidget . cpp <nl> ppp b / src / gui / rss / articlelistwidget . cpp <nl> void ArticleListWidget : : checkInvariant ( ) const <nl> QListWidgetItem * ArticleListWidget : : createItem ( RSS : : Article * article ) const <nl> { <nl> Q_ASSERT ( article ) ; <nl> - QListWidgetItem * item = new QListWidgetItem ; <nl> + auto * item = new QListWidgetItem ; <nl> <nl> item - > setData ( Qt : : DisplayRole , article - > title ( ) ) ; <nl> item - > setData ( Qt : : UserRole , reinterpret_cast < quintptr > ( article ) ) ; <nl> mmm a / src / gui / rss / feedlistwidget . cpp <nl> ppp b / src / gui / rss / feedlistwidget . cpp <nl> void FeedListWidget : : dropEvent ( QDropEvent * event ) <nl> <nl> QTreeWidgetItem * FeedListWidget : : createItem ( RSS : : Item * rssItem , QTreeWidgetItem * parentItem ) <nl> { <nl> - QTreeWidgetItem * item = new QTreeWidgetItem ; <nl> + auto * item = new QTreeWidgetItem ; <nl> item - > setData ( 0 , Qt : : DisplayRole , QString ( " % 1 ( % 2 ) " ) . arg ( rssItem - > name ( ) ) . arg ( rssItem - > unreadCount ( ) ) ) ; <nl> item - > setData ( 0 , Qt : : UserRole , reinterpret_cast < quintptr > ( rssItem ) ) ; <nl> m_rssToTreeItemMapping [ rssItem ] = item ; <nl> mmm a / src / gui / scanfoldersdelegate . cpp <nl> ppp b / src / gui / scanfoldersdelegate . cpp <nl> ScanFoldersDelegate : : ScanFoldersDelegate ( QObject * parent , QTreeView * foldersView <nl> <nl> void ScanFoldersDelegate : : setEditorData ( QWidget * editor , const QModelIndex & index ) const <nl> { <nl> - QComboBox * combobox = static_cast < QComboBox * > ( editor ) ; <nl> + auto * combobox = static_cast < QComboBox * > ( editor ) ; <nl> / / Set combobox index <nl> if ( index . data ( Qt : : UserRole ) . toInt ( ) = = ScanFoldersModel : : CUSTOM_LOCATION ) <nl> combobox - > setCurrentIndex ( 4 ) ; / / ' 4 ' is the index of the item after the separator in the QComboBox menu <nl> QWidget * ScanFoldersDelegate : : createEditor ( QWidget * parent , const QStyleOptionVi <nl> { <nl> if ( index . column ( ) ! = ScanFoldersModel : : DOWNLOAD ) return nullptr ; <nl> <nl> - QComboBox * editor = new QComboBox ( parent ) ; <nl> + auto * editor = new QComboBox ( parent ) ; <nl> <nl> editor - > setFocusPolicy ( Qt : : StrongFocus ) ; <nl> editor - > addItem ( ScanFoldersModel : : pathTypeDisplayName ( ScanFoldersModel : : DOWNLOAD_IN_WATCH_FOLDER ) ) ; <nl> QWidget * ScanFoldersDelegate : : createEditor ( QWidget * parent , const QStyleOptionVi <nl> void ScanFoldersDelegate : : comboboxIndexChanged ( int index ) <nl> { <nl> if ( index = = ScanFoldersModel : : CUSTOM_LOCATION ) { <nl> - QWidget * w = static_cast < QWidget * > ( sender ( ) ) ; <nl> + auto * w = static_cast < QWidget * > ( sender ( ) ) ; <nl> if ( w & & w - > parentWidget ( ) ) <nl> w - > parentWidget ( ) - > setFocus ( ) ; <nl> } <nl> void ScanFoldersDelegate : : comboboxIndexChanged ( int index ) <nl> <nl> void ScanFoldersDelegate : : setModelData ( QWidget * editor , QAbstractItemModel * model , const QModelIndex & index ) const <nl> { <nl> - QComboBox * combobox = static_cast < QComboBox * > ( editor ) ; <nl> + auto * combobox = static_cast < QComboBox * > ( editor ) ; <nl> int value = combobox - > currentIndex ( ) ; <nl> <nl> switch ( value ) { <nl> mmm a / src / gui / search / pluginselectdialog . cpp <nl> ppp b / src / gui / search / pluginselectdialog . cpp <nl> void PluginSelectDialog : : loadSupportedSearchPlugins ( ) <nl> <nl> void PluginSelectDialog : : addNewPlugin ( const QString & pluginName ) <nl> { <nl> - QTreeWidgetItem * item = new QTreeWidgetItem ( m_ui - > pluginsTree ) ; <nl> + auto * item = new QTreeWidgetItem ( m_ui - > pluginsTree ) ; <nl> PluginInfo * plugin = m_pluginManager - > pluginInfo ( pluginName ) ; <nl> item - > setText ( PLUGIN_NAME , plugin - > fullName ) ; <nl> item - > setText ( PLUGIN_URL , plugin - > url ) ; <nl> void PluginSelectDialog : : finishPluginUpdate ( ) <nl> <nl> void PluginSelectDialog : : on_installButton_clicked ( ) <nl> { <nl> - PluginSourceDialog * dlg = new PluginSourceDialog ( this ) ; <nl> + auto * dlg = new PluginSourceDialog ( this ) ; <nl> connect ( dlg , & PluginSourceDialog : : askForLocalFile , this , & PluginSelectDialog : : askForLocalPlugin ) ; <nl> connect ( dlg , & PluginSourceDialog : : askForUrl , this , & PluginSelectDialog : : askForPluginUrl ) ; <nl> } <nl> mmm a / src / gui / statusbar . cpp <nl> ppp b / src / gui / statusbar . cpp <nl> StatusBar : : StatusBar ( QWidget * parent ) <nl> BitTorrent : : Session * const session = BitTorrent : : Session : : instance ( ) ; <nl> connect ( session , & BitTorrent : : Session : : speedLimitModeChanged , this , & StatusBar : : updateAltSpeedsBtn ) ; <nl> QWidget * container = new QWidget ( this ) ; <nl> - QHBoxLayout * layout = new QHBoxLayout ( container ) ; <nl> + auto * layout = new QHBoxLayout ( container ) ; <nl> layout - > setContentsMargins ( 0 , 0 , 0 , 0 ) ; <nl> <nl> container - > setLayout ( layout ) ; <nl> mmm a / src / gui / tagfilterwidget . cpp <nl> ppp b / src / gui / tagfilterwidget . cpp <nl> namespace <nl> TagFilterWidget : : TagFilterWidget ( QWidget * parent ) <nl> : QTreeView ( parent ) <nl> { <nl> - TagFilterProxyModel * proxyModel = new TagFilterProxyModel ( this ) ; <nl> + auto * proxyModel = new TagFilterProxyModel ( this ) ; <nl> proxyModel - > setSortCaseSensitivity ( Qt : : CaseInsensitive ) ; <nl> proxyModel - > setSourceModel ( new TagFilterModel ( this ) ) ; <nl> setModel ( proxyModel ) ; <nl> mmm a / src / gui / torrentcontentmodel . cpp <nl> ppp b / src / gui / torrentcontentmodel . cpp <nl> bool TorrentContentModel : : setData ( const QModelIndex & index , const QVariant & valu <nl> return false ; <nl> <nl> if ( ( index . column ( ) = = TorrentContentModelItem : : COL_NAME ) & & ( role = = Qt : : CheckStateRole ) ) { <nl> - TorrentContentModelItem * item = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> + auto * item = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> qDebug ( " setData ( % s , % d " , qUtf8Printable ( item - > name ( ) ) , value . toInt ( ) ) ; <nl> if ( static_cast < int > ( item - > priority ( ) ) ! = value . toInt ( ) ) { <nl> BitTorrent : : FilePriority prio = BitTorrent : : FilePriority : : Normal ; <nl> bool TorrentContentModel : : setData ( const QModelIndex & index , const QVariant & valu <nl> <nl> if ( role = = Qt : : EditRole ) { <nl> Q_ASSERT ( index . isValid ( ) ) ; <nl> - TorrentContentModelItem * item = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> + auto * item = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> switch ( index . column ( ) ) { <nl> case TorrentContentModelItem : : COL_NAME : <nl> item - > setName ( value . toString ( ) ) ; <nl> TorrentContentModelItem : : ItemType TorrentContentModel : : itemType ( const QModelInde <nl> <nl> int TorrentContentModel : : getFileIndex ( const QModelIndex & index ) <nl> { <nl> - TorrentContentModelItem * item = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> + auto * item = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> if ( item - > itemType ( ) = = TorrentContentModelItem : : FileType ) <nl> return static_cast < TorrentContentModelFile * > ( item ) - > fileIndex ( ) ; <nl> <nl> QVariant TorrentContentModel : : data ( const QModelIndex & index , int role ) const <nl> if ( ! index . isValid ( ) ) <nl> return QVariant ( ) ; <nl> <nl> - TorrentContentModelItem * item = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> + auto * item = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> <nl> if ( ( index . column ( ) = = TorrentContentModelItem : : COL_NAME ) & & ( role = = Qt : : DecorationRole ) ) { <nl> if ( item - > itemType ( ) = = TorrentContentModelItem : : FolderType ) <nl> QModelIndex TorrentContentModel : : parent ( const QModelIndex & index ) const <nl> if ( ! index . isValid ( ) ) <nl> return QModelIndex ( ) ; <nl> <nl> - TorrentContentModelItem * childItem = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> + auto * childItem = static_cast < TorrentContentModelItem * > ( index . internalPointer ( ) ) ; <nl> if ( ! childItem ) <nl> return QModelIndex ( ) ; <nl> <nl> mmm a / src / gui / transferlistfilterswidget . cpp <nl> ppp b / src / gui / transferlistfilterswidget . cpp <nl> StatusFilterWidget : : StatusFilterWidget ( QWidget * parent , TransferListWidget * tran <nl> , this , & StatusFilterWidget : : updateTorrentNumbers ) ; <nl> <nl> / / Add status filters <nl> - QListWidgetItem * all = new QListWidgetItem ( this ) ; <nl> + auto * all = new QListWidgetItem ( this ) ; <nl> all - > setData ( Qt : : DisplayRole , QVariant ( tr ( " All ( 0 ) " , " this is for the status filter " ) ) ) ; <nl> all - > setData ( Qt : : DecorationRole , QIcon ( " : / icons / skin / filterall . svg " ) ) ; <nl> - QListWidgetItem * downloading = new QListWidgetItem ( this ) ; <nl> + auto * downloading = new QListWidgetItem ( this ) ; <nl> downloading - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Downloading ( 0 ) " ) ) ) ; <nl> downloading - > setData ( Qt : : DecorationRole , QIcon ( " : / icons / skin / downloading . svg " ) ) ; <nl> - QListWidgetItem * seeding = new QListWidgetItem ( this ) ; <nl> + auto * seeding = new QListWidgetItem ( this ) ; <nl> seeding - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Seeding ( 0 ) " ) ) ) ; <nl> seeding - > setData ( Qt : : DecorationRole , QIcon ( " : / icons / skin / uploading . svg " ) ) ; <nl> - QListWidgetItem * completed = new QListWidgetItem ( this ) ; <nl> + auto * completed = new QListWidgetItem ( this ) ; <nl> completed - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Completed ( 0 ) " ) ) ) ; <nl> completed - > setData ( Qt : : DecorationRole , QIcon ( " : / icons / skin / completed . svg " ) ) ; <nl> - QListWidgetItem * resumed = new QListWidgetItem ( this ) ; <nl> + auto * resumed = new QListWidgetItem ( this ) ; <nl> resumed - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Resumed ( 0 ) " ) ) ) ; <nl> resumed - > setData ( Qt : : DecorationRole , QIcon ( " : / icons / skin / resumed . svg " ) ) ; <nl> - QListWidgetItem * paused = new QListWidgetItem ( this ) ; <nl> + auto * paused = new QListWidgetItem ( this ) ; <nl> paused - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Paused ( 0 ) " ) ) ) ; <nl> paused - > setData ( Qt : : DecorationRole , QIcon ( " : / icons / skin / paused . svg " ) ) ; <nl> - QListWidgetItem * active = new QListWidgetItem ( this ) ; <nl> + auto * active = new QListWidgetItem ( this ) ; <nl> active - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Active ( 0 ) " ) ) ) ; <nl> active - > setData ( Qt : : DecorationRole , QIcon ( " : / icons / skin / filteractive . svg " ) ) ; <nl> - QListWidgetItem * inactive = new QListWidgetItem ( this ) ; <nl> + auto * inactive = new QListWidgetItem ( this ) ; <nl> inactive - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Inactive ( 0 ) " ) ) ) ; <nl> inactive - > setData ( Qt : : DecorationRole , QIcon ( " : / icons / skin / filterinactive . svg " ) ) ; <nl> - QListWidgetItem * errored = new QListWidgetItem ( this ) ; <nl> + auto * errored = new QListWidgetItem ( this ) ; <nl> errored - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Errored ( 0 ) " ) ) ) ; <nl> errored - > setData ( Qt : : DecorationRole , QIcon ( " : / icons / skin / error . svg " ) ) ; <nl> <nl> TrackerFiltersList : : TrackerFiltersList ( QWidget * parent , TransferListWidget * tran <nl> , m_totalTorrents ( 0 ) <nl> , m_downloadTrackerFavicon ( true ) <nl> { <nl> - QListWidgetItem * allTrackers = new QListWidgetItem ( this ) ; <nl> + auto * allTrackers = new QListWidgetItem ( this ) ; <nl> allTrackers - > setData ( Qt : : DisplayRole , QVariant ( tr ( " All ( 0 ) " , " this is for the tracker filter " ) ) ) ; <nl> allTrackers - > setData ( Qt : : DecorationRole , GuiIconProvider : : instance ( ) - > getIcon ( " network - server " ) ) ; <nl> - QListWidgetItem * noTracker = new QListWidgetItem ( this ) ; <nl> + auto * noTracker = new QListWidgetItem ( this ) ; <nl> noTracker - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Trackerless ( 0 ) " ) ) ) ; <nl> noTracker - > setData ( Qt : : DecorationRole , GuiIconProvider : : instance ( ) - > getIcon ( " network - server " ) ) ; <nl> - QListWidgetItem * errorTracker = new QListWidgetItem ( this ) ; <nl> + auto * errorTracker = new QListWidgetItem ( this ) ; <nl> errorTracker - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Error ( 0 ) " ) ) ) ; <nl> errorTracker - > setData ( Qt : : DecorationRole , style ( ) - > standardIcon ( QStyle : : SP_MessageBoxCritical ) ) ; <nl> - QListWidgetItem * warningTracker = new QListWidgetItem ( this ) ; <nl> + auto * warningTracker = new QListWidgetItem ( this ) ; <nl> warningTracker - > setData ( Qt : : DisplayRole , QVariant ( tr ( " Warning ( 0 ) " ) ) ) ; <nl> warningTracker - > setData ( Qt : : DecorationRole , style ( ) - > standardIcon ( QStyle : : SP_MessageBoxWarning ) ) ; <nl> m_trackers . insert ( " " , QStringList ( ) ) ; <nl> TransferListFiltersWidget : : TransferListFiltersWidget ( QWidget * parent , TransferLi <nl> Preferences * const pref = Preferences : : instance ( ) ; <nl> <nl> / / Construct lists <nl> - QVBoxLayout * vLayout = new QVBoxLayout ( this ) ; <nl> - QScrollArea * scroll = new QScrollArea ( this ) ; <nl> + auto * vLayout = new QVBoxLayout ( this ) ; <nl> + auto * scroll = new QScrollArea ( this ) ; <nl> QFrame * frame = new QFrame ( scroll ) ; <nl> - QVBoxLayout * frameLayout = new QVBoxLayout ( frame ) ; <nl> + auto * frameLayout = new QVBoxLayout ( frame ) ; <nl> QFont font ; <nl> font . setBold ( true ) ; <nl> font . setCapitalization ( QFont : : AllUppercase ) ; <nl> TransferListFiltersWidget : : TransferListFiltersWidget ( QWidget * parent , TransferLi <nl> statusLabel - > setFont ( font ) ; <nl> frameLayout - > addWidget ( statusLabel ) ; <nl> <nl> - StatusFilterWidget * statusFilters = new StatusFilterWidget ( this , transferList ) ; <nl> + auto * statusFilters = new StatusFilterWidget ( this , transferList ) ; <nl> frameLayout - > addWidget ( statusFilters ) ; <nl> <nl> QCheckBox * categoryLabel = new QCheckBox ( tr ( " Categories " ) , this ) ; <nl> mmm a / src / gui / transferlistsortmodel . cpp <nl> ppp b / src / gui / transferlistsortmodel . cpp <nl> bool TransferListSortModel : : lessThan ( const QModelIndex & left , const QModelIndex <nl> / / In this case QSortFilterProxyModel : : lessThan ( ) converts other types to QString and <nl> / / sorts them . <nl> / / Thus we can ' t use the code in the default label . <nl> - const BitTorrent : : TorrentState leftValue = left . data ( ) . value < BitTorrent : : TorrentState > ( ) ; <nl> - const BitTorrent : : TorrentState rightValue = right . data ( ) . value < BitTorrent : : TorrentState > ( ) ; <nl> + const auto leftValue = left . data ( ) . value < BitTorrent : : TorrentState > ( ) ; <nl> + const auto rightValue = right . data ( ) . value < BitTorrent : : TorrentState > ( ) ; <nl> if ( leftValue ! = rightValue ) <nl> return leftValue < rightValue ; <nl> <nl> bool TransferListSortModel : : filterAcceptsRow ( int sourceRow , const QModelIndex & s <nl> <nl> bool TransferListSortModel : : matchFilter ( int sourceRow , const QModelIndex & sourceParent ) const <nl> { <nl> - TransferListModel * model = qobject_cast < TransferListModel * > ( sourceModel ( ) ) ; <nl> + auto * model = qobject_cast < TransferListModel * > ( sourceModel ( ) ) ; <nl> if ( ! model ) return false ; <nl> <nl> BitTorrent : : TorrentHandle * const torrent = model - > torrentHandle ( model - > index ( sourceRow , 0 , sourceParent ) ) ; <nl> mmm a / src / gui / transferlistwidget . cpp <nl> ppp b / src / gui / transferlistwidget . cpp <nl> namespace <nl> } <nl> m_checkBoxOffset . setWidth ( layoutPadding . width ( ) ) ; <nl> <nl> - QHBoxLayout * layout = new QHBoxLayout ( this ) ; <nl> + auto * layout = new QHBoxLayout ( this ) ; <nl> layout - > addWidget ( m_checkBox ) ; <nl> layout - > addStretch ( ) ; <nl> layout - > setContentsMargins ( layoutPadding . width ( ) , layoutPadding . height ( ) , layoutPadding . width ( ) , layoutPadding . height ( ) ) ; <nl> mmm a / src / webui / api / appcontroller . cpp <nl> ppp b / src / webui / api / appcontroller . cpp <nl> void AppController : : setPreferencesAction ( ) <nl> if ( m . contains ( " locale " ) ) { <nl> QString locale = m [ " locale " ] . toString ( ) ; <nl> if ( pref - > getLocale ( ) ! = locale ) { <nl> - QTranslator * translator = new QTranslator ; <nl> + auto * translator = new QTranslator ; <nl> if ( translator - > load ( QLatin1String ( " : / lang / qbittorrent_ " ) + locale ) ) { <nl> qDebug ( " % s locale recognized , using translation . " , qUtf8Printable ( locale ) ) ; <nl> - } else { <nl> + } <nl> + else { <nl> qDebug ( " % s locale unrecognized , using default ( en ) . " , qUtf8Printable ( locale ) ) ; <nl> } <nl> qApp - > installTranslator ( translator ) ; <nl>

Use ' auto ' to avoid duplicating the type name

qbittorrent/qBittorrent

d8cbc9266a12446c1a574ff1dc135c8f21413bf4

2019-02-16T16:54:17Z

mmm a / tensorflow / core / grappler / optimizers / BUILD <nl> ppp b / tensorflow / core / grappler / optimizers / BUILD <nl> tf_cc_test ( <nl> srcs = [ " loop_optimizer_test . cc " ] , <nl> tags = [ <nl> " manual " , <nl> - " no_oss " , <nl> - ] , # b / 74111495 <nl> + " no_oss " , # b / 74111495 <nl> + ] , <nl> deps = [ <nl> " : loop_optimizer " , <nl> " / / tensorflow / cc : cc_ops " , <nl>

Fix formatting in grappler / optimizers / BUILD

tensorflow/tensorflow

b253460fd13dcfcf27eca610c5d397ef6ac980d2

2018-03-02T18:37:29Z

mmm a / hphp / hack / src / server / searchServiceRunner . ml <nl> ppp b / hphp / hack / src / server / searchServiceRunner . ml <nl> module SearchServiceRunner = struct <nl> <nl> HackSearchService . MasterApi . update_search_index <nl> ~ fuzzy : ! HackSearchService . fuzzy ( List . map fast fst ) ; <nl> - if ( List . length fast > 0 ) then <nl> - let str = Printf . sprintf " Updating % d search files : " ( List . length fast ) in <nl> - ignore ( Hh_logger . log_duration ( str ) t ) <nl> - else ( ) <nl> + if ( List . length fast > 0 ) then begin <nl> + let str = Printf . sprintf " Updating % d search files : " ( List . length fast ) in <nl> + ignore ( Hh_logger . log_duration ( str ) t ) ; <nl> + if Queue . is_empty queue <nl> + then Hh_logger . log " Done updating search files " <nl> + end <nl> <nl> ( * Completely clears the queue * ) <nl> let run_completely genv = <nl>

Log when done building search indexes

facebook/hhvm

d48673959cdb753b9bfb4edbc63b39f71bf44a2c

2018-05-19T02:46:32Z

mmm a / arangod / Cluster / ClusterInfo . cpp <nl> ppp b / arangod / Cluster / ClusterInfo . cpp <nl> int ClusterInfo : : getResponsibleShard ( LogicalCollection * collInfo , <nl> std : : shared_ptr < std : : vector < std : : string > > shardKeysPtr ; <nl> std : : shared_ptr < std : : vector < ShardID > > shards ; <nl> bool found = false ; <nl> - CollectionID collectionId = collInfo - > planId ( ) ; <nl> + CollectionID collectionId = std : : to_string ( collInfo - > planId ( ) ) ; <nl> <nl> while ( true ) { <nl> { <nl> mmm a / js / common / bootstrap / errors . js <nl> ppp b / js / common / bootstrap / errors . js <nl> <nl> " ERROR_MODULE_FAILURE " : { " code " : 3103 , " message " : " failed to invoke module " } , <nl> " ERROR_NO_SMART_COLLECTION " : { " code " : 4000 , " message " : " collection is not smart " } , <nl> " ERROR_NO_SMART_GRAPH_ATTRIBUTE " : { " code " : 4001 , " message " : " smart graph attribute not given " } , <nl> + " ERROR_CANNOT_DROP_SMART_COLLECTION " : { " code " : 4002 , " message " : " cannot drop this smart collection " } , <nl> " ERROR_DISPATCHER_IS_STOPPING " : { " code " : 21001 , " message " : " dispatcher stopped " } , <nl> " ERROR_QUEUE_UNKNOWN " : { " code " : 21002 , " message " : " named queue does not exist " } , <nl> " ERROR_QUEUE_FULL " : { " code " : 21003 , " message " : " named queue is full " } <nl> mmm a / lib / Basics / voc - errors . cpp <nl> ppp b / lib / Basics / voc - errors . cpp <nl> void TRI_InitializeErrorMessages ( ) { <nl> REG_ERROR ( ERROR_MODULE_FAILURE , " failed to invoke module " ) ; <nl> REG_ERROR ( ERROR_NO_SMART_COLLECTION , " collection is not smart " ) ; <nl> REG_ERROR ( ERROR_NO_SMART_GRAPH_ATTRIBUTE , " smart graph attribute not given " ) ; <nl> + REG_ERROR ( ERROR_CANNOT_DROP_SMART_COLLECTION , " cannot drop this smart collection " ) ; <nl> REG_ERROR ( ERROR_DISPATCHER_IS_STOPPING , " dispatcher stopped " ) ; <nl> REG_ERROR ( ERROR_QUEUE_UNKNOWN , " named queue does not exist " ) ; <nl> REG_ERROR ( ERROR_QUEUE_FULL , " named queue is full " ) ; <nl> mmm a / lib / Basics / voc - errors . h <nl> ppp b / lib / Basics / voc - errors . h <nl> <nl> / / / The requested collection needs to be smart , but it ain ' t <nl> / / / - 4001 : @ LIT { smart graph attribute not given } <nl> / / / The given document does not have the smart graph attribute set . <nl> + / / / - 4002 : @ LIT { cannot drop this smart collection } <nl> + / / / This smart collection cannot be dropped , it dictates sharding in the <nl> + / / / graph . <nl> / / / - 21001 : @ LIT { dispatcher stopped } <nl> / / / Will be returned if a shutdown is in progress . <nl> / / / - 21002 : @ LIT { named queue does not exist } <nl> void TRI_InitializeErrorMessages ( ) ; <nl> <nl> # define TRI_ERROR_NO_SMART_GRAPH_ATTRIBUTE ( 4001 ) <nl> <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + / / / @ brief 4002 : ERROR_CANNOT_DROP_SMART_COLLECTION <nl> + / / / <nl> + / / / cannot drop this smart collection <nl> + / / / <nl> + / / / This smart collection cannot be dropped , it dictates sharding in the graph . <nl> + / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> + <nl> + # define TRI_ERROR_CANNOT_DROP_SMART_COLLECTION ( 4002 ) <nl> + <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> / / / @ brief 21001 : ERROR_DISPATCHER_IS_STOPPING <nl> / / / <nl>

Fixes in collection management .

arangodb/arangodb

4c49853e3ba71a64d8cf94d71309d4631e7ac073

2016-10-09T09:06:26Z

mmm a / tensorflow / tensorboard / scripts / BUILD <nl> ppp b / tensorflow / tensorboard / scripts / BUILD <nl> licenses ( [ " notice " ] ) # Apache 2 . 0 <nl> <nl> exports_files ( [ " LICENSE " ] ) <nl> <nl> - py_binary ( <nl> - name = " serialize_tensorboard " , <nl> - srcs = [ " serialize_tensorboard . py " ] , <nl> - srcs_version = " PY2AND3 " , <nl> - deps = [ <nl> - " / / tensorflow / python : platform " , <nl> - " / / tensorflow / python : summary " , <nl> - " / / tensorflow / tensorboard / backend : application " , <nl> - " @ six_archive / / : six " , <nl> - ] , <nl> - ) <nl> - <nl> py_binary ( <nl> name = " generate_testdata " , <nl> srcs = [ " generate_testdata . py " ] , <nl> deleted file mode 100644 <nl> index c52a7f5158460 . . 0000000000000 <nl> mmm a / tensorflow / tensorboard / scripts / serialize_tensorboard . py <nl> ppp / dev / null <nl> <nl> - # Copyright 2015 The TensorFlow Authors . All Rights Reserved . <nl> - # <nl> - # Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> - # you may not use this file except in compliance with the License . <nl> - # You may obtain a copy of the License at <nl> - # <nl> - # http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> - # <nl> - # Unless required by applicable law or agreed to in writing , software <nl> - # distributed under the License is distributed on an " AS IS " BASIS , <nl> - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> - # See the License for the specific language governing permissions and <nl> - # limitations under the License . <nl> - # = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> - " " " Consume and serialize all of the data from a running TensorBoard instance . <nl> - <nl> - This program connects to a live TensorBoard backend at given port , and saves <nl> - all of the data to local disk JSON in a predictable format . <nl> - <nl> - This makes it easy to mock out the TensorBoard backend so that the frontend <nl> - may be tested in isolation . <nl> - " " " <nl> - <nl> - from __future__ import absolute_import <nl> - from __future__ import division <nl> - from __future__ import print_function <nl> - <nl> - import json <nl> - import os <nl> - import os . path <nl> - import shutil <nl> - import threading <nl> - import urllib <nl> - <nl> - import six <nl> - from six . moves import http_client <nl> - <nl> - from tensorflow . python . platform import app <nl> - from tensorflow . python . platform import flags <nl> - from tensorflow . python . platform import tf_logging <nl> - from tensorflow . python . summary import event_multiplexer <nl> - from tensorflow . tensorboard . backend import server <nl> - <nl> - tf . flags . DEFINE_string ( ' logdir ' , None , " " " the logdir to pass to the TensorBoard <nl> - backend ; data will be read from this logdir for serialization . " " " ) <nl> - <nl> - tf . flags . DEFINE_string ( ' target ' , None , " " " The directoy where serialized data <nl> - will be written " " " ) <nl> - <nl> - flags . DEFINE_boolean ( ' overwrite ' , False , " " " Whether to remove and overwrite <nl> - TARGET if it already exists . " " " ) <nl> - <nl> - flags . DEFINE_boolean ( ' purge_orphaned_data ' , True , ' Whether to purge data that ' <nl> - ' may have been orphaned due to TensorBoard restarts . ' <nl> - ' Disabling purge_orphaned_data can be used to debug data ' <nl> - ' disappearance . ' ) <nl> - FLAGS = tf . flags . FLAGS <nl> - <nl> - BAD_CHARACTERS = " # % & { } \ \ / < > * ? $ ! ' \ " : @ + ` | = " <nl> - DEFAULT_SUFFIX = ' . json ' <nl> - IMAGE_SUFFIX = ' . png ' <nl> - AUDIO_SUFFIX = ' . wav ' <nl> - GRAPH_SUFFIX = ' . pbtxt ' <nl> - <nl> - <nl> - def Url ( route , params ) : <nl> - " " " Takes route and query params , and produce encoded url for that asset . " " " <nl> - out = route <nl> - if params : <nl> - # sorting ensures a unique filename for each query <nl> - sorted_params = sorted ( six . iteritems ( params ) ) <nl> - out + = ' ? ' + urllib . urlencode ( sorted_params ) <nl> - return out <nl> - <nl> - <nl> - def Clean ( s ) : <nl> - " " " Clean a string so it can be used as a filepath . " " " <nl> - for c in BAD_CHARACTERS : <nl> - s = s . replace ( c , ' _ ' ) <nl> - return s <nl> - <nl> - <nl> - class TensorBoardStaticSerializer ( object ) : <nl> - " " " Serialize all the routes from a TensorBoard server to static json . " " " <nl> - <nl> - def __init__ ( self , connection , target_path ) : <nl> - self . connection = connection <nl> - EnsureDirectoryExists ( target_path ) <nl> - self . path = target_path <nl> - <nl> - def GetAndSave ( self , url , save_suffix ) : <nl> - " " " GET the given url . Serialize the result at clean path version of url . " " " <nl> - self . connection . request ( <nl> - ' GET ' , ' / data / ' + url , headers = { ' content - type ' : ' text / plain ' } ) <nl> - response = self . connection . getresponse ( ) <nl> - file_name = Clean ( url ) + save_suffix <nl> - destination = os . path . join ( self . path , file_name ) <nl> - <nl> - if response . status ! = 200 : <nl> - raise IOError ( url ) <nl> - <nl> - content = response . read ( ) <nl> - <nl> - with open ( destination , ' w ' ) as f : <nl> - f . write ( content ) <nl> - return content <nl> - <nl> - def GetRouteAndSave ( self , route , params = None ) : <nl> - " " " GET given route and params . Serialize the result . Return as JSON . " " " <nl> - url = Url ( route , params ) <nl> - return json . loads ( self . GetAndSave ( url , DEFAULT_SUFFIX ) ) <nl> - <nl> - def Run ( self ) : <nl> - " " " Serialize everything from a TensorBoard backend . " " " <nl> - # get the runs object , which is an index for every tag . <nl> - runs = self . GetRouteAndSave ( ' runs ' ) <nl> - <nl> - # collect sampled data . <nl> - self . GetRouteAndSave ( ' scalars ' ) <nl> - <nl> - # now let ' s just download everything ! <nl> - for run , tag_type_to_tags in six . iteritems ( runs ) : <nl> - for tag_type , tags in six . iteritems ( tag_type_to_tags ) : <nl> - try : <nl> - if tag_type = = ' graph ' : <nl> - # in this case , tags is a bool which specifies if graph is present . <nl> - if tags : <nl> - url = Url ( ' graph ' , { ' run ' : run } ) <nl> - self . GetAndSave ( url , GRAPH_SUFFIX ) <nl> - elif tag_type = = ' images ' : <nl> - for t in tags : <nl> - images = self . GetRouteAndSave ( ' images ' , { ' run ' : run , ' tag ' : t } ) <nl> - for im in images : <nl> - url = ' individualImage ? ' + im [ ' query ' ] <nl> - # pull down the images themselves . <nl> - self . GetAndSave ( url , IMAGE_SUFFIX ) <nl> - elif tag_type = = ' audio ' : <nl> - for t in tags : <nl> - audio = self . GetRouteAndSave ( ' audio ' , { ' run ' : run , ' tag ' : t } ) <nl> - for snd in audio : <nl> - url = ' individualAudio ? ' + snd [ ' query ' ] <nl> - # pull down the audio clips themselves <nl> - self . GetAndSave ( url , AUDIO_SUFFIX ) <nl> - elif tag_type = = ' run_metadata ' : <nl> - for t in tags : <nl> - url = Url ( ' run_metadata ' , { ' run ' : run , ' tag ' : t } ) <nl> - self . GetAndSave ( url , GRAPH_SUFFIX ) <nl> - elif tag_type = = ' firstEventTimestamp ' : <nl> - pass <nl> - else : <nl> - for t in tags : <nl> - # Save this , whatever it is : ) <nl> - self . GetRouteAndSave ( tag_type , { ' run ' : run , ' tag ' : t } ) <nl> - except IOError as e : <nl> - x = Exception ( ' Retrieval failed for % s / % s / % s ' % ( tag_type , run , tags ) ) <nl> - six . raise_from ( x , e ) <nl> - <nl> - <nl> - def EnsureDirectoryExists ( path ) : <nl> - if not os . path . exists ( path ) : <nl> - os . makedirs ( path ) <nl> - <nl> - <nl> - def PrintAndLog ( msg , lvl = tf_logging . INFO ) : <nl> - tf_logging . log ( lvl , msg ) <nl> - print ( msg ) <nl> - <nl> - <nl> - def main ( unused_argv = None ) : <nl> - target = FLAGS . target <nl> - logdir = FLAGS . logdir <nl> - if not target or not logdir : <nl> - PrintAndLog ( ' Both - - target and - - logdir are required . ' , tf_logging . ERROR ) <nl> - return - 1 <nl> - if os . path . exists ( target ) : <nl> - if FLAGS . overwrite : <nl> - if os . path . isdir ( target ) : <nl> - shutil . rmtree ( target ) <nl> - else : <nl> - os . remove ( target ) <nl> - else : <nl> - PrintAndLog ( ' Refusing to overwrite target % s without - - overwrite ' % <nl> - target , tf_logging . ERROR ) <nl> - return - 2 <nl> - path_to_run = server . ParseEventFilesSpec ( FLAGS . logdir ) <nl> - <nl> - PrintAndLog ( ' About to load Multiplexer . This may take some time . ' ) <nl> - multiplexer = event_multiplexer . EventMultiplexer ( <nl> - size_guidance = server . TENSORBOARD_SIZE_GUIDANCE , <nl> - purge_orphaned_data = FLAGS . purge_orphaned_data ) <nl> - server . ReloadMultiplexer ( multiplexer , path_to_run ) <nl> - <nl> - PrintAndLog ( ' Multiplexer load finished . Starting TensorBoard server . ' ) <nl> - s = server . BuildServer ( multiplexer , ' localhost ' , 0 , logdir ) <nl> - server_thread = threading . Thread ( target = s . serve_forever ) <nl> - server_thread . daemon = True <nl> - server_thread . start ( ) <nl> - connection = http_client . HTTPConnection ( ' localhost ' , s . server_address [ 1 ] ) <nl> - <nl> - PrintAndLog ( ' Server setup ! Downloading data from the server . ' ) <nl> - x = TensorBoardStaticSerializer ( connection , target ) <nl> - x . Run ( ) <nl> - <nl> - PrintAndLog ( ' Done downloading data . ' ) <nl> - connection . close ( ) <nl> - s . shutdown ( ) <nl> - s . server_close ( ) <nl> - <nl> - <nl> - if __name__ = = ' __main__ ' : <nl> - app . run ( ) <nl>

Remove serialize_tensorboard script and TensorBoard demo - instance support .

tensorflow/tensorflow

d97706437932443ae22082ada49d3ac054b77304

2017-01-25T04:25:42Z

mmm a / src / lang / qbittorrent_de . ts <nl> ppp b / src / lang / qbittorrent_de . ts <nl> <nl> - < ? xml version = " 1 . 0 " encoding = " utf - 8 " ? > <nl> - < ! DOCTYPE TS > <nl> - < TS version = " 2 . 0 " language = " de " > <nl> + < ? xml version = " 1 . 0 " ? > < ! DOCTYPE TS > < TS language = " de " version = " 2 . 0 " > <nl> < context > <nl> < name > AboutDlg < / name > <nl> < message > <nl> <nl> < translation > Info < / translation > <nl> < / message > <nl> < message utf8 = " true " > <nl> + < location filename = " . . / about . ui " line = " 105 " / > <nl> < source > & lt ; ! DOCTYPE HTML PUBLIC & quot ; - / / W3C / / DTD HTML 4 . 0 / / EN & quot ; & quot ; http : / / www . w3 . org / TR / REC - html40 / strict . dtd & quot ; & gt ; <nl> & lt ; html & gt ; & lt ; head & gt ; & lt ; meta name = & quot ; qrichtext & quot ; content = & quot ; 1 & quot ; / & gt ; & lt ; style type = & quot ; text / css & quot ; & gt ; <nl> p , li { white - space : pre - wrap ; } <nl> - & lt ; / style & gt ; & lt ; / head & gt ; & lt ; body style = & quot ; font - family : & apos ; Sans & apos ; ; font - size : 10pt ; font - weight : 400 ; font - style : normal ; & quot ; & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; A Bittorrent client programmed in C + + , based on Qt4 toolkit & lt ; / span & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; and libtorrent - rasterbar . & lt ; br / & gt ; & lt ; br / & gt ; Copyright © 2006 - 2010 Christophe Dumez & lt ; br / & gt ; & lt ; br / & gt ; & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Home Page : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / www . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / www . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; br / & gt ; & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Forum : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / forum . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / forum . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; IRC : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; # qbittorrent on Freenode & lt ; / span & gt ; & lt ; / p & gt ; & lt ; / body & gt ; & lt ; / html & gt ; < / source > <nl> - < translation type = " obsolete " > & lt ; ! DOCTYPE HTML PUBLIC & quot ; - / / W3C / / DTD HTML 4 . 0 / / EN & quot ; & quot ; http : / / www . w3 . org / TR / REC - html40 / strict . dtd & quot ; & gt ; <nl> - & lt ; html & gt ; & lt ; head & gt ; & lt ; meta name = & quot ; qrichtext & quot ; content = & quot ; 1 & quot ; / & gt ; & lt ; style type = & quot ; text / css & quot ; & gt ; <nl> - p , li { white - space : pre - wrap ; } <nl> - & lt ; / style & gt ; & lt ; / head & gt ; & lt ; body style = & quot ; font - family : & apos ; Sans & apos ; ; font - size : 10pt ; font - weight : 400 ; font - style : normal ; & quot ; & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; Ein Bittorrent Client programmiert in C + + , basierend auf dem Qt4 Toolkit & lt ; / span & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; und libtorrent - rasterbar . & lt ; br / & gt ; & lt ; br / & gt ; Copyright © 2006 - 2010 Christophe Dumez & lt ; br / & gt ; & lt ; br / & gt ; & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Home Page : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / www . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / www . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; br / & gt ; & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Forum : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / forum . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / forum . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; IRC : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; # qbittorrent auf Freenode & lt ; / span & gt ; & lt ; / p & gt ; & lt ; / body & gt ; & lt ; / html & gt ; < / translation > <nl> + & lt ; / style & gt ; & lt ; / head & gt ; & lt ; body style = & quot ; font - family : ' Lucida Grande ' ; font - size : 13pt ; font - weight : 400 ; font - style : normal ; & quot ; & gt ; <nl> + & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; An advanced BitTorrent client programmed in C + + , based on Qt4 toolkit and libtorrent - rasterbar . & lt ; br / & gt ; & lt ; br / & gt ; Copyright Β © 2006 - 2013 The qBittorrent project & lt ; br / & gt ; & lt ; br / & gt ; Home Page : & lt ; a href = & quot ; http : / / www . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / www . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> + & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; Bug Tracker : & lt ; a href = & quot ; http : / / bugs . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / bugs . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; br / & gt ; Forum : & lt ; a href = & quot ; http : / / forum . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / forum . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> + & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; IRC : # qbittorrent on Freenode & lt ; / p & gt ; & lt ; / body & gt ; & lt ; / html & gt ; < / source > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / about . ui " line = " 134 " / > <nl> p , li { white - space : pre - wrap ; } <nl> < source > E - mail : < / source > <nl> < translation > E - mail : < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Christophe Dumez < / source > <nl> - < translation type = " obsolete " > Christophe Dumez < / translation > <nl> - < / message > <nl> - < message utf8 = " true " > <nl> - < source > & lt ; ! DOCTYPE HTML PUBLIC & quot ; - / / W3C / / DTD HTML 4 . 0 / / EN & quot ; & quot ; http : / / www . w3 . org / TR / REC - html40 / strict . dtd & quot ; & gt ; <nl> - & lt ; html & gt ; & lt ; head & gt ; & lt ; meta name = & quot ; qrichtext & quot ; content = & quot ; 1 & quot ; / & gt ; & lt ; style type = & quot ; text / css & quot ; & gt ; <nl> - p , li { white - space : pre - wrap ; } <nl> - & lt ; / style & gt ; & lt ; / head & gt ; & lt ; body style = & quot ; font - family : & apos ; Ubuntu & apos ; ; font - size : 10pt ; font - weight : 400 ; font - style : normal ; & quot ; & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; An advanced BitTorrent client programmed in C + + , based on Qt4 toolkit and libtorrent - rasterbar . & lt ; br / & gt ; & lt ; br / & gt ; Copyright © 2006 - 2011 Christophe Dumez & lt ; br / & gt ; & lt ; br / & gt ; & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Home Page : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / www . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; Sans & apos ; ; text - decoration : underline ; color : # 0057ae ; & quot ; & gt ; http : / / www . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Bug Tracker : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / bugs . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0057ae ; & quot ; & gt ; http : / / bugs . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; br / & gt ; & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Forum : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / forum . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; Sans & apos ; ; text - decoration : underline ; color : # 0057ae ; & quot ; & gt ; http : / / forum . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; IRC : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; # qbittorrent on Freenode & lt ; / span & gt ; & lt ; / p & gt ; & lt ; / body & gt ; & lt ; / html & gt ; < / source > <nl> - < translation type = " obsolete " > & lt ; ! DOCTYPE HTML PUBLIC & quot ; - / / W3C / / DTD HTML 4 . 0 / / EN & quot ; & quot ; http : / / www . w3 . org / TR / REC - html40 / strict . dtd & quot ; & gt ; <nl> - & lt ; html & gt ; & lt ; head & gt ; & lt ; meta name = & quot ; qrichtext & quot ; content = & quot ; 1 & quot ; / & gt ; & lt ; style type = & quot ; text / css & quot ; & gt ; <nl> - p , li { white - space : pre - wrap ; } <nl> - & lt ; / style & gt ; & lt ; / head & gt ; & lt ; body style = & quot ; font - family : & apos ; Ubuntu & apos ; ; font - size : 10pt ; font - weight : 400 ; font - style : normal ; & quot ; & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; Ein fortschrittlicher BitTorrent Client programmiert in C + + , basierend auf dem Qt4 Toolkit und libtorrent - rasterbar . & lt ; br / & gt ; & lt ; br / & gt ; Copyright © 2006 - 2011 Christophe Dumez & lt ; br / & gt ; & lt ; br / & gt ; & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Home Page : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / www . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; Sans & apos ; ; text - decoration : underline ; color : # 0057ae ; & quot ; & gt ; http : / / www . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Bug Tracker : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / bugs . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0057ae ; & quot ; & gt ; http : / / bugs . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; br / & gt ; & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; Forum : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; & lt ; / span & gt ; & lt ; a href = & quot ; http : / / forum . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; Sans & apos ; ; text - decoration : underline ; color : # 0057ae ; & quot ; & gt ; http : / / forum . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; text - decoration : underline ; & quot ; & gt ; IRC : & lt ; / span & gt ; & lt ; span style = & quot ; font - family : & apos ; DejaVu Sans & apos ; ; & quot ; & gt ; # qbittorrent on Freenode & lt ; / span & gt ; & lt ; / p & gt ; & lt ; / body & gt ; & lt ; / html & gt ; < / translation > <nl> - < / message > <nl> - < message utf8 = " true " > <nl> - < location filename = " . . / about . ui " line = " 105 " / > <nl> - < source > & lt ; ! DOCTYPE HTML PUBLIC & quot ; - / / W3C / / DTD HTML 4 . 0 / / EN & quot ; & quot ; http : / / www . w3 . org / TR / REC - html40 / strict . dtd & quot ; & gt ; <nl> - & lt ; html & gt ; & lt ; head & gt ; & lt ; meta name = & quot ; qrichtext & quot ; content = & quot ; 1 & quot ; / & gt ; & lt ; style type = & quot ; text / css & quot ; & gt ; <nl> - p , li { white - space : pre - wrap ; } <nl> - & lt ; / style & gt ; & lt ; / head & gt ; & lt ; body style = & quot ; font - family : & apos ; Lucida Grande & apos ; ; font - size : 13pt ; font - weight : 400 ; font - style : normal ; & quot ; & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; An advanced BitTorrent client programmed in C + + , based on Qt4 toolkit and libtorrent - rasterbar . & lt ; br / & gt ; & lt ; br / & gt ; Copyright Β © 2006 - 2013 The qBittorrent project & lt ; br / & gt ; & lt ; br / & gt ; Home Page : & lt ; a href = & quot ; http : / / www . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / www . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; Bug Tracker : & lt ; a href = & quot ; http : / / bugs . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / bugs . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; br / & gt ; Forum : & lt ; a href = & quot ; http : / / forum . qbittorrent . org & quot ; & gt ; & lt ; span style = & quot ; text - decoration : underline ; color : # 0000ff ; & quot ; & gt ; http : / / forum . qbittorrent . org & lt ; / span & gt ; & lt ; / a & gt ; & lt ; / p & gt ; <nl> - & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; IRC : # qbittorrent on Freenode & lt ; / p & gt ; & lt ; / body & gt ; & lt ; / html & gt ; < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / about . ui " line = " 190 " / > <nl> - < source > France < / source > <nl> - < translation > Frankreich < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / about . ui " line = " 268 " / > <nl> < source > Greece < / source > <nl> - < translation type = " unfinished " > Griechenland < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / about . ui " line = " 347 " / > <nl> < source > Current maintainer < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / about . ui " line = " 360 " / > <nl> < source > Original author < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / about . ui " line = " 384 " / > <nl> - < source > Translation < / source > <nl> - < translation > Übersetzung < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / about . ui " line = " 401 " / > <nl> - < source > License < / source > <nl> - < translation > Lizenz < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / about . ui " line = " 414 " / > <nl> p , li { white - space : pre - wrap ; } <nl> < translation > Diese Version von qBittorrent basiert auf folgenden Bibliotheken : < / translation > <nl> < / message > <nl> < message > <nl> - < source > & lt ; h3 & gt ; & lt ; b & gt ; qBittorrent & lt ; / b & gt ; & lt ; / h3 & gt ; < / source > <nl> - < translation type = " obsolete " > & lt ; h3 & gt ; & lt ; b & gt ; qBittorrent & lt ; / b & gt ; & lt ; / h3 & gt ; < / translation > <nl> + < location filename = " . . / about . ui " line = " 190 " / > <nl> + < source > France < / source > <nl> + < translation > Frankreich < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / about . ui " line = " 384 " / > <nl> + < source > Translation < / source > <nl> + < translation > Übersetzung < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / about . ui " line = " 401 " / > <nl> + < source > License < / source > <nl> + < translation > Lizenz < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / about . ui " line = " 371 " / > <nl> p , li { white - space : pre - wrap ; } <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 29 " / > <nl> < source > Save as < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 45 " / > <nl> < source > Set as default save path < / source > <nl> - < translation type = " unfinished " > Als Standard Pfeicherpfad setzen < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 55 " / > <nl> < source > Never show again < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 72 " / > <nl> < source > Torrent settings < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 78 " / > <nl> < source > Start torrent < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 90 " / > <nl> < source > Label : < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 109 " / > <nl> < source > Skip hash check < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 119 " / > <nl> < source > Torrent Information < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 127 " / > <nl> < source > Size : < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 141 " / > <nl> < source > Comment : < / source > <nl> - < translation type = " unfinished " > Kommentar : < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 155 " / > <nl> < source > Date : < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 217 " / > <nl> < source > Normal < / source > <nl> - < translation type = " unfinished " > Normal < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 222 " / > <nl> < source > High < / source > <nl> - < translation type = " unfinished " > Hoch < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 227 " / > <nl> < source > Maximum < / source > <nl> - < translation type = " unfinished " > Maximum < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . ui " line = " 232 " / > <nl> < source > Do not download < / source > <nl> - < translation type = " unfinished " > Nicht herunterladen < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 71 " / > <nl> < source > Other . . . < / source > <nl> < comment > Other save path . . . < / comment > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 169 " / > <nl> < source > I / O Error < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 169 " / > <nl> < source > The torrent file does not exist . < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 177 " / > <nl> < source > Invalid torrent < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 177 " / > <nl> < source > Failed to load the torrent : % 1 < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 187 " / > <nl> < source > Not available < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 246 " / > <nl> < source > Invalid magnet link < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 246 " / > <nl> < source > This magnet link was not recognized < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 252 " / > <nl> < source > Magnet link < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 318 " / > <nl> < source > Disk space : % 1 < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 336 " / > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 343 " / > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 345 " / > <nl> < source > Choose save path < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 397 " / > <nl> < source > Rename the file < / source > <nl> - < translation type = " unfinished " > Datei umbenennen < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 398 " / > <nl> < source > New name : < / source > <nl> - < translation type = " unfinished " > Neuer Name : < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 402 " / > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 428 " / > <nl> < source > The file could not be renamed < / source > <nl> - < translation type = " unfinished " > Die Datei konnte nicht umbenannt werden < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 403 " / > <nl> < source > This file name contains forbidden characters , please choose a different one . < / source > <nl> - < translation type = " unfinished " > Der Dateiname enthält ungültige Zeichen , bitte einen anderen wählen . < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 429 " / > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 464 " / > <nl> < source > This name is already in use in this folder . Please use a different name . < / source > <nl> - < translation type = " unfinished " > Der Dateiname wird in diesem Verzeichnis bereits verwendet . Bitte anderen wählen . < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 463 " / > <nl> < source > The folder could not be renamed < / source > <nl> - < translation type = " unfinished " > Das Verzeichnis konnte nicht umbenannt werden < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 522 " / > <nl> < source > Rename . . . < / source > <nl> - < translation type = " unfinished " > Umbenennen . . . < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / addnewtorrentdialog . cpp " line = " 526 " / > <nl> < source > Priority < / source > <nl> - < translation type = " unfinished " > Priorität < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> < name > AdvancedSettings < / name > <nl> - < message > <nl> - < source > Property < / source > <nl> - < translation type = " obsolete " > Eigenschaft < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Value < / source > <nl> - < translation type = " obsolete " > Wert < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / advancedsettings . h " line = " 184 " / > <nl> < source > Disk write cache size < / source > <nl> p , li { white - space : pre - wrap ; } <nl> < message > <nl> < location filename = " . . / preferences / advancedsettings . h " line = " 173 " / > <nl> < source > MiB < / source > <nl> - < translation > < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / advancedsettings . h " line = " 59 " / > <nl> - < source > Setting < / source > <nl> - < translation > Einstellung < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / advancedsettings . h " line = " 59 " / > <nl> - < source > Value < / source > <nl> - < comment > Value set for this setting < / comment > <nl> - < translation > Wert < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / advancedsettings . h " line = " 171 " / > <nl> - < source > ( auto ) < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / advancedsettings . h " line = " 190 " / > <nl> - < source > s < / source > <nl> - < comment > seconds < / comment > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / advancedsettings . h " line = " 191 " / > <nl> - < source > Disk cache expiry interval < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / advancedsettings . h " line = " 197 " / > <nl> p , li { white - space : pre - wrap ; } <nl> < source > Outgoing ports ( Max ) [ 0 : Disabled ] < / source > <nl> < translation > Ausgehende Ports ( Max ) [ 0 : Deaktiviert ] < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / advancedsettings . h " line = " 205 " / > <nl> - < source > Ignore transfer limits on local network < / source > <nl> - < translation > Transferlimits im lokalen Netzwerk ignorieren < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / advancedsettings . h " line = " 276 " / > <nl> - < source > Exchange trackers with other peers < / source > <nl> - < translation > Tracker mit anderen Peers ausstauschen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / advancedsettings . h " line = " 279 " / > <nl> - < source > Always announce to all trackers < / source > <nl> - < translation > Immer alle Tracker ansagen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Include TCP / IP overhead in transfer limits < / source > <nl> - < translation type = " obsolete " > TCP / IP Overhead in Transferlimits einbeziehen < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / advancedsettings . h " line = " 208 " / > <nl> < source > Recheck torrents on completion < / source > <nl> p , li { white - space : pre - wrap ; } <nl> < location filename = " . . / preferences / advancedsettings . h " line = " 213 " / > <nl> < source > ms < / source > <nl> < comment > milliseconds < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / advancedsettings . h " line = " 59 " / > <nl> + < source > Setting < / source > <nl> + < translation > Einstellung < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / advancedsettings . h " line = " 59 " / > <nl> + < source > Value < / source > <nl> + < comment > Value set for this setting < / comment > <nl> + < translation > Wert < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / advancedsettings . h " line = " 171 " / > <nl> + < source > ( auto ) < / source > <nl> + < translation type = " unfinished " / > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / advancedsettings . h " line = " 190 " / > <nl> + < source > s < / source > <nl> + < comment > seconds < / comment > <nl> + < translation type = " unfinished " / > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / advancedsettings . h " line = " 191 " / > <nl> + < source > Disk cache expiry interval < / source > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / advancedsettings . h " line = " 217 " / > <nl> p , li { white - space : pre - wrap ; } <nl> < source > Network Interface ( requires restart ) < / source > <nl> < translation > Netzwerk Interface ( Neustart benötigt ) < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / advancedsettings . h " line = " 276 " / > <nl> + < source > Exchange trackers with other peers < / source > <nl> + < translation > Tracker mit anderen Peers ausstauschen < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / advancedsettings . h " line = " 279 " / > <nl> + < source > Always announce to all trackers < / source > <nl> + < translation > Immer alle Tracker ansagen < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / preferences / advancedsettings . h " line = " 230 " / > <nl> < source > Any interface < / source > <nl> p , li { white - space : pre - wrap ; } <nl> < source > Display program on - screen notifications < / source > <nl> < translation > Bildschirm - Benachrichtigungen anzeigen < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Display program notification balloons < / source > <nl> - < translation type = " obsolete " > Zeige Benachrichtigungssprechblasen < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / advancedsettings . h " line = " 257 " / > <nl> < source > Enable embedded tracker < / source > <nl> p , li { white - space : pre - wrap ; } <nl> < source > Confirm torrent deletion < / source > <nl> < translation > Löschen des Torrents bestätigen < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / advancedsettings . h " line = " 205 " / > <nl> + < source > Ignore transfer limits on local network < / source > <nl> + < translation > Transferlimits im lokalen Netzwerk ignorieren < / translation > <nl> + < / message > <nl> < / context > <nl> < context > <nl> < name > AutomatedRssDownloader < / name > <nl> p , li { white - space : pre - wrap ; } <nl> < source > Export . . . < / source > <nl> < translation > Export . . . < / translation > <nl> < / message > <nl> - < message > <nl> - < source > . . . < / source > <nl> - < translation type = " obsolete " > . . . < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / rss / automatedrssdownloader . ui " line = " 233 " / > <nl> < source > Assign label : < / source > <nl> p , li { white - space : pre - wrap ; } <nl> < message > <nl> < location filename = " . . / rss / automatedrssdownloader . cpp " line = " 312 " / > <nl> < source > Please type the name of the new download rule . < / source > <nl> - < translation type = " unfinished " > Bitte geben Sie einen neuen Namen für die Downloadregel ein . < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / rss / automatedrssdownloader . cpp " line = " 316 " / > <nl> p , li { white - space : pre - wrap ; } <nl> < message > <nl> < location filename = " . . / rss / automatedrssdownloader . cpp " line = " 393 " / > <nl> < source > Add new rule . . . < / source > <nl> - < translation type = " unfinished " > Neue Regel hinzufügen . . . < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / rss / automatedrssdownloader . cpp " line = " 399 " / > <nl> p , li { white - space : pre - wrap ; } <nl> < message > <nl> < location filename = " . . / rss / automatedrssdownloader . cpp " line = " 401 " / > <nl> < source > Rename rule . . . < / source > <nl> - < translation type = " unfinished " > Regel umbenennen . . . < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / rss / automatedrssdownloader . cpp " line = " 403 " / > <nl> p , li { white - space : pre - wrap ; } <nl> < / message > <nl> < / context > <nl> < context > <nl> - < name > Bittorrent < / name > <nl> - < message > <nl> - < source > % 1 reached the maximum ratio you set . < / source > <nl> - < translation type = " obsolete " > % 1 hat das gesetzte maximale Verhältnis erreicht . < / translation > <nl> - < / message > <nl> + < name > CookiesDlg < / name > <nl> < message > <nl> - < source > Removing torrent % 1 . . . < / source > <nl> - < translation type = " obsolete " > Entferne Torrent % 1 . . . < / translation > <nl> + < location filename = " . . / rss / cookiesdlg . ui " line = " 14 " / > <nl> + < source > Cookies management < / source > <nl> + < translation > Cookie Verwaltung < / translation > <nl> < / message > <nl> < message > <nl> - < source > Pausing torrent % 1 . . . < / source > <nl> - < translation type = " obsolete " > Pausiere Torret % 1 . . . < / translation > <nl> + < location filename = " . . / rss / cookiesdlg . ui " line = " 36 " / > <nl> + < source > Key < / source > <nl> + < extracomment > As in Key / Value pair < / extracomment > <nl> + < translation > Schlüssel < / translation > <nl> < / message > <nl> < message > <nl> - < source > qBittorrent is bound to port : TCP / % 1 < / source > <nl> - < comment > e . g : qBittorrent is bound to port : 6881 < / comment > <nl> - < translation type = " obsolete " > qBittorrent lauscht auf Port : TCP / % 1 < / translation > <nl> + < location filename = " . . / rss / cookiesdlg . ui " line = " 41 " / > <nl> + < source > Value < / source > <nl> + < extracomment > As in Key / Value pair < / extracomment > <nl> + < translation > Wert < / translation > <nl> < / message > <nl> < message > <nl> - < source > UPnP support [ ON ] < / source > <nl> - < translation type = " obsolete " > UPNP Unterstützung [ EIN ] < / translation > <nl> + < location filename = " . . / rss / cookiesdlg . cpp " line = " 48 " / > <nl> + < source > Common keys for cookies are : ' % 1 ' , ' % 2 ' . <nl> + You should get this information from your Web browser preferences . < / source > <nl> + < translation > Gängige Schlüssel für Cookies sind : & apos ; % 1 & apos ; , & apos ; % 2 & apos ; . <nl> + Sie sollten diese Information aus den Voreinstellungen Ihres Webbrowsers erhalten . < / translation > <nl> < / message > <nl> + < / context > <nl> + < context > <nl> + < name > DNSUpdater < / name > <nl> < message > <nl> - < source > UPnP support [ OFF ] < / source > <nl> - < translation type = " obsolete " > UPnP Unterstützung [ AUS ] < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 178 " / > <nl> + < source > Your dynamic DNS was successfully updated . < / source > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> - < source > NAT - PMP support [ ON ] < / source > <nl> - < translation type = " obsolete " > NAT - PMP Unterstützung [ EIN ] < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 182 " / > <nl> + < source > Dynamic DNS error : The service is temporarily unavailable , it will be retried in 30 minutes . < / source > <nl> + < translation > Dynamischer DNS Fehler : Der Dienst ist vorübergehend nicht erreichbar . Ein neuer Versuch wird in 30 Sekunden gestartet . < / translation > <nl> < / message > <nl> < message > <nl> - < source > NAT - PMP support [ OFF ] < / source > <nl> - < translation type = " obsolete " > NAT - PMP Unterstützung [ AUS ] < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 192 " / > <nl> + < source > Dynamic DNS error : hostname supplied does not exist under specified account . < / source > <nl> + < translation > Dynamischer DNS Fehler : Der Hostname existiert nicht für den angegebenen Account . < / translation > <nl> < / message > <nl> < message > <nl> - < source > HTTP user agent is % 1 < / source > <nl> - < translation type = " obsolete " > HTTP Benutzerprogramm ist % 1 < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 198 " / > <nl> + < source > Dynamic DNS error : Invalid username / password . < / source > <nl> + < translation > Dynamischer DNS Fehler : Ungültiger Benutzername / Passwort . < / translation > <nl> < / message > <nl> < message > <nl> - < source > Using a disk cache size of % 1 MiB < / source > <nl> - < translation type = " obsolete " > Verwende eine Plattencachegröße von % 1 MiB < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 203 " / > <nl> + < source > Dynamic DNS error : qBittorrent was blacklisted by the service , please report a bug at http : / / bugs . qbittorrent . org . < / source > <nl> + < translation > Dynamischer DNS Fehler : qBittorrent wurde durch den Dienst geblacklisted . Bitte melden sie einen Bug unter http : / / bugs . qbittorrent . org . < / translation > <nl> < / message > <nl> < message > <nl> - < source > DHT support [ ON ] , port : UDP / % 1 < / source > <nl> - < translation type = " obsolete " > DHT Unterstützung [ EIN ] , Port : UDP / % 1 < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 209 " / > <nl> + < source > Dynamic DNS error : % 1 was returned by the service , please report a bug at http : / / bugs . qbittorrent . org . < / source > <nl> + < translation > Dynamischer DNS Fehler : Der Dienst hat % 1 zurückgegeben . Bitte melden sie einen Bug unter http : / / bugs . qbittorrent . org . < / translation > <nl> < / message > <nl> < message > <nl> - < source > DHT support [ OFF ] < / source > <nl> - < translation type = " obsolete " > DHT Unterstützung [ AUS ] < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 215 " / > <nl> + < source > Dynamic DNS error : Your username was blocked due to abuse . < / source > <nl> + < translation > Dynamischer DNS Fehler : Ihr Benutzername wurde wegen Missbrauch geblockt . < / translation > <nl> < / message > <nl> < message > <nl> - < source > PeX support [ ON ] < / source > <nl> - < translation type = " obsolete " > PeX Unterstützung [ EIN ] < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 236 " / > <nl> + < source > Dynamic DNS error : supplied domain name is invalid . < / source > <nl> + < translation > Dynamischer DNS Fehler : Angegebener Domain Name ist ungültig . < / translation > <nl> < / message > <nl> < message > <nl> - < source > PeX support [ OFF ] < / source > <nl> - < translation type = " obsolete " > PeX Unterstützung [ AUS ] < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 248 " / > <nl> + < source > Dynamic DNS error : supplied username is too short . < / source > <nl> + < translation > Dynamischer DNS Fehler : Angegebener Benutzername ist zu kurz . < / translation > <nl> < / message > <nl> < message > <nl> - < source > Restart is required to toggle PeX support < / source > <nl> - < translation type = " obsolete " > Neustart erforderlich um PeX Unterstützung umzuschalten < / translation > <nl> + < location filename = " . . / dnsupdater . cpp " line = " 260 " / > <nl> + < source > Dynamic DNS error : supplied password is too short . < / source > <nl> + < translation > Dynamischer DNS Fehler : Angegebenes Passwort ist zu kurz . < / translation > <nl> < / message > <nl> + < / context > <nl> + < context > <nl> + < name > DownloadThread < / name > <nl> < message > <nl> - < source > Local Peer Discovery [ ON ] < / source > <nl> - < translation type = " obsolete " > Lokale Peer Auffindung [ EIN ] < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 157 " / > <nl> + < location filename = " . . / downloadthread . cpp " line = " 161 " / > <nl> + < source > I / O Error < / source > <nl> + < translation > I / O Fehler < / translation > <nl> < / message > <nl> < message > <nl> - < source > Local Peer Discovery support [ OFF ] < / source > <nl> - < translation type = " obsolete " > Unterstützung für Lokale Peer Auffindung [ AUS ] < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 252 " / > <nl> + < source > The remote host name was not found ( invalid hostname ) < / source > <nl> + < translation > Der Hostname konnte nicht gefunden werden ( ungültiger Hostname ) < / translation > <nl> < / message > <nl> < message > <nl> - < source > Encryption support [ ON ] < / source > <nl> - < translation type = " obsolete " > Verschlüsselung Unterstützung [ EIN ] < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 254 " / > <nl> + < source > The operation was canceled < / source > <nl> + < translation > Die Operation wurde abgebrochen < / translation > <nl> < / message > <nl> < message > <nl> - < source > Encryption support [ FORCED ] < / source > <nl> - < translation type = " obsolete " > Unterstützung für Verschlüsselung [ Erzwungen ] < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 256 " / > <nl> + < source > The remote server closed the connection prematurely , before the entire reply was received and processed < / source > <nl> + < translation > Der Server hat die Verbindung beendet bevor die gesamte Antwort empfangen und verarbeitet werden konnte < / translation > <nl> < / message > <nl> < message > <nl> - < source > Encryption support [ OFF ] < / source > <nl> - < translation type = " obsolete " > Verschlüsselungs - Unterstützung [ AUS ] < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 258 " / > <nl> + < source > The connection to the remote server timed out < / source > <nl> + < translation > Zeitüberschreitung bei der Verbindung mit dem Server < / translation > <nl> < / message > <nl> < message > <nl> - < source > The Web UI is listening on port % 1 < / source > <nl> - < translation type = " obsolete " > Das Webinterface lauscht auf Port % 1 < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 260 " / > <nl> + < source > SSL / TLS handshake failed < / source > <nl> + < translation > SSL / TLS Handshake fehlgeschlagen < / translation > <nl> < / message > <nl> < message > <nl> - < source > Web User Interface Error - Unable to bind Web UI to port % 1 < / source > <nl> - < translation type = " obsolete " > Web User Interface Fehler - Web UI Port & apos ; % 1 & apos ; ist nicht erreichbar < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 262 " / > <nl> + < source > The remote server refused the connection < / source > <nl> + < translation > Der Server hat die Verbindung verweigert < / translation > <nl> < / message > <nl> < message > <nl> - < source > & apos ; % 1 & apos ; was removed from transfer list and hard disk . < / source > <nl> - < comment > & apos ; xxx . avi & apos ; was removed . . . < / comment > <nl> - < translation type = " obsolete " > & apos ; % 1 & apos ; wurde von der Transfer - Liste und von der Festplatte entfernt . < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 264 " / > <nl> + < source > The connection to the proxy server was refused < / source > <nl> + < translation > Die Verbindung zum Proxy - Server wurde verweigert < / translation > <nl> < / message > <nl> < message > <nl> - < source > & apos ; % 1 & apos ; was removed from transfer list . < / source > <nl> - < comment > & apos ; xxx . avi & apos ; was removed . . . < / comment > <nl> - < translation type = " obsolete " > & apos ; % 1 & apos ; wurde von der Transfer - Liste entfernt . < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 266 " / > <nl> + < source > The proxy server closed the connection prematurely < / source > <nl> + < translation > Der Proxy - Server hat die Verbindung vorzeitig beendet < / translation > <nl> < / message > <nl> < message > <nl> - < source > & apos ; % 1 & apos ; is not a valid magnet URI . < / source > <nl> - < translation type = " obsolete " > & apos ; % 1 & apos ; ist keine gültige Magnet URI . < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 268 " / > <nl> + < source > The proxy host name was not found < / source > <nl> + < translation > Der Proxy - Hostname wurde nicht gefunden < / translation > <nl> < / message > <nl> < message > <nl> - < source > & apos ; % 1 & apos ; is already in download list . < / source > <nl> - < comment > e . g : & apos ; xxx . avi & apos ; is already in download list . < / comment > <nl> - < translation type = " obsolete " > & apos ; % 1 & apos ; befindet sich bereits in der Download - Liste . < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 270 " / > <nl> + < source > The connection to the proxy timed out or the proxy did not reply in time to the request sent < / source > <nl> + < translation > Zeitüberschreitung beim Verbindungsaufbau mit dem Proxy oder der Proxy hat nicht in angemessener Zeit auf die Anfrage reagiert < / translation > <nl> < / message > <nl> < message > <nl> - < source > & apos ; % 1 & apos ; resumed . ( fast resume ) < / source > <nl> - < comment > & apos ; / home / y / xxx . torrent & apos ; was resumed . ( fast resume ) < / comment > <nl> - < translation type = " obsolete " > & apos ; % 1 & apos ; wird fortgesetzt . ( Schnelles Fortsetzen ) < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 272 " / > <nl> + < source > The proxy requires authentication in order to honour the request but did not accept any credentials offered < / source > <nl> + < translation > Der Proxy benötigt Authentifizierung hat jedoch keine der angebotenen Zugangsdaten akzeptiert < / translation > <nl> < / message > <nl> < message > <nl> - < source > & apos ; % 1 & apos ; added to download list . < / source > <nl> - < comment > & apos ; / home / y / xxx . torrent & apos ; was added to download list . < / comment > <nl> - < translation type = " obsolete " > & apos ; % 1 & apos ; wurde der Download - Liste hinzugefügt . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Unable to decode torrent file : & apos ; % 1 & apos ; < / source > <nl> - < comment > e . g : Unable to decode torrent file : & apos ; / home / y / xxx . torrent & apos ; < / comment > <nl> - < translation type = " obsolete " > Konnte Torrent - Datei nicht dekodieren : & apos ; % 1 & apos ; < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > This file is either corrupted or this isn & apos ; t a torrent . < / source > <nl> - < translation type = " obsolete " > Diese Datei ist entweder fehlerhaft oder kein Torrent . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Note : new trackers were added to the existing torrent . < / source > <nl> - < translation type = " obsolete " > Bemerkung : Dem Torrent wurde ein neuer Tracker hinzugefügt . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Note : new URL seeds were added to the existing torrent . < / source > <nl> - < translation type = " obsolete " > Bemerkung : Dem Torrent wurden neue URL - Seeds hinzugefügt . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Error : The torrent % 1 does not contain any file . < / source > <nl> - < translation type = " obsolete " > Fehler : Der Torret % 1 enthält keineDateien . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > & lt ; font color = & apos ; red & apos ; & gt ; % 1 & lt ; / font & gt ; & lt ; i & gt ; was blocked due to your IP filter & lt ; / i & gt ; < / source > <nl> - < comment > x . y . z . w was blocked < / comment > <nl> - < translation type = " obsolete " > & lt ; font color = & apos ; red & apos ; & gt ; % 1 & lt ; / font & gt ; & lt ; i & gt ; wurde aufgrund Ihrer IP Filter geblockt & lt ; / i & gt ; < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > & lt ; font color = & apos ; red & apos ; & gt ; % 1 & lt ; / font & gt ; & lt ; i & gt ; was banned due to corrupt pieces & lt ; / i & gt ; < / source > <nl> - < comment > x . y . z . w was banned < / comment > <nl> - < translation type = " obsolete " > & lt ; font color = & apos ; red & apos ; & gt ; % 1 & lt ; / font & gt ; & lt ; i & gt ; wurde aufgrund von beschädigten Teilen gebannt & lt ; / i & gt ; < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Recursive download of file % 1 embedded in torrent % 2 < / source > <nl> - < comment > Recursive download of test . torrent embedded in torrent test2 < / comment > <nl> - < translation type = " obsolete " > Rekursiver Download von Datei % 1 , eingebettet in Torrent % 2 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Unable to decode % 1 torrent file . < / source > <nl> - < translation type = " obsolete " > Konnte Torrent - Datei % 1 nicht dekodieren . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > UPnP / NAT - PMP : Port mapping failure , message : % 1 < / source > <nl> - < translation type = " obsolete " > UPnP / NAT - PMP : Port Mapping Fehler , Fehlermeldung : % 1 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > UPnP / NAT - PMP : Port mapping successful , message : % 1 < / source > <nl> - < translation type = " obsolete " > UPnP / NAT - PMP : Port Mapping Fehler , Meldung : % 1 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Fast resume data was rejected for torrent % 1 , checking again . . . < / source > <nl> - < translation type = " obsolete " > Fast - Resume Daten für den Torrent % 1 wurden zurückgewiesen , prüfe erneut . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Reason : % 1 < / source > <nl> - < translation type = " obsolete " > Begründung : % 1 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > An I / O error occurred , & apos ; % 1 & apos ; paused . < / source > <nl> - < translation type = " obsolete " > Ein I / O Fehler ist aufgetreten , & apos ; % 1 & apos ; angehalten . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > File sizes mismatch for torrent % 1 , pausing it . < / source > <nl> - < translation type = " obsolete " > Diskrepanz bei der Dateigröße des Torrent % 1 , Torrent wird angehalten . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Url seed lookup failed for url : % 1 , message : % 2 < / source > <nl> - < translation type = " obsolete " > URL Seed Lookup für die URL & apos ; % 1 & apos ; ist fehlgeschlagen , Begründung : % 2 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Downloading & apos ; % 1 & apos ; , please wait . . . < / source > <nl> - < comment > e . g : Downloading & apos ; xxx . torrent & apos ; , please wait . . . < / comment > <nl> - < translation type = " obsolete " > Lade & apos ; % 1 & apos ; , bitte warten . . . < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > ConsoleDlg < / name > <nl> - < message > <nl> - < source > qBittorrent log viewer < / source > <nl> - < translation type = " obsolete " > qBittorrent Logbetrachter < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > General < / source > <nl> - < translation type = " obsolete " > Allgemein < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Blocked IPs < / source > <nl> - < translation type = " obsolete " > Geblockte IP & apos ; s < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > CookiesDlg < / name > <nl> - < message > <nl> - < location filename = " . . / rss / cookiesdlg . ui " line = " 14 " / > <nl> - < source > Cookies management < / source > <nl> - < translation > Cookie Verwaltung < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / rss / cookiesdlg . ui " line = " 36 " / > <nl> - < source > Key < / source > <nl> - < extracomment > As in Key / Value pair < / extracomment > <nl> - < translation > Schlüssel < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / rss / cookiesdlg . ui " line = " 41 " / > <nl> - < source > Value < / source > <nl> - < extracomment > As in Key / Value pair < / extracomment > <nl> - < translation > Wert < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / rss / cookiesdlg . cpp " line = " 48 " / > <nl> - < source > Common keys for cookies are : & apos ; % 1 & apos ; , & apos ; % 2 & apos ; . <nl> - You should get this information from your Web browser preferences . < / source > <nl> - < translation > Gängige Schlüssel für Cookies sind : & apos ; % 1 & apos ; , & apos ; % 2 & apos ; . <nl> - Sie sollten diese Information aus den Voreinstellungen Ihres Webbrowsers erhalten . < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > DNSUpdater < / name > <nl> - < message > <nl> - < source > Your dynamic DNS was successfuly updated . < / source > <nl> - < translation type = " obsolete " > Ihr dynamisches DNS wurde erfolgreich geupdated . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 178 " / > <nl> - < source > Your dynamic DNS was successfully updated . < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 182 " / > <nl> - < source > Dynamic DNS error : The service is temporarily unavailable , it will be retried in 30 minutes . < / source > <nl> - < translation > Dynamischer DNS Fehler : Der Dienst ist vorübergehend nicht erreichbar . Ein neuer Versuch wird in 30 Sekunden gestartet . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 192 " / > <nl> - < source > Dynamic DNS error : hostname supplied does not exist under specified account . < / source > <nl> - < translation > Dynamischer DNS Fehler : Der Hostname existiert nicht für den angegebenen Account . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 198 " / > <nl> - < source > Dynamic DNS error : Invalid username / password . < / source > <nl> - < translation > Dynamischer DNS Fehler : Ungültiger Benutzername / Passwort . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 203 " / > <nl> - < source > Dynamic DNS error : qBittorrent was blacklisted by the service , please report a bug at http : / / bugs . qbittorrent . org . < / source > <nl> - < translation > Dynamischer DNS Fehler : qBittorrent wurde durch den Dienst geblacklisted . Bitte melden sie einen Bug unter http : / / bugs . qbittorrent . org . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 209 " / > <nl> - < source > Dynamic DNS error : % 1 was returned by the service , please report a bug at http : / / bugs . qbittorrent . org . < / source > <nl> - < translation > Dynamischer DNS Fehler : Der Dienst hat % 1 zurückgegeben . Bitte melden sie einen Bug unter http : / / bugs . qbittorrent . org . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 215 " / > <nl> - < source > Dynamic DNS error : Your username was blocked due to abuse . < / source > <nl> - < translation > Dynamischer DNS Fehler : Ihr Benutzername wurde wegen Missbrauch geblockt . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 236 " / > <nl> - < source > Dynamic DNS error : supplied domain name is invalid . < / source > <nl> - < translation > Dynamischer DNS Fehler : Angegebener Domain Name ist ungültig . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 248 " / > <nl> - < source > Dynamic DNS error : supplied username is too short . < / source > <nl> - < translation > Dynamischer DNS Fehler : Angegebener Benutzername ist zu kurz . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / dnsupdater . cpp " line = " 260 " / > <nl> - < source > Dynamic DNS error : supplied password is too short . < / source > <nl> - < translation > Dynamischer DNS Fehler : Angegebenes Passwort ist zu kurz . < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > DownloadThread < / name > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 157 " / > <nl> - < location filename = " . . / downloadthread . cpp " line = " 161 " / > <nl> - < source > I / O Error < / source > <nl> - < translation > I / O Fehler < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 252 " / > <nl> - < source > The remote host name was not found ( invalid hostname ) < / source > <nl> - < translation > Der Hostname konnte nicht gefunden werden ( ungültiger Hostname ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 254 " / > <nl> - < source > The operation was canceled < / source > <nl> - < translation > Die Operation wurde abgebrochen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 256 " / > <nl> - < source > The remote server closed the connection prematurely , before the entire reply was received and processed < / source > <nl> - < translation > Der Server hat die Verbindung beendet bevor die gesamte Antwort empfangen und verarbeitet werden konnte < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 258 " / > <nl> - < source > The connection to the remote server timed out < / source > <nl> - < translation > Zeitüberschreitung bei der Verbindung mit dem Server < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 260 " / > <nl> - < source > SSL / TLS handshake failed < / source > <nl> - < translation > SSL / TLS Handshake fehlgeschlagen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 262 " / > <nl> - < source > The remote server refused the connection < / source > <nl> - < translation > Der Server hat die Verbindung verweigert < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 264 " / > <nl> - < source > The connection to the proxy server was refused < / source > <nl> - < translation > Die Verbindung zum Proxy - Server wurde verweigert < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 266 " / > <nl> - < source > The proxy server closed the connection prematurely < / source > <nl> - < translation > Der Proxy - Server hat die Verbindung vorzeitig beendet < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 268 " / > <nl> - < source > The proxy host name was not found < / source > <nl> - < translation > Der Proxy - Hostname wurde nicht gefunden < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 270 " / > <nl> - < source > The connection to the proxy timed out or the proxy did not reply in time to the request sent < / source > <nl> - < translation > Zeitüberschreitung beim Verbindungsaufbau mit dem Proxy oder der Proxy hat nicht in angemessener Zeit auf die Anfrage reagiert < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 272 " / > <nl> - < source > The proxy requires authentication in order to honour the request but did not accept any credentials offered < / source > <nl> - < translation > Der Proxy benötigt Authentifizierung hat jedoch keine der angebotenen Zugangsdaten akzeptiert < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 274 " / > <nl> - < source > The access to the remote content was denied ( 401 ) < / source > <nl> - < translation > Der Zugriff auf den Inhalt wurde verweigert ( 401 ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 276 " / > <nl> - < source > The operation requested on the remote content is not permitted < / source > <nl> - < translation > Die Operation ist nicht erlaubt < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 278 " / > <nl> - < source > The remote content was not found at the server ( 404 ) < / source > <nl> - < translation > Der Inhalte wurde auf dem Server nicht gefunden ( 404 ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 280 " / > <nl> - < source > The remote server requires authentication to serve the content but the credentials provided were not accepted < / source > <nl> - < translation > Der Server verlangt Authentifizierung , aber die angebotenen Zugangsdaten wurden nicht akzeptiert < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 282 " / > <nl> - < source > The Network Access API cannot honor the request because the protocol is not known < / source > <nl> - < translation > Die Network - Access - API konnte die Anfrage nicht bearbeiten , unbekanntes Protokoll < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 284 " / > <nl> - < source > The requested operation is invalid for this protocol < / source > <nl> - < translation > Die angeforderte Operation ist ungütlig für dieses Protokoll < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 286 " / > <nl> - < source > An unknown network - related error was detected < / source > <nl> - < translation > Ein unbekannter Netzwerk - Fehler ist aufgetreten < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 288 " / > <nl> - < source > An unknown proxy - related error was detected < / source > <nl> - < translation > Ein unbekannter Proxy - Fehler ist aufgetreten < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 290 " / > <nl> - < source > An unknown error related to the remote content was detected < / source > <nl> - < translation > Unbekannter Fehler in Zusammenhang mit dem Inhalt ist aufgetreten < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 292 " / > <nl> - < source > A breakdown in protocol was detected < / source > <nl> - < translation > Es ist eine Störung im Protokoll aufgetreten < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / downloadthread . cpp " line = " 294 " / > <nl> - < source > Unknown error < / source > <nl> - < translation > Unbekannter Fehler < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > EventManager < / name > <nl> - < message > <nl> - < source > Working < / source > <nl> - < translation type = " obsolete " > Funktioniert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Updating . . . < / source > <nl> - < translation type = " obsolete " > Aktualisiere . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Not working < / source > <nl> - < translation type = " obsolete " > Funktioniert nicht < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Not contacted yet < / source > <nl> - < translation type = " obsolete " > Noch nicht kontaktiert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > this session < / source > <nl> - < translation type = " obsolete " > Diese Session < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Seeded for % 1 < / source > <nl> - < comment > e . g . Seeded for 3m10s < / comment > <nl> - < translation type = " obsolete " > Geseeded seit % 1 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > % 1 max < / source > <nl> - < comment > e . g . 10 max < / comment > <nl> - < translation type = " obsolete " > % 1 max < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > % 1 / s < / source > <nl> - < comment > e . g . 120 KiB / s < / comment > <nl> - < translation type = " obsolete " > % 1 / Sekunde < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > ExecutionLog < / name > <nl> - < message > <nl> - < location filename = " . . / executionlog . ui " line = " 27 " / > <nl> - < source > General < / source > <nl> - < translation > Allgemein < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / executionlog . ui " line = " 33 " / > <nl> - < source > Blocked IPs < / source > <nl> - < translation > Geblockte IPs < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > FeedDownloader < / name > <nl> - < message > <nl> - < source > RSS Feed downloader < / source > <nl> - < translation type = " obsolete " > RSS - Feed - Downloader < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > RSS feed : < / source > <nl> - < translation type = " obsolete " > RSS - Feed : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Feed name < / source > <nl> - < translation type = " obsolete " > Feed - Name < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Automatically download torrents from this feed < / source > <nl> - < translation type = " obsolete " > Torrents von diesem Feed automatisch laden < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Download filters < / source > <nl> - < translation type = " obsolete " > Download - Filter < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filters : < / source > <nl> - < translation type = " obsolete " > Filter : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filter settings < / source > <nl> - < translation type = " obsolete " > Filter - Einstellungen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Matches : < / source > <nl> - < translation type = " obsolete " > Übereinstimmungen : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Does not match : < / source > <nl> - < translation type = " obsolete " > Stimmt nicht überein : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Destination folder : < / source > <nl> - < translation type = " obsolete " > Zielverzeichnis : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > . . . < / source > <nl> - < translation type = " obsolete " > . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filter testing < / source > <nl> - < translation type = " obsolete " > Teste Filter < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Torrent title : < / source > <nl> - < translation type = " obsolete " > Torrent - Titel : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Result : < / source > <nl> - < translation type = " obsolete " > Ergebnis : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Test < / source > <nl> - < translation type = " obsolete " > Test < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Import . . . < / source > <nl> - < translation type = " obsolete " > Import . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Export . . . < / source > <nl> - < translation type = " obsolete " > Export . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Rename filter < / source > <nl> - < translation type = " obsolete " > Filter umbenennen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Remove filter < / source > <nl> - < translation type = " obsolete " > Filter löschen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Add filter < / source > <nl> - < translation type = " obsolete " > Filter hinzufügen < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > FeedDownloaderDlg < / name > <nl> - < message > <nl> - < source > New filter < / source > <nl> - < translation type = " obsolete " > Neuer Filter < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Please choose a name for this filter < / source > <nl> - < translation type = " obsolete " > Bitte wählen Sie einen Namen für diesen Filter < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filter name : < / source > <nl> - < translation type = " obsolete " > Filter - Name : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Invalid filter name < / source > <nl> - < translation type = " obsolete " > Ungültiger Filter - Name < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The filter name cannot be left empty . < / source > <nl> - < translation type = " obsolete " > Der Filter - Name darf nicht leer sein . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > This filter name is already in use . < / source > <nl> - < translation type = " obsolete " > Dieser Filter - Name wird bereits verwendet . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Choose save path < / source > <nl> - < translation type = " obsolete " > Wählen Sie den Speicher - Pfad < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filter testing error < / source > <nl> - < translation type = " obsolete " > Fehler beim testen des Filters < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Please specify a test torrent name . < / source > <nl> - < translation type = " obsolete " > Bitte geben Sie einen Torrent - Namen zum testen ein . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > matches < / source > <nl> - < translation type = " obsolete " > stimmt überein < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > does not match < / source > <nl> - < translation type = " obsolete " > stimmt nicht überein < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Select file to import < / source > <nl> - < translation type = " obsolete " > Wählen Sie eine Datei für den Import < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filters Files < / source > <nl> - < translation type = " obsolete " > Filter - Dateien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Import successful < / source > <nl> - < translation type = " obsolete " > Import erfolgreich < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filters import was successful . < / source > <nl> - < translation type = " obsolete " > Filter wurden erfolgreich importiert . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Import failure < / source > <nl> - < translation type = " obsolete " > Fehler beim Import < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filters could not be imported due to an I / O error . < / source > <nl> - < translation type = " obsolete " > Filter konnte nicht importiert werden aufgrund eines I / O Fehlers . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Select destination file < / source > <nl> - < translation type = " obsolete " > Zieldatei auswählen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Export successful < / source > <nl> - < translation type = " obsolete " > Export erfolgreich < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filters export was successful . < / source > <nl> - < translation type = " obsolete " > Filter wurden erfolgreich exportiert . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Export failure < / source > <nl> - < translation type = " obsolete " > Fehler beim Export < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Filters could not be exported due to an I / O error . < / source > <nl> - < translation type = " obsolete " > Filter konnte nicht exportiert werden aufgrund eines I / O Fehlers . < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > FeedList < / name > <nl> - < message > <nl> - < source > Unread < / source > <nl> - < translation type = " obsolete " > Ungelesen < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > FeedListWidget < / name > <nl> - < message > <nl> - < location filename = " . . / rss / feedlistwidget . cpp " line = " 41 " / > <nl> - < source > RSS feeds < / source > <nl> - < translation > RSS - Feeds < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / rss / feedlistwidget . cpp " line = " 43 " / > <nl> - < source > Unread < / source > <nl> - < translation > Ungelesen < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > GUI < / name > <nl> - < message > <nl> - < source > qBittorrent < / source > <nl> - < translation type = " obsolete " > qBittorrent < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Open Torrent Files < / source > <nl> - < translation type = " obsolete " > Öffne Torrent - Dateien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Torrent Files < / source > <nl> - < translation type = " obsolete " > Torrent - Dateien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Transfers < / source > <nl> - < translation type = " obsolete " > Übertragungen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > qBittorrent % 1 < / source > <nl> - < comment > e . g : qBittorrent v0 . x < / comment > <nl> - < translation type = " obsolete " > qBittorrent % 1 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > DL speed : % 1 KiB / s < / source > <nl> - < comment > e . g : Download speed : 10 KiB / s < / comment > <nl> - < translation type = " obsolete " > DL Geschwindigkeit : % 1 KB / s < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > UP speed : % 1 KiB / s < / source > <nl> - < comment > e . g : Upload speed : 10 KiB / s < / comment > <nl> - < translation type = " obsolete " > UP Geschwindigkeit : % 1 KiB / s < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > % 1 has finished downloading . < / source > <nl> - < comment > e . g : xxx . avi has finished downloading . < / comment > <nl> - < translation type = " obsolete " > % 1 vollständig heruntergeladen . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > I / O Error < / source > <nl> - < comment > i . e : Input / Output Error < / comment > <nl> - < translation type = " obsolete " > I / O Error < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Search < / source > <nl> - < translation type = " obsolete " > Suche < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Torrent file association < / source > <nl> - < translation type = " obsolete " > Verbindung zu Torrent Datei < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > qBittorrent is not the default application to open torrent files or Magnet links . <nl> - Do you want to associate qBittorrent to torrent files and Magnet links ? < / source > <nl> - < translation type = " obsolete " > qBittorrent ist nicht die Standard Applikation um Torrent Dateien oder Magnet Links zu öffnen . Möchten Sie Torrent Dateien und Magnet Links immer mit qBittorent öffnen ? < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > RSS < / source > <nl> - < translation type = " obsolete " > RSS < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Transfers ( % 1 ) < / source > <nl> - < translation type = " obsolete " > Übertragungen ( % 1 ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Download completion < / source > <nl> - < translation type = " obsolete " > Beendigung des Download < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > An I / O error occurred for torrent % 1 . <nl> - Reason : % 2 < / source > <nl> - < comment > e . g : An error occurred for torrent xxx . avi . <nl> - Reason : disk is full . < / comment > <nl> - < translation type = " obsolete " > Ein I / O Fehler ist aufegtreten für die Torrent Datei % 1 . Ursache : % 2 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Alt + 2 < / source > <nl> - < comment > shortcut to switch to third tab < / comment > <nl> - < translation type = " obsolete " > Alt + 2 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Recursive download confirmation < / source > <nl> - < translation type = " obsolete " > Rekursiven Downlaod bestätigen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The torrent % 1 contains torrent files , do you want to proceed with their download ? < / source > <nl> - < translation type = " obsolete " > Der Torrent % 1 enthält Torrent Dateien , möchten Sie mit dem Download fortfahren ? < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > A newer version is available < / source > <nl> - < translation type = " obsolete " > Eine neuere Version ist erhältlich < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > A newer version of qBittorrent is available on Sourceforge . <nl> - Would you like to update qBittorrent to version % 1 ? < / source > <nl> - < translation type = " obsolete " > Eine neuere Version von qBittorrent ist auf Sourceforge erhätlich . Möchten Sie qBittorent auf die Version % 1 aktualisieren ? < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Impossible to update qBittorrent < / source > <nl> - < translation type = " obsolete " > Aktuialisierung von qBittorrent nicht möglich < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > qBittorrent failed to update , reason : % 1 < / source > <nl> - < translation type = " obsolete " > qBittorrent konnte nicht aktualisiert werden , Begründung : % 1 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Exiting qBittorrent < / source > <nl> - < translation type = " obsolete " > Beende qBittorrent < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Always < / source > <nl> - < translation type = " obsolete " > Immer < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Alt + 1 < / source > <nl> - < comment > shortcut to switch to first tab < / comment > <nl> - < translation type = " obsolete " > Alt + 1 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Url download error < / source > <nl> - < translation type = " obsolete " > URL Download Fehler < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Couldn & apos ; t download file at url : % 1 , reason : % 2 . < / source > <nl> - < translation type = " obsolete " > Konnte Datei von URL : % 1 nicht laden , Begründung : % 2 . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Ctrl + F < / source > <nl> - < comment > shortcut to switch to search tab < / comment > <nl> - < translation type = " obsolete " > Strg + F < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Alt + 3 < / source > <nl> - < comment > shortcut to switch to fourth tab < / comment > <nl> - < translation type = " obsolete " > Alt + 3 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Yes < / source > <nl> - < translation type = " obsolete " > Ja < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > No < / source > <nl> - < translation type = " obsolete " > Nein < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Never < / source > <nl> - < translation type = " obsolete " > Niemals < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Global Upload Speed Limit < / source > <nl> - < translation type = " obsolete " > Globale UL - Rate < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Global Download Speed Limit < / source > <nl> - < translation type = " obsolete " > Globale DL - Rate < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Some files are currently transferring . <nl> - Are you sure you want to quit qBittorrent ? < / source > <nl> - < translation type = " obsolete " > Zur Zeit werden Dateien übertragen . <nl> - Sind Sie sicher , daß sie qBittorrent beenden möchten ? < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Options were saved successfully . < / source > <nl> - < translation type = " obsolete " > Optionen wurden erfolgreich gespeichert . < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > GeoIP < / name > <nl> - < message > <nl> - < source > Australia < / source > <nl> - < translation type = " obsolete " > Australien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Argentina < / source > <nl> - < translation type = " obsolete " > Argentinien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Austria < / source > <nl> - < translation type = " obsolete " > Österreich < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > United Arab Emirates < / source > <nl> - < translation type = " obsolete " > Vereinigte Arabische Emirate < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Brazil < / source > <nl> - < translation type = " obsolete " > Brasilien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Bulgaria < / source > <nl> - < translation type = " obsolete " > Bulgarien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Belarus < / source > <nl> - < translation type = " obsolete " > Weißrussland < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Belgium < / source > <nl> - < translation type = " obsolete " > Belgien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Bosnia < / source > <nl> - < translation type = " obsolete " > Bosniene < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Canada < / source > <nl> - < translation type = " obsolete " > Kanada < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Czech Republic < / source > <nl> - < translation type = " obsolete " > Tschechische Republik < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > China < / source > <nl> - < translation type = " obsolete " > China < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Costa Rica < / source > <nl> - < translation type = " obsolete " > Costa Rica < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Switzerland < / source > <nl> - < translation type = " obsolete " > Schweiz < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Germany < / source > <nl> - < translation type = " obsolete " > Deutschland < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Denmark < / source > <nl> - < translation type = " obsolete " > Dänemark < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Algeria < / source > <nl> - < translation type = " obsolete " > Algerien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Spain < / source > <nl> - < translation type = " obsolete " > Spanien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Egypt < / source > <nl> - < translation type = " obsolete " > Ägypten < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Finland < / source > <nl> - < translation type = " obsolete " > Finnland < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > France < / source > <nl> - < translation type = " obsolete " > Frankreich < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > United Kingdom < / source > <nl> - < translation type = " obsolete " > Vereinigtes Königreich < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Greece < / source > <nl> - < translation type = " obsolete " > Griechenland < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Georgia < / source > <nl> - < translation type = " obsolete " > Georgien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Hungary < / source > <nl> - < translation type = " obsolete " > Ungarn < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Croatia < / source > <nl> - < translation type = " obsolete " > Kroatien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Italy < / source > <nl> - < translation type = " obsolete " > Italien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > India < / source > <nl> - < translation type = " obsolete " > Indien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Israel < / source > <nl> - < translation type = " obsolete " > Israel < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Ireland < / source > <nl> - < translation type = " obsolete " > Irland < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Iceland < / source > <nl> - < translation type = " obsolete " > Island < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Indonesia < / source > <nl> - < translation type = " obsolete " > Indonesien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > South Korea < / source > <nl> - < translation type = " obsolete " > Südkorea < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Luxembourg < / source > <nl> - < translation type = " obsolete " > Luxemburg < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Serbia < / source > <nl> - < translation type = " obsolete " > Serbien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Morocco < / source > <nl> - < translation type = " obsolete " > Marokko < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Netherlands < / source > <nl> - < translation type = " obsolete " > Niederlande < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Norway < / source > <nl> - < translation type = " obsolete " > Norwegen < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 274 " / > <nl> + < source > The access to the remote content was denied ( 401 ) < / source > <nl> + < translation > Der Zugriff auf den Inhalt wurde verweigert ( 401 ) < / translation > <nl> < / message > <nl> < message > <nl> - < source > New Zealand < / source > <nl> - < translation type = " obsolete " > Neu Seeland < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 276 " / > <nl> + < source > The operation requested on the remote content is not permitted < / source > <nl> + < translation > Die Operation ist nicht erlaubt < / translation > <nl> < / message > <nl> < message > <nl> - < source > Portugal < / source > <nl> - < translation type = " obsolete " > Portugal < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 278 " / > <nl> + < source > The remote content was not found at the server ( 404 ) < / source > <nl> + < translation > Der Inhalte wurde auf dem Server nicht gefunden ( 404 ) < / translation > <nl> < / message > <nl> < message > <nl> - < source > Poland < / source > <nl> - < translation type = " obsolete " > Polen < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 280 " / > <nl> + < source > The remote server requires authentication to serve the content but the credentials provided were not accepted < / source > <nl> + < translation > Der Server verlangt Authentifizierung , aber die angebotenen Zugangsdaten wurden nicht akzeptiert < / translation > <nl> < / message > <nl> < message > <nl> - < source > Philippines < / source > <nl> - < translation type = " obsolete " > Philippinen < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 282 " / > <nl> + < source > The Network Access API cannot honor the request because the protocol is not known < / source > <nl> + < translation > Die Network - Access - API konnte die Anfrage nicht bearbeiten , unbekanntes Protokoll < / translation > <nl> < / message > <nl> < message > <nl> - < source > Russia < / source > <nl> - < translation type = " obsolete " > Russland < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 284 " / > <nl> + < source > The requested operation is invalid for this protocol < / source > <nl> + < translation > Die angeforderte Operation ist ungütlig für dieses Protokoll < / translation > <nl> < / message > <nl> < message > <nl> - < source > Romania < / source > <nl> - < translation type = " obsolete " > Romänien < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 286 " / > <nl> + < source > An unknown network - related error was detected < / source > <nl> + < translation > Ein unbekannter Netzwerk - Fehler ist aufgetreten < / translation > <nl> < / message > <nl> < message > <nl> - < source > France ( Reunion Island ) < / source > <nl> - < translation type = " obsolete " > Frankreich ( Reunion ) < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 288 " / > <nl> + < source > An unknown proxy - related error was detected < / source > <nl> + < translation > Ein unbekannter Proxy - Fehler ist aufgetreten < / translation > <nl> < / message > <nl> < message > <nl> - < source > Saudi Arabia < / source > <nl> - < translation type = " obsolete " > Saudi Arabien < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 290 " / > <nl> + < source > An unknown error related to the remote content was detected < / source > <nl> + < translation > Unbekannter Fehler in Zusammenhang mit dem Inhalt ist aufgetreten < / translation > <nl> < / message > <nl> < message > <nl> - < source > Sweden < / source > <nl> - < translation type = " obsolete " > Schweden < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 292 " / > <nl> + < source > A breakdown in protocol was detected < / source > <nl> + < translation > Es ist eine Störung im Protokoll aufgetreten < / translation > <nl> < / message > <nl> < message > <nl> - < source > Slovakia < / source > <nl> - < translation type = " obsolete " > Slovakei < / translation > <nl> + < location filename = " . . / downloadthread . cpp " line = " 294 " / > <nl> + < source > Unknown error < / source > <nl> + < translation > Unbekannter Fehler < / translation > <nl> < / message > <nl> + < / context > <nl> + < context > <nl> + < name > ExecutionLog < / name > <nl> < message > <nl> - < source > Singapore < / source > <nl> - < translation type = " obsolete " > Singapur < / translation > <nl> + < location filename = " . . / executionlog . ui " line = " 27 " / > <nl> + < source > General < / source > <nl> + < translation > Allgemein < / translation > <nl> < / message > <nl> < message > <nl> - < source > Slovenia < / source > <nl> - < translation type = " obsolete " > Slovenien < / translation > <nl> + < location filename = " . . / executionlog . ui " line = " 33 " / > <nl> + < source > Blocked IPs < / source > <nl> + < translation > Geblockte IPs < / translation > <nl> < / message > <nl> + < / context > <nl> + < context > <nl> + < name > FeedListWidget < / name > <nl> < message > <nl> - < source > Turkey < / source > <nl> - < translation type = " obsolete " > Türkei < / translation > <nl> + < location filename = " . . / rss / feedlistwidget . cpp " line = " 41 " / > <nl> + < source > RSS feeds < / source > <nl> + < translation > RSS - Feeds < / translation > <nl> < / message > <nl> < message > <nl> - < source > South Africa < / source > <nl> - < translation type = " obsolete " > Südafrika < / translation > <nl> + < location filename = " . . / rss / feedlistwidget . cpp " line = " 43 " / > <nl> + < source > Unread < / source > <nl> + < translation > Ungelesen < / translation > <nl> < / message > <nl> < / context > <nl> < context > <nl> Sind Sie sicher , daß sie qBittorrent beenden möchten ? < / translation > <nl> < message > <nl> < location filename = " . . / headlessloader . h " line = " 54 " / > <nl> < source > Information < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / headlessloader . h " line = " 55 " / > <nl> Sind Sie sicher , daß sie qBittorrent beenden möchten ? < / translation > <nl> < source > Help < / source > <nl> < translation > Hilfe < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Delete from HD < / source > <nl> - < translation type = " obsolete " > Von der Festplatte löschen < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / webui / httpserver . cpp " line = " 113 " / > <nl> < source > Download Torrents from their URL or Magnet link < / source > <nl> Sind Sie sicher , daß sie qBittorrent beenden möchten ? < / translation > <nl> < message > <nl> < location filename = " . . / webui / httpserver . cpp " line = " 118 " / > <nl> < source > Download < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / httpserver . cpp " line = " 119 " / > <nl> Sind Sie sicher , daß sie qBittorrent beenden möchten ? < / translation > <nl> < message > <nl> < location filename = " . . / webui / httpserver . cpp " line = " 134 " / > <nl> < source > HTTP Server < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / httpserver . cpp " line = " 135 " / > <nl> Sind Sie sicher , daß sie qBittorrent beenden möchten ? < / translation > <nl> < message > <nl> < location filename = " . . / webui / httpserver . cpp " line = " 138 " / > <nl> < source > qBittorrent has been shutdown . < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> Wahrscheinlich haben wir Ihnen hiermit nichts Neues erzählt und werden Sie auch <nl> < message > <nl> < location filename = " . . / loglistwidget . cpp " line = " 47 " / > <nl> < source > Copy < / source > <nl> - < translation type = " unfinished " > Kopieren < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / loglistwidget . cpp " line = " 48 " / > <nl> < source > Clear < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> Wahrscheinlich haben wir Ihnen hiermit nichts Neues erzählt und werden Sie auch <nl> < source > & amp ; Edit < / source > <nl> < translation > & amp ; Bearbeiten < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 50 " / > <nl> - < source > & amp ; Help < / source > <nl> - < translation > & amp ; Hilfe < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . ui " line = " 60 " / > <nl> < source > & amp ; Tools < / source > <nl> Wahrscheinlich haben wir Ihnen hiermit nichts Neues erzählt und werden Sie auch <nl> < source > & amp ; File < / source > <nl> < translation > & amp ; Datei < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / mainwindow . ui " line = " 50 " / > <nl> + < source > & amp ; Help < / source > <nl> + < translation > & amp ; Hilfe < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . ui " line = " 88 " / > <nl> < source > & amp ; View < / source > <nl> < translation > & amp ; Ansicht < / translation > <nl> < / message > <nl> - < message > <nl> - < source > & amp ; Add File . . . < / source > <nl> - < translation type = " obsolete " > & amp ; Datei hinzufügen . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > E & amp ; xit < / source > <nl> - < translation type = " obsolete " > Beenden < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . ui " line = " 151 " / > <nl> < source > & amp ; Options . . . < / source > <nl> < translation > & amp ; Optionen . . . < / translation > <nl> < / message > <nl> < message > <nl> - < source > Add & amp ; URL . . . < / source > <nl> - < translation type = " obsolete " > & amp ; URL hinzufügen . . . < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 161 " / > <nl> + < source > & amp ; Resume < / source > <nl> + < translation > & amp ; Fortsetzen < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / mainwindow . ui " line = " 317 " / > <nl> + < source > R & amp ; esume All < / source > <nl> + < translation > Alle forts & amp ; etzen < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . ui " line = " 190 " / > <nl> Wahrscheinlich haben wir Ihnen hiermit nichts Neues erzählt und werden Sie auch <nl> < translation > Torrent & amp ; Erschaffer < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 200 " / > <nl> - < source > Set upload limit . . . < / source > <nl> - < translation > Upload Limit setzen . . . < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 244 " / > <nl> + < location filename = " . . / mainwindow . ui " line = " 247 " / > <nl> + < source > Alternative speed limits < / source > <nl> + < translation > Alternative Geschwindigkeitsbegrenzung < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 205 " / > <nl> - < source > Set download limit . . . < / source > <nl> - < translation > Download Limit setzen . . . < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 255 " / > <nl> + < source > Top & amp ; tool bar < / source > <nl> + < translation > Obere Werk & amp ; zeugleiste < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / mainwindow . ui " line = " 258 " / > <nl> + < source > Display top tool bar < / source > <nl> + < translation > Zeige obere Werkzeugleiste < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / mainwindow . ui " line = " 266 " / > <nl> + < source > & amp ; Speed in title bar < / source > <nl> + < translation > & amp ; Geschwindigkeit in der Titelleiste < / translation > <nl> < / message > <nl> < message > <nl> - < source > Shutdown qBittorrent when downloads complete < / source > <nl> - < translation type = " obsolete " > qBittorent beenden wenn Downloads vollständig sind < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 269 " / > <nl> + < source > Show transfer speed in title bar < / source > <nl> + < translation > Übertragungsgeschwindigkeit in der Titelleiste anzeigen < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . ui " line = " 156 " / > <nl> < source > & amp ; About < / source > <nl> < translation > & amp ; Über < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / mainwindow . ui " line = " 138 " / > <nl> + < source > & amp ; Add torrent file . . . < / source > <nl> + < translation > Torrent - Datei & amp ; hinzufügen . . . < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / mainwindow . ui " line = " 143 " / > <nl> + < location filename = " . . / mainwindow . ui " line = " 146 " / > <nl> + < source > Exit < / source > <nl> + < translation > Beenden < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . ui " line = " 166 " / > <nl> < source > & amp ; Pause < / source > <nl> Wahrscheinlich haben wir Ihnen hiermit nichts Neues erzählt und werden Sie auch <nl> < source > P & amp ; ause All < / source > <nl> < translation > A & amp ; lle anhalten < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 161 " / > <nl> - < source > & amp ; Resume < / source > <nl> - < translation > & amp ; Fortsetzen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 138 " / > <nl> - < source > & amp ; Add torrent file . . . < / source > <nl> - < translation > Torrent - Datei & amp ; hinzufügen . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 143 " / > <nl> - < location filename = " . . / mainwindow . ui " line = " 146 " / > <nl> - < source > Exit < / source > <nl> - < translation > Beenden < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 317 " / > <nl> - < source > R & amp ; esume All < / source > <nl> - < translation > Alle forts & amp ; etzen < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . ui " line = " 180 " / > <nl> < source > Visit & amp ; Website < / source > <nl> Wahrscheinlich haben wir Ihnen hiermit nichts Neues erzählt und werden Sie auch <nl> < source > Report a & amp ; bug < / source > <nl> < translation > & amp ; Bug melden < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 210 " / > <nl> - < source > & amp ; Documentation < / source > <nl> - < translation > & amp ; Dokumentation < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 215 " / > <nl> - < source > Set global download limit . . . < / source > <nl> - < translation > Globales Downlaod Limit setzen . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 220 " / > <nl> - < source > Set global upload limit . . . < / source > <nl> - < translation > Globals Upload Limit setzen . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > & amp ; Log viewer . . . < / source > <nl> - < translation type = " obsolete " > & amp ; Log Betrachter . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Log viewer < / source > <nl> - < translation type = " obsolete " > Log Betrachter < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Shutdown computer when downloads complete < / source > <nl> - < translation type = " obsolete " > Computer herunterfahren wenn Dowloads vollständig sind < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 290 " / > <nl> - < location filename = " . . / mainwindow . ui " line = " 293 " / > <nl> - < source > Lock qBittorrent < / source > <nl> - < translation > qBittorrent sperren < / translation > <nl> + < message > <nl> + < location filename = " . . / mainwindow . ui " line = " 200 " / > <nl> + < source > Set upload limit . . . < / source > <nl> + < translation > Upload Limit setzen . . . < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 301 " / > <nl> - < source > Import existing torrent . . . < / source > <nl> - < translation > Existierendes Torrent importieren . . . < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 205 " / > <nl> + < source > Set download limit . . . < / source > <nl> + < translation > Download Limit setzen . . . < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 304 " / > <nl> - < source > Import torrent . . . < / source > <nl> - < translation > Torrent importieren . . . < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 210 " / > <nl> + < source > & amp ; Documentation < / source > <nl> + < translation > & amp ; Dokumentation < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 309 " / > <nl> - < source > Donate money < / source > <nl> - < translation > Spenden < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 215 " / > <nl> + < source > Set global download limit . . . < / source > <nl> + < translation > Globales Downlaod Limit setzen . . . < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 312 " / > <nl> - < source > If you like qBittorrent , please donate ! < / source > <nl> - < translation > Bitte spenden Sie wenn Ihnen qBittorrent gefällt ! < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 220 " / > <nl> + < source > Set global upload limit . . . < / source > <nl> + < translation > Globals Upload Limit setzen . . . < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 330 " / > <nl> - < source > Execution & amp ; Log < / source > <nl> - < translation > Ausführungs - & amp ; Log < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 277 " / > <nl> + < source > & amp ; RSS reader < / source > <nl> + < translation > & amp ; RSS Reader < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 333 " / > <nl> - < location filename = " . . / mainwindow . cpp " line = " 1375 " / > <nl> - < source > Execution Log < / source > <nl> - < translation > Ausführungs - Log < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 285 " / > <nl> + < source > Search & amp ; engine < / source > <nl> + < translation > Such & amp ; maschine < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . ui " line = " 341 " / > <nl> Wahrscheinlich haben wir Ihnen hiermit nichts Neues erzählt und werden Sie auch <nl> < translation > Zeige < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 244 " / > <nl> - < location filename = " . . / mainwindow . ui " line = " 247 " / > <nl> - < source > Alternative speed limits < / source > <nl> - < translation > Alternative Geschwindigkeitsbegrenzung < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 277 " / > <nl> - < source > & amp ; RSS reader < / source > <nl> - < translation > & amp ; RSS Reader < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 285 " / > <nl> - < source > Search & amp ; engine < / source > <nl> - < translation > Such & amp ; maschine < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 290 " / > <nl> + < location filename = " . . / mainwindow . ui " line = " 293 " / > <nl> + < source > Lock qBittorrent < / source > <nl> + < translation > qBittorrent sperren < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 255 " / > <nl> - < source > Top & amp ; tool bar < / source > <nl> - < translation > Obere Werk & amp ; zeugleiste < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 301 " / > <nl> + < source > Import existing torrent . . . < / source > <nl> + < translation > Existierendes Torrent importieren . . . < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 258 " / > <nl> - < source > Display top tool bar < / source > <nl> - < translation > Zeige obere Werkzeugleiste < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 304 " / > <nl> + < source > Import torrent . . . < / source > <nl> + < translation > Torrent importieren . . . < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 266 " / > <nl> - < source > & amp ; Speed in title bar < / source > <nl> - < translation > & amp ; Geschwindigkeit in der Titelleiste < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 309 " / > <nl> + < source > Donate money < / source > <nl> + < translation > Spenden < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / mainwindow . ui " line = " 269 " / > <nl> - < source > Show transfer speed in title bar < / source > <nl> - < translation > Übertragungsgeschwindigkeit in der Titelleiste anzeigen < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 312 " / > <nl> + < source > If you like qBittorrent , please donate ! < / source > <nl> + < translation > Bitte spenden Sie wenn Ihnen qBittorrent gefällt ! < / translation > <nl> < / message > <nl> < message > <nl> - < source > Preview file < / source > <nl> - < translation type = " obsolete " > Vorschau Datei < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 330 " / > <nl> + < source > Execution & amp ; Log < / source > <nl> + < translation > Ausführungs - & amp ; Log < / translation > <nl> < / message > <nl> < message > <nl> - < source > Clear log < / source > <nl> - < translation type = " obsolete " > Log löschen < / translation > <nl> + < location filename = " . . / mainwindow . ui " line = " 333 " / > <nl> + < location filename = " . . / mainwindow . cpp " line = " 1375 " / > <nl> + < source > Execution Log < / source > <nl> + < translation > Ausführungs - Log < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . ui " line = " 225 " / > <nl> Wahrscheinlich haben wir Ihnen hiermit nichts Neues erzählt und werden Sie auch <nl> < source > Increase priority < / source > <nl> < translation > Erhöhe Prorität < / translation > <nl> < / message > <nl> - < message > <nl> - < source > qBittorrent % 1 < / source > <nl> - < comment > e . g : qBittorrent v0 . x < / comment > <nl> - < translation type = " obsolete " > qBittorrent % 1 < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . cpp " line = " 146 " / > <nl> < source > Set the password . . . < / source > <nl> Möchten Sie Torrent Dateien und Magnet Links immer mit qBittorent öffnen ? < / tra <nl> < message > <nl> < location filename = " . . / mainwindow . cpp " line = " 461 " / > <nl> < source > Transfers ( % 1 ) < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . cpp " line = " 537 " / > <nl> Möchten Sie Torrent Dateien und Magnet Links immer mit qBittorent öffnen ? < / tra <nl> Reason : disk is full . < / comment > <nl> < translation > Im Torrent % 1 ist einI / O Fehler aufgetreten . Ursache : % 2 < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Alt + 1 < / source > <nl> - < comment > shortcut to switch to first tab < / comment > <nl> - < translation type = " obsolete " > Alt + 1 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Alt + 2 < / source > <nl> - < comment > shortcut to switch to third tab < / comment > <nl> - < translation type = " obsolete " > Alt + 2 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Ctrl + F < / source > <nl> - < comment > shortcut to switch to search tab < / comment > <nl> - < translation type = " obsolete " > Strg + F < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Alt + 3 < / source > <nl> - < comment > shortcut to switch to fourth tab < / comment > <nl> - < translation type = " obsolete " > Alt + 3 < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . cpp " line = " 604 " / > <nl> < source > Recursive download confirmation < / source > <nl> Möchten Sie Torrent Dateien und Magnet Links immer mit qBittorent öffnen ? < / tra <nl> < location filename = " . . / mainwindow . cpp " line = " 1147 " / > <nl> < source > [ D : % 1 / s , U : % 2 / s ] qBittorrent % 3 < / source > <nl> < comment > D = Download ; U = Upload ; % 3 is qBittorrent version < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . cpp " line = " 404 " / > <nl> Sind Sie sicher , daß sie qBittorrent beenden möchten ? < / translation > <nl> < source > Options were saved successfully . < / source > <nl> < translation > Einstellungen wurden erfolgreich gespeichert . < / translation > <nl> < / message > <nl> - < message > <nl> - < source > qBittorrent < / source > <nl> - < translation type = " obsolete " > qBittorrent < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / mainwindow . cpp " line = " 1133 " / > <nl> < location filename = " . . / mainwindow . cpp " line = " 1140 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / properties / peerlistwidget . cpp " line = " 65 " / > <nl> < source > IP < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / peerlistwidget . cpp " line = " 66 " / > <nl> < source > Flags < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / peerlistwidget . cpp " line = " 67 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < location filename = " . . / properties / peerlistwidget . cpp " line = " 68 " / > <nl> < source > Client < / source > <nl> < comment > i . e . : Client application < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / peerlistwidget . cpp " line = " 69 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 93 " / > <nl> < source > Downloads < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 104 " / > <nl> < source > Connection < / source > <nl> < translation > Verbindung < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 115 " / > <nl> + < source > Speed < / source > <nl> + < translation > Geschwindigkeit < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 137 " / > <nl> < source > Web UI < / source > <nl> < translation > Webinterface < / translation > <nl> < / message > <nl> < message > <nl> - < source > Language : < / source > <nl> - < translation type = " obsolete " > Sprache : < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 148 " / > <nl> + < source > Advanced < / source > <nl> + < translation > Fortgeschritten < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 224 " / > <nl> < source > ( Requires restart ) < / source > <nl> < translation > ( Neustart benötigt ) < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Visual style : < / source > <nl> - < translation type = " obsolete " > Visueller Stil : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Transfer list < / source > <nl> - < translation type = " obsolete " > Transferliste < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 258 " / > <nl> < source > Use alternating row colors < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > Abwechselnde Reihenfarben verwenden < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 418 " / > <nl> - < source > Tray icon style : < / source > <nl> - < translation > Tray Icon Stil : < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 426 " / > <nl> - < source > Normal < / source > <nl> - < translation > Normal < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 431 " / > <nl> - < source > Monochrome ( Dark theme ) < / source > <nl> - < translation > Monochrome ( Dark Theme ) < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 300 " / > <nl> + < location filename = " . . / preferences / options . ui " line = " 326 " / > <nl> + < source > Start / Stop Torrent < / source > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 436 " / > <nl> - < source > Monochrome ( Light theme ) < / source > <nl> - < translation > Monochrome ( Light Theme ) < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 310 " / > <nl> + < location filename = " . . / preferences / options . ui " line = " 336 " / > <nl> + < source > No action < / source > <nl> + < translation > Keine Aktion < / translation > <nl> < / message > <nl> < message > <nl> - < source > File system < / source > <nl> - < translation type = " obsolete " > Datei System < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 685 " / > <nl> + < source > Append . ! qB extension to incomplete files < / source > <nl> + < translation > . ! qB Erweiterung für unvollständige Dateiene verwenden < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 788 " / > <nl> < source > Copy . torrent files to : < / source > <nl> < translation > . torrent Datei kopieren nach : < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 837 " / > <nl> - < source > Copy . torrent files for finished downloads to : < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 966 " / > <nl> - < source > This server requires a secure connection ( SSL ) < / source > <nl> - < translation > Dieser Server benötigt eine sichere Verbindung ( SSL ) < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 993 " / > <nl> < source > The following parameters are supported : <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> & lt ; li & gt ; % n : Torrent Name & lt ; / li & gt ; <nl> & lt ; / ul & gt ; < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1035 " / > <nl> - < source > Listening Port < / source > <nl> - < translation > Port auf dem gelauscht wird < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1095 " / > <nl> - < source > Use different port on each startup < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1107 " / > <nl> < source > Connections Limits < / source > <nl> < translation > Verbindungsbeschränkung < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1221 " / > <nl> - < source > Global maximum number of upload slots : < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1260 " / > <nl> < source > Proxy Server < / source > <nl> < translation > Proxyserver < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1356 " / > <nl> - < source > Otherwise , the proxy server is only used for tracker connections < / source > <nl> - < translation > Andererseits wird der Proxyserver nur für Tracker Verbindungen verwendt < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1359 " / > <nl> - < source > Use proxy for peer connections < / source > <nl> - < translation > Proxy für Peerverbindungen verwenden < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1517 " / > <nl> < source > Global Rate Limits < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > Verschlüsselng deaktiviere < / translation > <nl> < / message > <nl> < message > <nl> - < source > Torrent queueing < / source > <nl> - < translation type = " obsolete " > Torrent Warteschlangen < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 2083 " / > <nl> + < source > ( & lt ; a href = & quot ; http : / / github . com / qbittorrent / qBittorrent / wiki / Anonymous - Mode & quot ; & gt ; More information & lt ; / a & gt ; ) < / source > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 2126 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > Sobald ein Torrent hinzugefügt wird < / translation > <nl> < / message > <nl> < message > <nl> - < source > Visual Appearance < / source > <nl> - < translation type = " obsolete " > Visuelles Erscheinungsbild < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 274 " / > <nl> - < source > Action on double - click < / source > <nl> - < translation > Aktion bei Doppelklick < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 283 " / > <nl> - < source > Downloading torrents : < / source > <nl> - < translation > Lade Torrents : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Start / Stop < / source > <nl> - < translation type = " obsolete " > Start / Stop < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 305 " / > <nl> - < location filename = " . . / preferences / options . ui " line = " 331 " / > <nl> - < source > Open destination folder < / source > <nl> - < translation > Zielverzeichnis öffnen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 318 " / > <nl> - < source > Completed torrents : < / source > <nl> - < translation > Abgeschlossene Torrents : < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 350 " / > <nl> - < source > Desktop < / source > <nl> - < translation > Screibtisch < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 363 " / > <nl> - < source > Show splash screen on start up < / source > <nl> - < translation > Splash Screen beim Start zeigen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 373 " / > <nl> - < source > Start qBittorrent minimized < / source > <nl> - < translation > qBittorrent minimiert starten < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Show qBittorrent icon in notification area < / source > <nl> - < translation type = " obsolete " > qBittorrent Icon im Benachrichtigungsbereich zeigen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 399 " / > <nl> - < source > Minimize qBittorrent to notification area < / source > <nl> - < translation > qBittorrent in den Benachrichtigungsbereich minimieren < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 79 " / > <nl> + < location filename = " . . / preferences / options . ui " line = " 82 " / > <nl> + < source > Behavior < / source > <nl> + < translation > Verhalten < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 409 " / > <nl> - < source > Close qBittorrent to notification area < / source > <nl> - < comment > i . e : The systray tray icon will still be visible when closing the main window . < / comment > <nl> - < translation > qBittorrent in den Benachrichtigungsbereich schliessen < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 188 " / > <nl> + < source > Language < / source > <nl> + < translation > Sprache < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 542 " / > <nl> < source > Display torrent content and some options < / source > <nl> < translation > Zeige Inhalt des Torrent und einige Optionen < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Listening port < / source > <nl> - < translation type = " obsolete " > Port auf dem gelauscht wird < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1043 " / > <nl> < source > Port used for incoming connections : < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Random < / source > <nl> < translation > Zufällig < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Enable UPnP port mapping < / source > <nl> - < translation type = " obsolete " > UPnP Port Mapping aktivieren < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Enable NAT - PMP port mapping < / source > <nl> - < translation type = " obsolete " > NAP - PMP Port Mapping aktivieren < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Connections limit < / source > <nl> - < translation type = " obsolete " > Verbindungsbeschränkung < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1113 " / > <nl> < source > Global maximum number of connections : < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < location filename = " . . / preferences / options . ui " line = " 1535 " / > <nl> < location filename = " . . / preferences / options . ui " line = " 1690 " / > <nl> < source > Upload : < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1571 " / > <nl> < location filename = " . . / preferences / options . ui " line = " 1717 " / > <nl> < source > Download : < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1564 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < location filename = " . . / preferences / options . ui " line = " 1710 " / > <nl> < location filename = " . . / preferences / options . ui " line = " 1737 " / > <nl> < source > KiB / s < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 755 " / > <nl> + < source > Remove folder < / source > <nl> + < translation > Verzeichnis entfernen < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 1802 " / > <nl> + < source > to < / source > <nl> + < extracomment > time1 to time2 < / extracomment > <nl> + < translation > bis < / translation > <nl> < / message > <nl> < message > <nl> - < source > Bittorrent features < / source > <nl> - < translation type = " obsolete " > Bittorrent Funktionen < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 1854 " / > <nl> + < source > Every day < / source > <nl> + < translation > Jeden Tag < / translation > <nl> < / message > <nl> < message > <nl> - < source > Enable DHT network ( decentralized ) < / source > <nl> - < translation type = " obsolete " > DHT Netzwerk aktivieren ( dezentralisiert ) < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 1859 " / > <nl> + < source > Week days < / source > <nl> + < translation > Wochentage < / translation > <nl> < / message > <nl> < message > <nl> - < source > Use a different port for DHT and Bittorrent < / source > <nl> - < translation type = " obsolete " > Unterschiedliche Ports für DHT und Bittorrent verwenden < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 1864 " / > <nl> + < source > Week ends < / source > <nl> + < translation > Wochenenden < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1964 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Exchange peers with compatible Bittorrent clients ( µTorrent , Vuze , . . . ) < / source > <nl> < translation > Peers mit kompatiblen Bittorrent Clients austauchen ( µTorrent , Vuze , . . . ) < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Enable Peer Exchange / PeX ( requires restart ) < / source > <nl> - < translation type = " obsolete " > Peer Exchange / PeX aktivieren ( erfordert Neustart ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Enable Local Peer Discovery < / source > <nl> - < translation type = " obsolete " > Lokale Peer Auffindung aktivieren < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Enabled < / source > <nl> - < translation type = " obsolete " > Aktiviert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Forced < / source > <nl> - < translation type = " obsolete " > Erzwungen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Disabled < / source > <nl> - < translation type = " obsolete " > Deaktiviert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > HTTP Communications ( trackers , Web seeds , search engine ) < / source > <nl> - < translation type = " obsolete " > HTTP Kommunikation ( Tracker , Web - Seeds , Suchmaschine ) < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1302 " / > <nl> < source > Host : < / source > <nl> - < translation > < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Peer Communications < / source > <nl> - < translation type = " obsolete " > Peer Kommunikation < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1281 " / > <nl> < source > SOCKS4 < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1268 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > Optionen < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 79 " / > <nl> - < location filename = " . . / preferences / options . ui " line = " 82 " / > <nl> - < source > Behavior < / source > <nl> - < translation > Verhalten < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 115 " / > <nl> - < source > Speed < / source > <nl> - < translation > Geschwindigkeit < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 148 " / > <nl> - < source > Advanced < / source > <nl> - < translation > Fortgeschritten < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 274 " / > <nl> + < source > Action on double - click < / source > <nl> + < translation > Aktion bei Doppelklick < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 196 " / > <nl> - < source > User Interface Language : < / source > <nl> - < translation > Sprache des Benutzerinterface : < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 283 " / > <nl> + < source > Downloading torrents : < / source > <nl> + < translation > Lade Torrents : < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 252 " / > <nl> - < source > Transfer List < / source > <nl> - < translation > Transferliste < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 305 " / > <nl> + < location filename = " . . / preferences / options . ui " line = " 331 " / > <nl> + < source > Open destination folder < / source > <nl> + < translation > Zielverzeichnis öffnen < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 310 " / > <nl> - < location filename = " . . / preferences / options . ui " line = " 336 " / > <nl> - < source > No action < / source > <nl> - < translation > Keine Aktion < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 318 " / > <nl> + < source > Completed torrents : < / source > <nl> + < translation > Abgeschlossene Torrents : < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 356 " / > <nl> - < source > Start qBittorrent on Windows start up < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 350 " / > <nl> + < source > Desktop < / source > <nl> + < translation > Screibtisch < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 449 " / > <nl> - < source > File association < / source > <nl> - < translation > Datei Verbindung < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 363 " / > <nl> + < source > Show splash screen on start up < / source > <nl> + < translation > Splash Screen beim Start zeigen < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 455 " / > <nl> - < source > Use qBittorrent for . torrent files < / source > <nl> - < translation > qBittorrent für . torrent Dateien verwenden < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 373 " / > <nl> + < source > Start qBittorrent minimized < / source > <nl> + < translation > qBittorrent minimiert starten < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 462 " / > <nl> - < source > Use qBittorrent for magnet links < / source > <nl> - < translation > qBittorrent für Magnet Links verwenden < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 399 " / > <nl> + < source > Minimize qBittorrent to notification area < / source > <nl> + < translation > qBittorrent in den Benachrichtigungsbereich minimieren < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 685 " / > <nl> - < source > Append . ! qB extension to incomplete files < / source > <nl> - < translation > . ! qB Erweiterung für unvollständige Dateiene verwenden < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 409 " / > <nl> + < source > Close qBittorrent to notification area < / source > <nl> + < comment > i . e : The systray tray icon will still be visible when closing the main window . < / comment > <nl> + < translation > qBittorrent in den Benachrichtigungsbereich schliessen < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 755 " / > <nl> - < source > Remove folder < / source > <nl> - < translation > Verzeichnis entfernen < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 418 " / > <nl> + < source > Tray icon style : < / source > <nl> + < translation > Tray Icon Stil : < / translation > <nl> < / message > <nl> < message > <nl> - < source > Global speed limits < / source > <nl> - < translation type = " obsolete " > Globale Geschwindigkeitsbegrenzung < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 426 " / > <nl> + < source > Normal < / source > <nl> + < translation > Normal < / translation > <nl> < / message > <nl> < message > <nl> - < source > Alternative global speed limits < / source > <nl> - < translation type = " obsolete " > Alternative globale Geschwindigkeitsbegrenzung < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 431 " / > <nl> + < source > Monochrome ( Dark theme ) < / source > <nl> + < translation > Monochrome ( Dark Theme ) < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1802 " / > <nl> - < source > to < / source > <nl> - < extracomment > time1 to time2 < / extracomment > <nl> - < translation > bis < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 436 " / > <nl> + < source > Monochrome ( Light theme ) < / source > <nl> + < translation > Monochrome ( Light Theme ) < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 552 " / > <nl> - < source > Do not start the download automatically < / source > <nl> - < comment > The torrent will be added to download list in pause state < / comment > <nl> - < translation > Download nicht automatisch starten < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 380 " / > <nl> + < source > Ask for program exit confirmation < / source > <nl> + < translation > Beenden bestätigen < / translation > <nl> < / message > <nl> < message > <nl> - < source > User Interface < / source > <nl> - < translation type = " obsolete " > Benutzerschnittstelle < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 196 " / > <nl> + < source > User Interface Language : < / source > <nl> + < translation > Sprache des Benutzerinterface : < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 126 " / > <nl> - < source > BitTorrent < / source > <nl> - < translation > < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 252 " / > <nl> + < source > Transfer List < / source > <nl> + < translation > Transferliste < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 188 " / > <nl> - < source > Language < / source > <nl> - < translation > Sprache < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 356 " / > <nl> + < source > Start qBittorrent on Windows start up < / source > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 300 " / > <nl> - < location filename = " . . / preferences / options . ui " line = " 326 " / > <nl> - < source > Start / Stop Torrent < / source > <nl> - < translation > < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 390 " / > <nl> + < source > Show qBittorrent in notification area < / source > <nl> + < translation > qBittorrent im Notification Bereich anzeigen < / translation > <nl> < / message > <nl> < message > <nl> - < source > Use monochrome system tray icon ( requires restart ) < / source > <nl> - < translation type = " obsolete " > Monochrome Systemtray - Icons verwenden ( Neustart benötigt ) < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 449 " / > <nl> + < source > File association < / source > <nl> + < translation > Datei Verbindung < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 380 " / > <nl> - < source > Ask for program exit confirmation < / source > <nl> - < translation > Beenden bestätigen < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 455 " / > <nl> + < source > Use qBittorrent for . torrent files < / source > <nl> + < translation > qBittorrent für . torrent Dateien verwenden < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 390 " / > <nl> - < source > Show qBittorrent in notification area < / source > <nl> - < translation > qBittorrent im Notification Bereich anzeigen < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 462 " / > <nl> + < source > Use qBittorrent for magnet links < / source > <nl> + < translation > qBittorrent für Magnet Links verwenden < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 475 " / > <nl> < source > Power Management < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 481 " / > <nl> < source > Inhibit system sleep when torrents are active < / source > <nl> < translation > Das System davon abhalten in den Schlafmodus zu gehen , wenn noch Torrents aktiv sind < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 552 " / > <nl> + < source > Do not start the download automatically < / source > <nl> + < comment > The torrent will be added to download list in pause state < / comment > <nl> + < translation > Download nicht automatisch starten < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 568 " / > <nl> < source > Hard Disk < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Keep incomplete torrents in : < / source > <nl> < translation > Unvollständige Torrents speichern in : < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Append . ! qB extension to incomplete files & apos ; names < / source > <nl> - < translation type = " obsolete " > Die Dateienung . ! qb an unvollständige Dateinamen anhängen < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 692 " / > <nl> < source > Automatically add torrents from : < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Add folder . . . < / source > <nl> < translation > Verzeichnis hinzufügen . . . < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 837 " / > <nl> + < source > Copy . torrent files for finished downloads to : < / source > <nl> + < translation type = " unfinished " / > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 893 " / > <nl> < source > Email notification upon download completion < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > SMTP server : < / source > <nl> < translation > SMTP Server : < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 966 " / > <nl> + < source > This server requires a secure connection ( SSL ) < / source > <nl> + < translation > Dieser Server benötigt eine sichere Verbindung ( SSL ) < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 978 " / > <nl> < source > Run an external program on torrent completion < / source > <nl> < translation > Externes Programm ausführen wenn Torrent vollständig ist < / translation > <nl> < / message > <nl> < message > <nl> - < source > Use % f to pass the torrent path in parameters < / source > <nl> - < translation type = " obsolete " > Verwenden Sie % f um den Torrentpfad als Parameter zu übergeben < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 1035 " / > <nl> + < source > Listening Port < / source > <nl> + < translation > Port auf dem gelauscht wird < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1085 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > UPnP / NAT - PMP Port Wieterleitung meines Routers verwenden < / translation > <nl> < / message > <nl> < message > <nl> - < source > Proxy server < / source > <nl> - < translation type = " obsolete " > Proxyserver < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 1095 " / > <nl> + < source > Use different port on each startup < / source > <nl> + < translation type = " unfinished " / > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 1221 " / > <nl> + < source > Global maximum number of upload slots : < / source > <nl> + < translation type = " unfinished " / > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 1356 " / > <nl> + < source > Otherwise , the proxy server is only used for tracker connections < / source > <nl> + < translation > Andererseits wird der Proxyserver nur für Tracker Verbindungen verwendt < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 1359 " / > <nl> + < source > Use proxy for peer connections < / source > <nl> + < translation > Proxy für Peerverbindungen verwenden < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1431 " / > <nl> < source > IP Filtering < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1472 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > Filter neu laden < / translation > <nl> < / message > <nl> < message > <nl> - < source > Schedule the use of alternative speed limits < / source > <nl> - < translation type = " obsolete " > Benutzung von alternativen Geschwindigkeitsbegrenzungen einteilen < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 1625 " / > <nl> + < source > Enable bandwidth management ( uTP ) < / source > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1778 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > When : < / source > <nl> < translation > Wann : < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1854 " / > <nl> - < source > Every day < / source > <nl> - < translation > Jeden Tag < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1859 " / > <nl> - < source > Week days < / source > <nl> - < translation > Wochentage < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1864 " / > <nl> - < source > Week ends < / source > <nl> - < translation > Wochenenden < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1929 " / > <nl> < source > Privacy < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > Anonymen Modus aktivieren < / translation > <nl> < / message > <nl> < message > <nl> - < source > ( & lt ; a href = & quot ; http : / / sourceforge . net / apps / mediawiki / qbittorrent / index . php ? title = Anonymous_mode & quot ; & gt ; More information & lt ; / a & gt ; ) < / source > <nl> - < translation type = " obsolete " > ( & lt ; a href = & quot ; http : / / sourceforge . net / apps / mediawiki / qbittorrent / index . php ? title = Anonymous_mode & quot ; & gt ; Mehr Informationen & lt ; / a & gt ; ) < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 2225 " / > <nl> + < source > Do not count slow torrents in these limits < / source > <nl> + < translation > Bei diesen Begrenzungen langsame Torrents nicht mit einbeziehen < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 2111 " / > <nl> - < source > Torrent Queueing < / source > <nl> - < translation > Torrent Warteschlange < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 2246 " / > <nl> + < source > Seed torrents until their ratio reaches < / source > <nl> + < translation > Torrents seeden bis diese Verhältnis erreicht wurde < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 2225 " / > <nl> - < source > Do not count slow torrents in these limits < / source > <nl> - < translation > Bei diesen Begrenzungen langsame Torrents nicht mit einbeziehen < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 2278 " / > <nl> + < source > then < / source > <nl> + < translation > dann < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 2235 " / > <nl> - < source > Share Ratio Limiting < / source > <nl> - < translation > Shareverhältnis - Begrenzung < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 2289 " / > <nl> + < source > Pause them < / source > <nl> + < translation > Anhalten < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 2294 " / > <nl> + < source > Remove them < / source > <nl> + < translation > Entfernen < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 2392 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Certificate : < / source > <nl> < translation > Zertifikat : < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 2083 " / > <nl> - < source > ( & lt ; a href = & quot ; http : / / github . com / qbittorrent / qBittorrent / wiki / Anonymous - Mode & quot ; & gt ; More information & lt ; / a & gt ; ) < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 2486 " / > <nl> < source > Key : < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > Registrieren < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 2633 " / > <nl> - < source > Domain name : < / source > <nl> - < translation > Domainname : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Protocol encryption : < / source > <nl> - < translation type = " obsolete " > Protokoll - Verschlüsselung : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Share ratio limiting < / source > <nl> - < translation type = " obsolete " > Shareverhältnis Begrenzung < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 2246 " / > <nl> - < source > Seed torrents until their ratio reaches < / source > <nl> - < translation > Torrents seeden bis diese Verhältnis erreicht wurde < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 2278 " / > <nl> - < source > then < / source > <nl> - < translation > dann < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 2289 " / > <nl> - < source > Pause them < / source > <nl> - < translation > Anhalten < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 2294 " / > <nl> - < source > Remove them < / source > <nl> - < translation > Entfernen < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 2633 " / > <nl> + < source > Domain name : < / source > <nl> + < translation > Domainname : < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1276 " / > <nl> < source > ( None ) < / source > <nl> < translation > ( Keine ) < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 126 " / > <nl> + < source > BitTorrent < / source > <nl> + < translation type = " unfinished " / > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1291 " / > <nl> < source > HTTP < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1328 " / > <nl> < location filename = " . . / preferences / options . ui " line = " 2357 " / > <nl> < source > Port : < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 927 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > Passwort : < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / preferences / options . ui " line = " 1625 " / > <nl> - < source > Enable bandwidth management ( uTP ) < / source > <nl> - < translation type = " unfinished " > Bandbreiten Management einschalten ( uTP ) < / translation > <nl> + < location filename = " . . / preferences / options . ui " line = " 2111 " / > <nl> + < source > Torrent Queueing < / source > <nl> + < translation > Torrent Warteschlange < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options . ui " line = " 2235 " / > <nl> + < source > Share Ratio Limiting < / source > <nl> + < translation > Shareverhältnis - Begrenzung < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 2343 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1286 " / > <nl> < source > SOCKS5 < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options . ui " line = " 1443 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / previewselect . cpp " line = " 49 " / > <nl> < source > Name < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / previewselect . cpp " line = " 50 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < / message > <nl> < / context > <nl> < context > <nl> - < name > ProgramUpdater < / name > <nl> - < message > <nl> - < source > Could not create the file % 1 < / source > <nl> - < translation type = " obsolete " > Die Datei % 1 konnte nicht erstellt werden < / translation > <nl> - < / message > <nl> + < name > PropListDelegate < / name > <nl> < message > <nl> - < source > Failed to download the update at % 1 < / source > <nl> - < comment > % 1 is an URL < / comment > <nl> - < translation type = " obsolete " > Dowload des Update von % 1 fehlgeschlagen < / translation > <nl> + < location filename = " . . / properties / proplistdelegate . h " line = " 112 " / > <nl> + < source > Not downloaded < / source > <nl> + < translation > Nicht heruntergeladen < / translation > <nl> < / message > <nl> - < / context > <nl> - < context > <nl> - < name > PropListDelegate < / name > <nl> < message > <nl> < location filename = " . . / properties / proplistdelegate . h " line = " 121 " / > <nl> < location filename = " . . / properties / proplistdelegate . h " line = " 176 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < comment > Mixed ( priorities < / comment > <nl> < translation > Gemischt < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / properties / proplistdelegate . h " line = " 112 " / > <nl> - < source > Not downloaded < / source > <nl> - < translation > Nicht heruntergeladen < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / properties / proplistdelegate . h " line = " 118 " / > <nl> < location filename = " . . / properties / proplistdelegate . h " line = " 178 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / properties / proptabbar . cpp " line = " 54 " / > <nl> < source > Peers < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / proptabbar . cpp " line = " 58 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Content < / source > <nl> < translation > Inhalt < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Files < / source > <nl> - < translation type = " obsolete " > Dateien < / translation > <nl> - < / message > <nl> < / context > <nl> < context > <nl> < name > PropertiesWidget < / name > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Torrent hash : < / source > <nl> < translation > Torrent Prüfsumme : < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / properties / propertieswidget . ui " line = " 524 " / > <nl> - < source > Comment : < / source > <nl> - < translation > Kommentar : < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . ui " line = " 206 " / > <nl> < source > Share ratio : < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Wasted : < / source > <nl> < translation > Verworfen : < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / properties / propertieswidget . ui " line = " 291 " / > <nl> - < source > Time active : < / source > <nl> - < extracomment > Time ( duration ) the torrent is active ( not paused ) < / extracomment > <nl> - < translation > Aktiv seit : < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / properties / propertieswidget . ui " line = " 481 " / > <nl> - < source > Pieces size : < / source > <nl> - < translation > Größe der Teile : < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / properties / propertieswidget . ui " line = " 668 " / > <nl> - < source > Torrent content : < / source > <nl> - < translation > Inhalt des Torrent : < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / properties / propertieswidget . ui " line = " 721 " / > <nl> - < source > Select All < / source > <nl> - < translation > Alle Auswählen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / properties / propertieswidget . ui " line = " 728 " / > <nl> - < source > Select None < / source > <nl> - < translation > Keine Auswählen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / properties / propertieswidget . ui " line = " 776 " / > <nl> - < location filename = " . . / properties / propertieswidget . ui " line = " 779 " / > <nl> - < source > Do not download < / source > <nl> - < translation > Nicht herunterladen < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . ui " line = " 189 " / > <nl> < source > UP limit : < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > DL limit : < / source > <nl> < translation > DL - Limit : < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Time elapsed : < / source > <nl> - < translation type = " obsolete " > Zeitverlauf : < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . ui " line = " 257 " / > <nl> < source > Connections : < / source > <nl> < translation > Verbindungen : < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / properties / propertieswidget . ui " line = " 291 " / > <nl> + < source > Time active : < / source > <nl> + < extracomment > Time ( duration ) the torrent is active ( not paused ) < / extracomment > <nl> + < translation > Aktiv seit : < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . ui " line = " 308 " / > <nl> < source > Reannounce in : < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . ui " line = " 334 " / > <nl> < source > Information < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . ui " line = " 392 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > Erstellt am : < / translation > <nl> < / message > <nl> < message > <nl> - < source > General < / source > <nl> - < translation type = " obsolete " > Allgemein < / translation > <nl> + < location filename = " . . / properties / propertieswidget . ui " line = " 481 " / > <nl> + < source > Pieces size : < / source > <nl> + < translation > Größe der Teile : < / translation > <nl> < / message > <nl> < message > <nl> - < source > Trackers < / source > <nl> - < translation type = " obsolete " > Tracker < / translation > <nl> + < location filename = " . . / properties / propertieswidget . ui " line = " 524 " / > <nl> + < source > Comment : < / source > <nl> + < translation > Kommentar : < / translation > <nl> < / message > <nl> < message > <nl> - < source > URL seeds < / source > <nl> - < translation type = " obsolete " > URL Seeds < / translation > <nl> + < location filename = " . . / properties / propertieswidget . ui " line = " 668 " / > <nl> + < source > Torrent content : < / source > <nl> + < translation > Inhalt des Torrent : < / translation > <nl> < / message > <nl> < message > <nl> - < source > Files < / source > <nl> - < translation type = " obsolete " > Dateien < / translation > <nl> + < location filename = " . . / properties / propertieswidget . ui " line = " 721 " / > <nl> + < source > Select All < / source > <nl> + < translation > Alle Auswählen < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / properties / propertieswidget . cpp " line = " 456 " / > <nl> - < source > Priority < / source > <nl> - < translation > Priorität < / translation > <nl> + < location filename = " . . / properties / propertieswidget . ui " line = " 728 " / > <nl> + < source > Select None < / source > <nl> + < translation > Keine Auswählen < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . ui " line = " 761 " / > <nl> < source > Normal < / source > <nl> < translation > Normal < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / properties / propertieswidget . ui " line = " 766 " / > <nl> + < source > High < / source > <nl> + < translation > Hoch < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . ui " line = " 771 " / > <nl> < source > Maximum < / source > <nl> < translation > Maximum < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / properties / propertieswidget . ui " line = " 766 " / > <nl> - < source > High < / source > <nl> - < translation > Hoch < / translation > <nl> + < location filename = " . . / properties / propertieswidget . ui " line = " 776 " / > <nl> + < location filename = " . . / properties / propertieswidget . ui " line = " 779 " / > <nl> + < source > Do not download < / source > <nl> + < translation > Nicht herunterladen < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 308 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 324 " / > <nl> < source > % 1 max < / source > <nl> < comment > e . g . 10 max < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 417 " / > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 437 " / > <nl> < source > I / O Error < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 417 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Rename . . . < / source > <nl> < translation > Umbenennen . . . < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / properties / propertieswidget . cpp " line = " 456 " / > <nl> + < source > Priority < / source > <nl> + < translation > Priorität < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 495 " / > <nl> < source > New Web seed < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 501 " / > <nl> < source > Remove Web seed < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 503 " / > <nl> < source > Copy Web seed URL < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 504 " / > <nl> < source > Edit Web seed URL < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 526 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 699 " / > <nl> < source > qBittorrent < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 646 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 692 " / > <nl> < source > Web seed editing < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / propertieswidget . cpp " line = " 693 " / > <nl> < source > Web seed URL : < / source > <nl> - < translation type = " unfinished " > Web Seed URL : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Choose save path < / source > <nl> - < translation type = " obsolete " > Wählen Sie den Speicher - Pfad < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Save path creation error < / source > <nl> - < translation type = " obsolete " > Fehler beim Erstellen des Speicher - Pfades < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Could not create the save path < / source > <nl> - < translation type = " obsolete " > Speicher - Pfad konnte nicht erstellt werden < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < translation > qBittorrent lauscht auf Port : TCP / % 1 < / translation > <nl> < / message > <nl> < message > <nl> - < source > UPnP support [ ON ] < / source > <nl> - < translation type = " obsolete " > UPNP Unterstützung [ EIN ] < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > UPnP support [ OFF ] < / source > <nl> - < translation type = " obsolete " > UPnP Unterstützung [ AUS ] < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > NAT - PMP support [ ON ] < / source > <nl> - < translation type = " obsolete " > NAT - PMP Unterstützung [ EIN ] < / translation > <nl> + < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 405 " / > <nl> + < source > HTTP user agent is % 1 < / source > <nl> + < translation > HTTP Benutzerschnittstelle ist % 1 < / translation > <nl> < / message > <nl> < message > <nl> - < source > NAT - PMP support [ OFF ] < / source > <nl> - < translation type = " obsolete " > NAT - PMP Unterstützung [ AUS ] < / translation > <nl> + < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 432 " / > <nl> + < source > Anonymous mode [ ON ] < / source > <nl> + < translation > Anonymer Modus [ EIN ] < / translation > <nl> < / message > <nl> < message > <nl> - < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 405 " / > <nl> - < source > HTTP user agent is % 1 < / source > <nl> - < translation > HTTP Benutzerschnittstelle ist % 1 < / translation > <nl> + < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 434 " / > <nl> + < source > Anonymous mode [ OFF ] < / source > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> - < source > Using a disk cache size of % 1 MiB < / source > <nl> - < translation type = " obsolete " > Verwende eine Plattencachegröße von % 1 MiB < / translation > <nl> + < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 466 " / > <nl> + < source > Reporting IP address % 1 to trackers . . . < / source > <nl> + < translation > IP Adresse % 1 dem Tracker melden . . . < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 518 " / > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Restart is required to toggle PeX support < / source > <nl> < translation > Neustart erforderlich um PeX Unterstützung umzuschalten < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Local Peer Discovery [ ON ] < / source > <nl> - < translation type = " obsolete " > Lokale Peers finden [ EIN ] < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 541 " / > <nl> < source > Local Peer Discovery support [ OFF ] < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 827 " / > <nl> < source > & apos ; % 1 & apos ; was removed from transfer list and hard disk . < / source > <nl> - < comment > & apos ; xxx . avi & apos ; was removed . . . < / comment > <nl> + < comment > ' xxx . avi ' was removed . . . < / comment > <nl> < translation > & apos ; % 1 & apos ; wurde von der Transferliste und von der Festplatte entfernt . < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 829 " / > <nl> < source > & apos ; % 1 & apos ; was removed from transfer list . < / source > <nl> - < comment > & apos ; xxx . avi & apos ; was removed . . . < / comment > <nl> + < comment > ' xxx . avi ' was removed . . . < / comment > <nl> < translation > & apos ; % 1 & apos ; wurde von der Transferliste entfernt . < / translation > <nl> < / message > <nl> < message > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1078 " / > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1080 " / > <nl> < source > & apos ; % 1 & apos ; is already in download list . < / source > <nl> - < comment > e . g : & apos ; xxx . avi & apos ; is already in download list . < / comment > <nl> + < comment > e . g : ' xxx . avi ' is already in download list . < / comment > <nl> < translation > & apos ; % 1 & apos ; befindet sich bereits in der Downloadliste . < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1205 " / > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1210 " / > <nl> < source > & apos ; % 1 & apos ; resumed . ( fast resume ) < / source > <nl> - < comment > & apos ; / home / y / xxx . torrent & apos ; was resumed . ( fast resume ) < / comment > <nl> + < comment > ' / home / y / xxx . torrent ' was resumed . ( fast resume ) < / comment > <nl> < translation > & apos ; % 1 & apos ; fortgesetzt . ( Schnelles Fortsetzen ) < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2290 " / > <nl> + < source > The computer will now go to sleep mode unless you cancel within the next 15 seconds . . . < / source > <nl> + < translation > Der Computer wird in 15 Sekunden in den Schlafmodus wechseln . . . < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2292 " / > <nl> + < source > The computer will now be switched off unless you cancel within the next 15 seconds . . . < / source > <nl> + < translation > Der Computer wird in 15 Sekunden ausgeschaltet . . . < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2294 " / > <nl> + < source > qBittorrent will now exit unless you cancel within the next 15 seconds . . . < / source > <nl> + < translation > qBittorrent wird in 15 Sekunden beendet . . . < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2840 " / > <nl> + < source > Successfully parsed the provided IP filter : % 1 rules were applied . < / source > <nl> + < comment > % 1 is a number < / comment > <nl> + < translation type = " unfinished " / > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2846 " / > <nl> + < source > Error : Failed to parse the provided IP filter . < / source > <nl> + < translation > Fehler : IP - Filter konnte nicht geparsed werden . < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1005 " / > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1207 " / > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1212 " / > <nl> < source > & apos ; % 1 & apos ; added to download list . < / source > <nl> - < comment > & apos ; / home / y / xxx . torrent & apos ; was added to download list . < / comment > <nl> + < comment > ' / home / y / xxx . torrent ' was added to download list . < / comment > <nl> < translation > & apos ; % 1 & apos ; der Downloadliste hinzugefügt . < / translation > <nl> < / message > <nl> < message > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > UPnP / NAT - PMP support [ OFF ] < / source > <nl> < translation > UPnP / NAT - PMP Unterstützung [ AUS ] < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 432 " / > <nl> - < source > Anonymous mode [ ON ] < / source > <nl> - < translation > Anonymer Modus [ EIN ] < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 434 " / > <nl> - < source > Anonymous mode [ OFF ] < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 466 " / > <nl> - < source > Reporting IP address % 1 to trackers . . . < / source > <nl> - < translation > IP Adresse % 1 dem Tracker melden . . . < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 538 " / > <nl> < source > Local Peer Discovery support [ ON ] < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1049 " / > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1051 " / > <nl> < source > Unable to decode torrent file : & apos ; % 1 & apos ; < / source > <nl> - < comment > e . g : Unable to decode torrent file : & apos ; / home / y / xxx . torrent & apos ; < / comment > <nl> + < comment > e . g : Unable to decode torrent file : ' / home / y / xxx . torrent ' < / comment > <nl> < translation > Konnte Torrentdatei nicht dekodieren : & apos ; % 1 & apos ; < / translation > <nl> < / message > <nl> < message > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > The network interface defined is invalid : % 1 < / source > <nl> < translation > Das angegeben Netzwerkinterface ist ungültig : % 1 < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Trying any other network interface available instead . < / source > <nl> - < translation type = " obsolete " > Versuche stattdessen ein anderes verfügbares Netzwerkinterface . < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 1956 " / > <nl> < source > Listening on IP address % 1 on network interface % 2 . . . < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < source > Unable to decode % 1 torrent file . < / source > <nl> < translation > Konnte Torrentdatei % 1 nicht dekodieren . < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2290 " / > <nl> - < source > The computer will now go to sleep mode unless you cancel within the next 15 seconds . . . < / source > <nl> - < translation > Der Computer wird in 15 Sekunden in den Schlafmodus wechseln . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2292 " / > <nl> - < source > The computer will now be switched off unless you cancel within the next 15 seconds . . . < / source > <nl> - < translation > Der Computer wird in 15 Sekunden ausgeschaltet . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2294 " / > <nl> - < source > qBittorrent will now exit unless you cancel within the next 15 seconds . . . < / source > <nl> - < translation > qBittorrent wird in 15 Sekunden beendet . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2840 " / > <nl> - < source > Successfully parsed the provided IP filter : % 1 rules were applied . < / source > <nl> - < comment > % 1 is a number < / comment > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Successfuly parsed the provided IP filter : % 1 rules were applied . < / source > <nl> - < comment > % 1 is a number < / comment > <nl> - < translation type = " obsolete " > IP - Filter erfolgreich geparsed : % 1 Regeln wurden angewandt . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2846 " / > <nl> - < source > Error : Failed to parse the provided IP filter . < / source > <nl> - < translation > Fehler : IP - Filter konnte nicht geparsed werden . < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2187 " / > <nl> < source > Torrent name : % 1 < / source > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / qbtsession . cpp " line = " 2669 " / > <nl> < source > Downloading & apos ; % 1 & apos ; , please wait . . . < / source > <nl> - < comment > e . g : Downloading & apos ; xxx . torrent & apos ; , please wait . . . < / comment > <nl> + < comment > e . g : Downloading ' xxx . torrent ' , please wait . . . < / comment > <nl> < translation > Lade & apos ; % 1 & apos ; , bitte warten . . . < / translation > <nl> < / message > <nl> < / context > <nl> Would you like to update qBittorrent to version % 1 ? < / source > <nl> < message > <nl> < location filename = " . . / rss / rss . ui " line = " 95 " / > <nl> < source > RSS Downloader . . . < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / rss / rss . ui " line = " 102 " / > <nl> < source > Settings . . . < / source > <nl> < translation > Einstellungen . . . < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Feed URL < / source > <nl> - < translation type = " obsolete " > Feed - URL < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / rss / rss . ui " line = " 166 " / > <nl> - < source > Rename . . . < / source > <nl> - < translation > Umbenennen . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / rss / rss . ui " line = " 174 " / > <nl> - < location filename = " . . / rss / rss . ui " line = " 177 " / > <nl> - < source > Update < / source > <nl> - < translation > Aktualisieren < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > RSS feed downloader . . . < / source > <nl> - < translation type = " obsolete " > RSS - Feed - Downloader . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / rss / rss . ui " line = " 218 " / > <nl> - < source > New folder . . . < / source > <nl> - < translation > Neuer Ordner . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / rss / rss . ui " line = " 223 " / > <nl> - < source > Manage cookies . . . < / source > <nl> - < translation > Cookies verwalten . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > RSS feeds < / source > <nl> - < translation type = " obsolete " > RSS - Feeds < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / rss / rss . ui " line = " 124 " / > <nl> < source > & lt ; ! DOCTYPE HTML PUBLIC & quot ; - / / W3C / / DTD HTML 4 . 0 / / EN & quot ; & quot ; http : / / www . w3 . org / TR / REC - html40 / strict . dtd & quot ; & gt ; <nl> & lt ; html & gt ; & lt ; head & gt ; & lt ; meta name = & quot ; qrichtext & quot ; content = & quot ; 1 & quot ; / & gt ; & lt ; style type = & quot ; text / css & quot ; & gt ; <nl> p , li { white - space : pre - wrap ; } <nl> - & lt ; / style & gt ; & lt ; / head & gt ; & lt ; body style = & quot ; font - family : & apos ; Sans & apos ; ; font - size : 10pt ; font - weight : 400 ; font - style : normal ; & quot ; & gt ; <nl> + & lt ; / style & gt ; & lt ; / head & gt ; & lt ; body style = & quot ; font - family : ' Sans ' ; font - size : 10pt ; font - weight : 400 ; font - style : normal ; & quot ; & gt ; <nl> & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - weight : 600 ; & quot ; & gt ; Torrents : & lt ; / span & gt ; & lt ; span style = & quot ; font - style : italic ; & quot ; & gt ; ( double - click to download ) & lt ; / span & gt ; & lt ; / p & gt ; & lt ; / body & gt ; & lt ; / html & gt ; < / source > <nl> < translation > & lt ; ! DOCTYPE HTML PUBLIC & quot ; - / / W3C / / DTD HTML 4 . 0 / / EN & quot ; & quot ; http : / / www . w3 . org / TR / REC - html40 / strict . dtd & quot ; & gt ; <nl> & lt ; html & gt ; & lt ; head & gt ; & lt ; meta name = & quot ; qrichtext & quot ; content = & quot ; 1 & quot ; / & gt ; & lt ; style type = & quot ; text / css & quot ; & gt ; <nl> p , li { white - space : pre - wrap ; } <nl> & lt ; p style = & quot ; margin - top : 0px ; margin - bottom : 0px ; margin - left : 0px ; margin - right : 0px ; - qt - block - indent : 0 ; text - indent : 0px ; & quot ; & gt ; & lt ; span style = & quot ; font - weight : 600 ; & quot ; & gt ; Torrents : & lt ; / span & gt ; & lt ; span style = & quot ; font - style : italic ; & quot ; & gt ; ( Doppelklick zum downloaden ) & lt ; / span & gt ; & lt ; / p & gt ; & lt ; / body & gt ; & lt ; / html & gt ; < / translation > <nl> < / message > <nl> < message > <nl> - < source > Article title < / source > <nl> - < translation type = " obsolete " > Artikeltitel < / translation > <nl> + < location filename = " . . / rss / rss . ui " line = " 158 " / > <nl> + < location filename = " . . / rss / rss . ui " line = " 161 " / > <nl> + < source > Delete < / source > <nl> + < translation > Löschen < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / rss / rss . ui " line = " 166 " / > <nl> + < source > Rename . . . < / source > <nl> + < translation > Umbenennen . . . < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / rss / rss . ui " line = " 169 " / > <nl> + < source > Rename < / source > <nl> + < translation > Umbenennen < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / rss / rss . ui " line = " 174 " / > <nl> + < location filename = " . . / rss / rss . ui " line = " 177 " / > <nl> + < source > Update < / source > <nl> + < translation > Aktualisieren < / translation > <nl> < / message > <nl> < message > <nl> < location filename = " . . / rss / rss . ui " line = " 182 " / > <nl> p , li { white - space : pre - wrap ; } <nl> < source > Update all feeds < / source > <nl> < translation > Aktualisiere alle Feeds < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / rss / rss . ui " line = " 158 " / > <nl> - < location filename = " . . / rss / rss . ui " line = " 161 " / > <nl> - < source > Delete < / source > <nl> - < translation > Löschen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / rss / rss . ui " line = " 169 " / > <nl> - < source > Rename < / source > <nl> - < translation > Umbenennen < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / rss / rss . ui " line = " 203 " / > <nl> < source > Download torrent < / source > <nl> p , li { white - space : pre - wrap ; } <nl> < source > Copy feed URL < / source > <nl> < translation > Kopiere Feed - URL < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / rss / rss . ui " line = " 218 " / > <nl> + < source > New folder . . . < / source > <nl> + < translation > Neuer Ordner . . . < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / rss / rss . ui " line = " 223 " / > <nl> + < source > Manage cookies . . . < / source > <nl> + < translation > Cookies verwalten . . . < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / rss / rss . ui " line = " 63 " / > <nl> < source > Refresh RSS streams < / source > <nl> p , li { white - space : pre - wrap ; } <nl> < source > New folder < / source > <nl> < translation > Neues Verzeichnis < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Overwrite attempt < / source > <nl> - < translation type = " obsolete " > Versuche zu überschreiben < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > You cannot overwrite % 1 item . < / source > <nl> - < comment > You cannot overwrite myFolder item . < / comment > <nl> - < translation type = " obsolete " > Eintrag % 1 kann nicht überschrieben werden . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > qBittorrent < / source > <nl> - < translation type = " obsolete " > qBittorrent < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / rss / rss_imp . cpp " line = " 210 " / > <nl> < source > This rss feed is already in the list . < / source > <nl> p , li { white - space : pre - wrap ; } <nl> < translation > Ungelesen < / translation > <nl> < / message > <nl> < / context > <nl> - < context > <nl> - < name > RssArticle < / name > <nl> - < message > <nl> - < source > No description available < / source > <nl> - < translation type = " obsolete " > Keine Beschreibung vorhanden < / translation > <nl> - < / message > <nl> - < / context > <nl> < context > <nl> < name > RssFeed < / name > <nl> < message > <nl> p , li { white - space : pre - wrap ; } <nl> < translation > Lade Torrent % 1 automatisch von RSS - Feed % 2 . . . < / translation > <nl> < / message > <nl> < / context > <nl> - < context > <nl> - < name > RssItem < / name > <nl> - < message > <nl> - < source > No description available < / source > <nl> - < translation type = " obsolete " > Keine Beschreibung vorhanden < / translation > <nl> - < / message > <nl> - < / context > <nl> < context > <nl> < name > RssParser < / name > <nl> < message > <nl> < location filename = " . . / rss / rssparser . cpp " line = " 457 " / > <nl> < source > Failed to open downloaded RSS file . < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / rss / rssparser . cpp " line = " 494 " / > <nl> < source > Invalid RSS feed at % 1 . < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > RssSettings < / name > <nl> - < message > <nl> - < source > RSS Reader Settings < / source > <nl> - < translation type = " obsolete " > RSS Reader Einstellungen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > RSS feeds refresh interval : < / source > <nl> - < translation type = " obsolete " > Aktualisierungsintervall für RSS Feeds : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > minutes < / source > <nl> - < translation type = " obsolete " > Minuten < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Maximum number of articles per feed : < / source > <nl> - < translation type = " obsolete " > Maximale Anzahl Artikel pro Feed : < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> p , li { white - space : pre - wrap ; } <nl> < translation > Maximale Anzahl der Artikel pro Feed : < / translation > <nl> < / message > <nl> < / context > <nl> - < context > <nl> - < name > RssStream < / name > <nl> - < message > <nl> - < source > Automatically downloading % 1 torrent from % 2 RSS feed . . . < / source > <nl> - < translation type = " obsolete " > Automatisches laden des Torrent % 1 von RSS - Feed % 2 . . . < / translation > <nl> - < / message > <nl> - < / context > <nl> < context > <nl> < name > ScanFoldersModel < / name > <nl> < message > <nl> p , li { white - space : pre - wrap ; } <nl> < / context > <nl> < context > <nl> < name > SearchEngine < / name > <nl> + < message > <nl> + < location filename = " . . / searchengine / searchengine . cpp " line = " 221 " / > <nl> + < location filename = " . . / searchengine / searchengine . cpp " line = " 251 " / > <nl> + < location filename = " . . / searchengine / searchengine . cpp " line = " 252 " / > <nl> + < source > Search < / source > <nl> + < translation > Suche < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / searchengine / searchengine . cpp " line = " 232 " / > <nl> + < source > Missing Python Interpreter < / source > <nl> + < translation > Fehlender Python Interpreter < / translation > <nl> + < / message > <nl> + < message > <nl> + < location filename = " . . / searchengine / searchengine . cpp " line = " 233 " / > <nl> + < source > Python 2 . x is required to use the search engine but it does not seem to be installed . <nl> + Do you want to install it now ? < / source > <nl> + < translation > Python 2 . x wird benötigt um die Suchmaschine zu benutzen aber es scheint nicht installiert zu sein . Möchten Sie es jetzt installieren ? < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / searchengine / searchengine . cpp " line = " 263 " / > <nl> < source > Empty search pattern < / source > <nl> p , li { white - space : pre - wrap ; } <nl> < source > Searching . . . < / source > <nl> < translation > Suche . . . < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Cut < / source > <nl> - < translation type = " obsolete " > Ausschneiden < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Copy < / source > <nl> - < translation type = " obsolete " > Kopieren < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Paste < / source > <nl> - < translation type = " obsolete " > Einfügen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Clear field < / source > <nl> - < translation type = " obsolete " > Feld leeren < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Clear completion history < / source > <nl> - < translation type = " obsolete " > Vervollständigungshistorie löschen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Confirmation < / source > <nl> - < translation type = " obsolete " > Bestätigen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Are you sure you want to clear the history ? < / source > <nl> - < translation type = " obsolete " > Möchten Sie die Historie wirklich leeren ? < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / searchengine / searchengine . cpp " line = " 221 " / > <nl> - < location filename = " . . / searchengine / searchengine . cpp " line = " 251 " / > <nl> - < location filename = " . . / searchengine / searchengine . cpp " line = " 252 " / > <nl> - < source > Search < / source > <nl> - < translation > Suche < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / searchengine / searchengine . cpp " line = " 232 " / > <nl> - < source > Missing Python Interpreter < / source > <nl> - < translation > Fehlender Python Interpreter < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / searchengine / searchengine . cpp " line = " 233 " / > <nl> - < source > Python 2 . x is required to use the search engine but it does not seem to be installed . <nl> - Do you want to install it now ? < / source > <nl> - < translation > Python 2 . x wird benötigt um die Suchmaschine zu benutzen aber es scheint nicht installiert zu sein . Möchten Sie es jetzt installieren ? < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / searchengine / searchengine . cpp " line = " 492 " / > <nl> < source > Search Engine < / source > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / speedlimitdlg . h " line = " 84 " / > <nl> < source > KiB / s < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> Please install it manually . < / source > <nl> < source > Click to switch to regular speed limits < / source > <nl> < translation > Klick um zu den regulären Geschwindigkeitsbegrenzungen zu wechseln < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Click to disable alternative speed limits < / source > <nl> - < translation type = " obsolete " > Klicken um alternative Geschwindigkeitsbegrenzungen zu deaktivieren < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Click to enable alternative speed limits < / source > <nl> - < translation type = " obsolete " > Klicken um alternative Geschwindigkeitsbegrenzungen zu aktivieren < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / statusbar . h " line = " 220 " / > <nl> < source > Global Download Speed Limit < / source > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / torrentcontentmodel . cpp " line = " 41 " / > <nl> < source > Name < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcontentmodel . cpp " line = " 41 " / > <nl> < source > Size < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcontentmodel . cpp " line = " 42 " / > <nl> < source > Progress < / source > <nl> - < translation type = " unfinished " > Fortschritt < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcontentmodel . cpp " line = " 42 " / > <nl> < source > Priority < / source > <nl> - < translation type = " unfinished " > Priorität < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> Please install it manually . < / source > <nl> < source > Select a file to add to the torrent < / source > <nl> < translation > Wählen Sie einen Datei um sie dem Torrent hinzuzufügen < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Please type an announce URL < / source > <nl> - < translation type = " obsolete " > Bitte Announce URL eingeben < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Announce URL : < / source > <nl> - < comment > Tracker URL < / comment > <nl> - < translation type = " obsolete " > Announce URL : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Please type a web seed url < / source > <nl> - < translation type = " obsolete " > Bitte Web Seed URL eingeben < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Web seed URL : < / source > <nl> - < translation type = " obsolete " > Web Seed URL : < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / torrentcreatordlg . cpp " line = " 113 " / > <nl> < source > No input path set < / source > <nl> Please install it manually . < / source > <nl> < translation > Torrent erfolgreich erstellt : < / translation > <nl> < / message > <nl> < / context > <nl> - < context > <nl> - < name > TorrentFilesModel < / name > <nl> - < message > <nl> - < source > Name < / source > <nl> - < translation type = " obsolete " > Name < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Size < / source > <nl> - < translation type = " obsolete " > Größe < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Progress < / source > <nl> - < translation type = " obsolete " > Fortschritt < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Priority < / source > <nl> - < translation type = " obsolete " > Priorität < / translation > <nl> - < / message > <nl> - < / context > <nl> < context > <nl> < name > TorrentImportDlg < / name > <nl> < message > <nl> < location filename = " . . / torrentimportdlg . ui " line = " 14 " / > <nl> < source > Torrent Import < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentimportdlg . ui " line = " 53 " / > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / torrentimportdlg . ui " line = " 131 " / > <nl> < source > Import < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentimportdlg . cpp " line = " 68 " / > <nl> Please install it manually . < / source > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 250 " / > <nl> < source > Name < / source > <nl> < comment > i . e : torrent name < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 252 " / > <nl> Please install it manually . < / source > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 255 " / > <nl> < source > Seeds < / source > <nl> < comment > i . e . full sources ( often untranslated ) < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 256 " / > <nl> < source > Peers < / source > <nl> < comment > i . e . partial sources ( often untranslated ) < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 257 " / > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 261 " / > <nl> < source > Label < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 262 " / > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 264 " / > <nl> < source > Tracker < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 265 " / > <nl> Please install it manually . < / source > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 268 " / > <nl> < source > Amount uploaded < / source > <nl> < comment > Amount of data uploaded ( e . g . in MB ) < / comment > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 269 " / > <nl> Please install it manually . < / source > <nl> < location filename = " . . / qtlibtorrent / torrentmodel . cpp " line = " 271 " / > <nl> < source > Save path < / source > <nl> < comment > Torrent save path < / comment > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 64 " / > <nl> < source > URL < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 65 " / > <nl> < source > Status < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 66 " / > <nl> < source > Peers < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 67 " / > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 360 " / > <nl> < source > Tracker URL : < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 361 " / > <nl> < source > Tracker editing < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 372 " / > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 385 " / > <nl> < source > Tracker editing failed < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 372 " / > <nl> < source > The tracker URL entered is invalid . < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 385 " / > <nl> < source > The tracker URL already exists . < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 413 " / > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 419 " / > <nl> < source > Copy tracker url < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 420 " / > <nl> < source > Edit selected tracker URL < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / trackerlist . cpp " line = " 418 " / > <nl> < source > Remove tracker < / source > <nl> < translation > Tracker entfernen < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Force reannounce < / source > <nl> - < translation type = " obsolete " > Bekanntgebung forcieren < / translation > <nl> - < / message > <nl> < / context > <nl> < context > <nl> < name > TrackersAdditionDlg < / name > <nl> Please install it manually . < / source > <nl> < location filename = " . . / transferlistdelegate . h " line = " 128 " / > <nl> < source > / s < / source > <nl> < comment > / second ( . i . e per second ) < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / transferlistdelegate . h " line = " 137 " / > <nl> < source > KiB / s < / source > <nl> < comment > KiB / second ( . i . e per second ) < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / transferlistdelegate . h " line = " 147 " / > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / transferlistfilterswidget . h " line = " 206 " / > <nl> < source > Torrents < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / transferlistfilterswidget . h " line = " 212 " / > <nl> < source > Labels < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / transferlistfilterswidget . h " line = " 226 " / > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / transferlistfilterswidget . h " line = " 371 " / > <nl> < source > Label : < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / transferlistfilterswidget . h " line = " 376 " / > <nl> Please install it manually . < / source > <nl> < / context > <nl> < context > <nl> < name > TransferListWidget < / name > <nl> - < message > <nl> - < source > Down Speed < / source > <nl> - < comment > i . e : Download speed < / comment > <nl> - < translation type = " obsolete " > DL - Rate < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Up Speed < / source > <nl> - < comment > i . e : Upload speed < / comment > <nl> - < translation type = " obsolete " > UL - Rate < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > ETA < / source > <nl> - < comment > i . e : Estimated Time of Arrival / Time left < / comment > <nl> - < translation type = " obsolete " > voraussichtliche Dauer < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 542 " / > <nl> < source > Column visibility < / source > <nl> < translation > Sichtbarkeit der Spalten < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Name < / source > <nl> - < comment > i . e : torrent name < / comment > <nl> - < translation type = " obsolete " > Name < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Size < / source > <nl> - < comment > i . e : torrent size < / comment > <nl> - < translation type = " obsolete " > Größe < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Done < / source > <nl> - < comment > % Done < / comment > <nl> - < translation type = " obsolete " > Fertig < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Status < / source > <nl> - < comment > Torrent status ( e . g . downloading , seeding , paused ) < / comment > <nl> - < translation type = " obsolete " > Status < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Ratio < / source > <nl> - < comment > Share ratio < / comment > <nl> - < translation type = " obsolete " > Verhältnis < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 778 " / > <nl> < source > Label < / source > <nl> - < translation > < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Added On < / source > <nl> - < comment > Torrent was added to transfer list on 01 / 01 / 2010 08 : 00 < / comment > <nl> - < translation type = " obsolete " > Hinzugefügt am < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Completed On < / source > <nl> - < comment > Torrent was completed on 01 / 01 / 2010 08 : 00 < / comment > <nl> - < translation type = " obsolete " > Vervollständigt am < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Down Limit < / source > <nl> - < comment > i . e : Download limit < / comment > <nl> - < translation type = " obsolete " > Download Begrenzung < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Up Limit < / source > <nl> - < comment > i . e : Upload limit < / comment > <nl> - < translation type = " obsolete " > Upload Begrenzung < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 242 " / > <nl> < source > Choose save path < / source > <nl> < translation > Speicherort auswählen < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Save path creation error < / source > <nl> - < translation type = " obsolete " > Fehler beim erstellen des Speicherortes < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Could not create the save path < / source > <nl> - < translation type = " obsolete " > Speicherort konnte nicht erstellt werden < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 464 " / > <nl> < source > Torrent Download Speed Limiting < / source > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 530 " / > <nl> < source > Recheck confirmation < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 530 " / > <nl> < source > Are you sure you want to recheck the selected torrent ( s ) ? < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 605 " / > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 605 " / > <nl> < source > Label : < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 610 " / > <nl> Please install it manually . < / source > <nl> < source > Limit download rate . . . < / source > <nl> < translation > Downlaodrate begrenzen . . . < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / transferlistwidget . cpp " line = " 821 " / > <nl> - < source > Priority < / source > <nl> - < translation > Priorität < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 676 " / > <nl> < source > Open destination folder < / source > <nl> Please install it manually . < / source > <nl> < source > Set location . . . < / source > <nl> < translation > Ort setzen . . . < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / transferlistwidget . cpp " line = " 821 " / > <nl> + < source > Priority < / source > <nl> + < translation > Priorität < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / transferlistwidget . cpp " line = " 688 " / > <nl> < source > Force recheck < / source > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / main . cpp " line = " 88 " / > <nl> < source > run in daemon - mode ( background ) < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / main . cpp " line = " 90 " / > <nl> Please install it manually . < / source > <nl> < / context > <nl> < context > <nl> < name > about < / name > <nl> - < message > <nl> - < source > qBittorrent < / source > <nl> - < translation type = " obsolete " > qBittorrent < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / about_imp . h " line = " 64 " / > <nl> < source > I would like to thank the following people who volunteered to translate qBittorrent : < / source > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / properties / peer . ui " line = " 36 " / > <nl> < source > IP < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / properties / peer . ui " line = " 59 " / > <nl> < source > Port < / source > <nl> - < translation > < / translation > <nl> - < / message > <nl> - < / context > <nl> - < context > <nl> - < name > addTorrentDialog < / name > <nl> - < message > <nl> - < source > Torrent addition dialog < / source > <nl> - < translation type = " obsolete " > Dialog zum Hinzufügen eines Torrent < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Save path : < / source > <nl> - < translation type = " obsolete " > Speicher - Pfad : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > . . . < / source > <nl> - < translation type = " obsolete " > . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Set as default save path < / source > <nl> - < translation type = " obsolete " > Als Standard Pfeicherpfad setzen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Torrent size : < / source > <nl> - < translation type = " obsolete " > Torrent - Größe : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Unknown < / source > <nl> - < translation type = " obsolete " > Unbekannt < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Free disk space : < / source > <nl> - < translation type = " obsolete " > Freier Festplattenspeicher : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Torrent content : < / source > <nl> - < translation type = " obsolete " > Torrent Inhalt : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Select All < / source > <nl> - < translation type = " obsolete " > Alle Auswählen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Select None < / source > <nl> - < translation type = " obsolete " > Keine Auswählen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Download in sequential order ( slower but good for previewing ) < / source > <nl> - < translation type = " obsolete " > Der Reihe nach laden ( langsamer , aber besser zum Vorschauen ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Skip file checking and start seeding immediately < / source > <nl> - < translation type = " obsolete " > Überspringe das Überprüfen der Datei und direkt mit dem Seeden beginnen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Do not download < / source > <nl> - < translation type = " obsolete " > Nicht herunterladen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Add to download list in paused state < / source > <nl> - < translation type = " obsolete " > Der Download Liste im Pause - Modus hinzufügen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Add < / source > <nl> - < translation type = " obsolete " > Hinzufügen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Cancel < / source > <nl> - < translation type = " obsolete " > Abbrechen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Normal < / source > <nl> - < translation type = " obsolete " > Normal < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > High < / source > <nl> - < translation type = " obsolete " > Hoch < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Maximum < / source > <nl> - < translation type = " obsolete " > Maximum < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> Please install it manually . < / source > <nl> < source > Torrent file creation < / source > <nl> < translation > Torrent - Datei Erstellung < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Announce urls ( trackers ) : < / source > <nl> - < translation type = " obsolete " > Announce URLs ( Tracker ) : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Comment ( optional ) : < / source > <nl> - < translation type = " obsolete " > Kommentar ( optional ) : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Web seeds urls ( optional ) : < / source > <nl> - < translation type = " obsolete " > Web Seeds URLs ( optional ) : < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / torrentcreator / createtorrent . ui " line = " 48 " / > <nl> - < source > File or folder to add to the torrent : < / source > <nl> - < translation > Datei oder Ordner die dem Torrent hinzugefügt werden : < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 60 " / > <nl> < source > Add file < / source > <nl> Please install it manually . < / source > <nl> < source > Add folder < / source > <nl> < translation > Verzeichnis hinzufügen < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / torrentcreator / createtorrent . ui " line = " 48 " / > <nl> + < source > File or folder to add to the torrent : < / source > <nl> + < translation > Datei oder Ordner die dem Torrent hinzugefügt werden : < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 78 " / > <nl> < source > Tracker URLs : < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 88 " / > <nl> Please install it manually . < / source > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 127 " / > <nl> < source > You can separate tracker tiers / groups with an empty line . < / source > <nl> < comment > A tracker tier is a group of trackers , consisting of a main tracker and its mirrors . < / comment > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 148 " / > <nl> Please install it manually . < / source > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 165 " / > <nl> < source > 32 KiB < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 170 " / > <nl> < source > 64 KiB < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 175 " / > <nl> < source > 128 KiB < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 180 " / > <nl> < source > 256 KiB < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 185 " / > <nl> < source > 512 KiB < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 190 " / > <nl> < source > 1 MiB < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 195 " / > <nl> < source > 2 MiB < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 200 " / > <nl> < source > 4 MiB < / source > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / torrentcreator / createtorrent . ui " line = " 208 " / > <nl> Please install it manually . < / source > <nl> < translation > Fortschritt : < / translation > <nl> < / message > <nl> < / context > <nl> - < context > <nl> - < name > createtorrent < / name > <nl> - < message > <nl> - < source > Select destination torrent file < / source > <nl> - < translation type = " obsolete " > Ziel - Torrent Datei auswählen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Torrent Files < / source > <nl> - < translation type = " obsolete " > Torrent Dateien < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > No input path set < / source > <nl> - < translation type = " obsolete " > Kein Eingangs - Pfad gesetzt < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Please type an input path first < / source > <nl> - < translation type = " obsolete " > Bitte geben Sie zuerst einen Eingangspfad an < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Torrent creation < / source > <nl> - < translation type = " obsolete " > Torrent Erstellung < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Torrent was created successfully : < / source > <nl> - < translation type = " obsolete " > Torrent erfolgreich erstellt : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Select a folder to add to the torrent < / source > <nl> - < translation type = " obsolete " > Ordner wählen um ihn dem Torrent hinzuzufügen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Please type an announce URL < / source > <nl> - < translation type = " obsolete " > Bitte Announce URL eingeben < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Torrent creation was unsuccessful , reason : % 1 < / source > <nl> - < translation type = " obsolete " > Torrent Erstellung nicht erfolgreich , Grund : % 1 < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Announce URL : < / source > <nl> - < comment > Tracker URL < / comment > <nl> - < translation type = " obsolete " > Announce URL : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Please type a web seed url < / source > <nl> - < translation type = " obsolete " > Bitte Web Seed URL eingeben < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Web seed URL : < / source > <nl> - < translation type = " obsolete " > Web Seed URL : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Select a file to add to the torrent < / source > <nl> - < translation type = " obsolete " > Datei wählen um sie dem Torrent hinzuzufügen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Created torrent file is invalid . It won & apos ; t be added to download list . < / source > <nl> - < translation type = " obsolete " > Die erstellte Torrent - Datei ist ungültig . Sie wird nicht der Donwload - Liste hinzugefügt . < / translation > <nl> - < / message > <nl> - < / context > <nl> < context > <nl> < name > downloadFromURL < / name > <nl> - < message > <nl> - < source > Download Torrents from URLs < / source > <nl> - < translation type = " obsolete " > Torrents von URLs laden < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Only one URL per line < / source > <nl> - < translation type = " obsolete " > Nur eine URL pro Zeile < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / downloadfromurldlg . ui " line = " 28 " / > <nl> < source > Add torrent links < / source > <nl> Please install it manually . < / source > <nl> < translation > Bitte geben Sie mindestens eine URL an . < / translation > <nl> < / message > <nl> < / context > <nl> - < context > <nl> - < name > downloadThread < / name > <nl> - < message > <nl> - < source > I / O Error < / source > <nl> - < translation type = " obsolete " > I / O Fehler < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The remote host name was not found ( invalid hostname ) < / source > <nl> - < translation type = " obsolete " > Der entfernte Hostname konnte nicht gefunden werden ( ungültiger Hostname ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The operation was canceled < / source > <nl> - < translation type = " obsolete " > Die Operation wurde abgebrochen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The remote server closed the connection prematurely , before the entire reply was received and processed < / source > <nl> - < translation type = " obsolete " > Der entfernte Server hat die Verbindung beendet bevor die gesamte Antwort empfangen und verarbeitet werden konnte < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The connection to the remote server timed out < / source > <nl> - < translation type = " obsolete " > Zeitüberschreitung bei der Verbindung mit dem entfernten Server < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > SSL / TLS handshake failed < / source > <nl> - < translation type = " obsolete " > SSL / TLS Handshake fehlgeschlagen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The remote server refused the connection < / source > <nl> - < translation type = " obsolete " > Der entfernte Server hat die Verbindung verweigert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The connection to the proxy server was refused < / source > <nl> - < translation type = " obsolete " > Die Verbindung zum Proxy - Server wurde verweigert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The proxy server closed the connection prematurely < / source > <nl> - < translation type = " obsolete " > Der Proxy - Server hat die Verbindung vorzeitig beendet < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The proxy host name was not found < / source > <nl> - < translation type = " obsolete " > Der Proxy - Hostname wurde nicht gefunden < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The connection to the proxy timed out or the proxy did not reply in time to the request sent < / source > <nl> - < translation type = " obsolete " > Zeitüberschreitung beim Verbindungsaufbau mit dem Proxy oder der Proxy hat nicht in angemessener Zeit auf Anfrage reagiert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The proxy requires authentication in order to honour the request but did not accept any credentials offered < / source > <nl> - < translation type = " obsolete " > Der Proxy benötigt Authentifizierung um die Anfrage zu bearbeiten und hat keine der angebotenen Zugangsdaten akzeptiert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The access to the remote content was denied ( 401 ) < / source > <nl> - < translation type = " obsolete " > Der Zugriff auf den entfernten Inhalt wurde verweigert ( 401 ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The operation requested on the remote content is not permitted < / source > <nl> - < translation type = " obsolete " > Die angeforderte Operation auf den entfernten Inhalt ist nicht erlaubt < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The remote content was not found at the server ( 404 ) < / source > <nl> - < translation type = " obsolete " > Der entfernte Inhalte wurde auf dem Server nicht gefunden ( 404 ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The remote server requires authentication to serve the content but the credentials provided were not accepted < / source > <nl> - < translation type = " obsolete " > Der entfernte Server benötigt Authentifizierung um den Inhalt auszuliefern , aber die angebotenen Zugangsdaten wurden nicht akzeptiert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The Network Access API cannot honor the request because the protocol is not known < / source > <nl> - < translation type = " obsolete " > Die Network - Access - API konnte die Anfrage nicht bearbeiten , unbekanntes Protokoll < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The requested operation is invalid for this protocol < / source > <nl> - < translation type = " obsolete " > Die angeforderte Operation ist ungütlig für dieses Protokoll < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > An unknown network - related error was detected < / source > <nl> - < translation type = " obsolete " > Ein unbekannter Netzwerk - Fehler ist aufgetreten < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > An unknown proxy - related error was detected < / source > <nl> - < translation type = " obsolete " > Ein unbekannter Proxy - Fehler ist aufgetreten < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > An unknown error related to the remote content was detected < / source > <nl> - < translation type = " obsolete " > Unbekannter Fehler in Verbindung mit dem entfernten Inhalt ist aufgetreten < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > A breakdown in protocol was detected < / source > <nl> - < translation type = " obsolete " > Eine Störung im Protokoll ist aufgetreten < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Unknown error < / source > <nl> - < translation type = " obsolete " > Unbekannter Fehler < / translation > <nl> - < / message > <nl> - < / context > <nl> < context > <nl> < name > engineSelect < / name > <nl> < message > <nl> Please install it manually . < / source > <nl> < source > Close < / source > <nl> < translation > Schließen < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Enable < / source > <nl> - < translation type = " obsolete " > Aktivieren < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Disable < / source > <nl> - < translation type = " obsolete " > Deaktivieren < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / searchengine / engineselect . ui " line = " 124 " / > <nl> < source > Uninstall < / source > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < source > All your plugins are already up to date . < / source > <nl> < translation > Alle Plugins sind auf dem neuesten Stand . < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / searchengine / engineselectdlg . cpp " line = " 177 " / > <nl> - < source > All selected plugins were uninstalled successfully < / source > <nl> - < translation > Alle ausgewählten Plugins wurden erfolgreich deinstalliert < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / searchengine / engineselectdlg . cpp " line = " 263 " / > <nl> < source > % 1 search engine plugin could not be updated , keeping old version . < / source > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < comment > % 1 is the name of the search engine < / comment > <nl> < translation > % 1 Suchmaschinen Plugin konnte nicht installiert werden . < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / searchengine / engineselectdlg . cpp " line = " 177 " / > <nl> + < source > All selected plugins were uninstalled successfully < / source > <nl> + < translation > Alle ausgewählten Plugins wurden erfolgreich deinstalliert < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / searchengine / engineselectdlg . cpp " line = " 277 " / > <nl> < source > % 1 search engine plugin was successfully updated . < / source > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < message > <nl> < location filename = " . . / stacktrace_win_dlg . ui " line = " 14 " / > <nl> < source > Crash info < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < location filename = " . . / fs_utils . cpp " line = " 461 " / > <nl> < location filename = " . . / fs_utils . cpp " line = " 473 " / > <nl> < source > Downloads < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < location filename = " . . / misc . cpp " line = " 246 " / > <nl> < source > / s < / source > <nl> < comment > per second < / comment > <nl> - < translation type = " unfinished " > / s < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / misc . cpp " line = " 391 " / > <nl> < source > % 1h % 2m < / source > <nl> < comment > e . g : 3hours 5minutes < / comment > <nl> - < translation > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / misc . cpp " line = " 396 " / > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < comment > e . g : 2days 10hours < / comment > <nl> < translation > % 1t % 2h < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Unknown < / source > <nl> - < translation type = " obsolete " > Unbekannt < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / misc . cpp " line = " 236 " / > <nl> < source > Unknown < / source > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < message > <nl> < location filename = " . . / webui / btjson . cpp " line = " 241 " / > <nl> < source > Working < / source > <nl> - < translation type = " unfinished " > Funktioniert < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / btjson . cpp " line = " 244 " / > <nl> < source > Updating . . . < / source > <nl> - < translation type = " unfinished " > Aktualisiere . . . < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / btjson . cpp " line = " 246 " / > <nl> < source > Not working < / source > <nl> - < translation type = " unfinished " > Funktioniert nicht < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / btjson . cpp " line = " 246 " / > <nl> < source > Not contacted yet < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / btjson . cpp " line = " 298 " / > <nl> < location filename = " . . / webui / btjson . cpp " line = " 299 " / > <nl> < source > this session < / source > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / btjson . cpp " line = " 310 " / > <nl> < source > Seeded for % 1 < / source > <nl> < comment > e . g . Seeded for 3m10s < / comment > <nl> - < translation type = " unfinished " > Geseeded seit % 1 < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / btjson . cpp " line = " 312 " / > <nl> < source > % 1 max < / source > <nl> < comment > e . g . 10 max < / comment > <nl> - < translation type = " unfinished " > % 1 max < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / btjson . cpp " line = " 380 " / > <nl> < source > D : % 1 / s - T : % 2 < / source > <nl> < comment > Download speed : x KiB / s - Transferred : x MiB < / comment > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / webui / btjson . cpp " line = " 381 " / > <nl> < source > U : % 1 / s - T : % 2 < / source > <nl> < comment > Upload speed : x KiB / s - Transferred : x MiB < / comment > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < / context > <nl> < context > <nl> < name > options_imp < / name > <nl> + < message > <nl> + < location filename = " . . / preferences / options_imp . cpp " line = " 1144 " / > <nl> + < location filename = " . . / preferences / options_imp . cpp " line = " 1146 " / > <nl> + < source > Choose export directory < / source > <nl> + < translation > Export - Verzeichnis wählen < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / preferences / options_imp . cpp " line = " 1186 " / > <nl> < location filename = " . . / preferences / options_imp . cpp " line = " 1188 " / > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < source > Choose a save directory < / source > <nl> < translation > Verzeichnis zum Speichern auswählen < / translation > <nl> < / message > <nl> + < message > <nl> + < location filename = " . . / preferences / options_imp . cpp " line = " 1168 " / > <nl> + < location filename = " . . / preferences / options_imp . cpp " line = " 1170 " / > <nl> + < source > Choose an ip filter file < / source > <nl> + < translation > IP - Filter - Datei wählen < / translation > <nl> + < / message > <nl> < message > <nl> < location filename = " . . / preferences / options_imp . cpp " line = " 1101 " / > <nl> < source > Add directory to scan < / source > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < source > Failed to add Scan Folder & apos ; % 1 & apos ; : % 2 < / source > <nl> < translation > Konnte Scan - Verzeichnis & apos ; % 1 & apos ; nicht hinzufügen : % 2 < / translation > <nl> < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options_imp . cpp " line = " 1144 " / > <nl> - < location filename = " . . / preferences / options_imp . cpp " line = " 1146 " / > <nl> - < source > Choose export directory < / source > <nl> - < translation > Export - Verzeichnis wählen < / translation > <nl> - < / message > <nl> - < message > <nl> - < location filename = " . . / preferences / options_imp . cpp " line = " 1168 " / > <nl> - < location filename = " . . / preferences / options_imp . cpp " line = " 1170 " / > <nl> - < source > Choose an ip filter file < / source > <nl> - < translation > IP - Filter - Datei wählen < / translation > <nl> - < / message > <nl> < message > <nl> < location filename = " . . / preferences / options_imp . cpp " line = " 1168 " / > <nl> < location filename = " . . / preferences / options_imp . cpp " line = " 1170 " / > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < location filename = " . . / preferences / options_imp . cpp " line = " 1292 " / > <nl> < source > Successfully parsed the provided IP filter : % 1 rules were applied . < / source > <nl> < comment > % 1 is a number < / comment > <nl> - < translation type = " unfinished " > < / translation > <nl> + < translation type = " unfinished " / > <nl> < / message > <nl> < message > <nl> < location filename = " . . / preferences / options_imp . cpp " line = " 1363 " / > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < source > This is not a valid SSL certificate . < / source > <nl> < translation > Dies ist kein gültiges SSL Zertifikat . < / translation > <nl> < / message > <nl> - < message > <nl> - < source > Succesfully refreshed < / source > <nl> - < translation type = " obsolete " > Erfolgreich aktualisiert < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Successfuly parsed the provided IP filter : % 1 rules were applied . < / source > <nl> - < comment > % 1 is a number < / comment > <nl> - < translation type = " obsolete " > IP - Filter erfolgreich geparsed : % 1 Regeln wurden angewandt . < / translation > <nl> - < / message > <nl> < / context > <nl> < context > <nl> < name > pluginSourceDlg < / name > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < translation > Abbrechen < / translation > <nl> < / message > <nl> < / context > <nl> - < context > <nl> - < name > previewSelect < / name > <nl> - < message > <nl> - < source > Preview impossible < / source > <nl> - < translation type = " obsolete " > Vorschau unmöglich < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Sorry , we can & apos ; t preview this file < / source > <nl> - < translation type = " obsolete " > Bedauere , wir können keine Vorschau für diese Datei erstellen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Name < / source > <nl> - < translation type = " obsolete " > Name < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Size < / source > <nl> - < translation type = " obsolete " > Größe < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Progress < / source > <nl> - < translation type = " obsolete " > Fortschritt < / translation > <nl> - < / message > <nl> - < / context > <nl> < context > <nl> < name > search_engine < / name > <nl> < message > <nl> Die Plugins wurden jedoch deaktiviert . < / translation > <nl> < translation > Suchmaschinen . . . < / translation > <nl> < / message > <nl> < / context > <nl> - < context > <nl> - < name > torrentAdditionDialog < / name > <nl> - < message > <nl> - < source > Unable to decode torrent file : < / source > <nl> - < translation type = " obsolete " > Torrent Datei kann nicht dekodiert werden : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Choose save path < / source > <nl> - < translation type = " obsolete " > Wählen Sie den Speicher - Pfad < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Unable to decode magnet link : < / source > <nl> - < translation type = " obsolete " > Magnet - Link konnte nicht dekodiert werden : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Magnet Link < / source > <nl> - < translation type = " obsolete " > Magnet - Link < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Rename . . . < / source > <nl> - < translation type = " obsolete " > Umbenennen . . . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Rename the file < / source > <nl> - < translation type = " obsolete " > Datei umbenennen < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > New name : < / source > <nl> - < translation type = " obsolete " > Neuer Name : < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The file could not be renamed < / source > <nl> - < translation type = " obsolete " > Die Datei konnte nicht umbenannt werden < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > This file name contains forbidden characters , please choose a different one . < / source > <nl> - < translation type = " obsolete " > Der Dateiname enthält ungültige Zeichen , bitte einen anderen wählen . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > This name is already in use in this folder . Please use a different name . < / source > <nl> - < translation type = " obsolete " > Der Dateiname wird in diesem Verzeichnis bereits verwendet . Bitte anderen wählen . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > The folder could not be renamed < / source > <nl> - < translation type = " obsolete " > Das Verzeichnis konnte nicht umbenannt werden < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > ( % 1 left after torrent download ) < / source > <nl> - < comment > e . g . ( 100MiB left after torrent download ) < / comment > <nl> - < translation type = " obsolete " > ( % 1 übrig nachdem der Torrent geladen wurde ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > ( % 1 more are required to download ) < / source > <nl> - < comment > e . g . ( 100MiB more are required to download ) < / comment > <nl> - < translation type = " obsolete " > ( % 1 mehr benötigt u die Datei downloaden zu können ) < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Empty save path < / source > <nl> - < translation type = " obsolete " > Leerer Speicher - Pfad < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Please enter a save path < / source > <nl> - < translation type = " obsolete " > Bitte geben Sie einen Speicher - Pfad ein < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Save path creation error < / source > <nl> - < translation type = " obsolete " > Fehler beim erstellen des Speicher - Pfades < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Could not create the save path < / source > <nl> - < translation type = " obsolete " > Speicher - Pfad konnte nicht erstellt werden < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Invalid label name < / source > <nl> - < translation type = " obsolete " > Ungültiger Labelname < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Please don & apos ; t use any special characters in the label name . < / source > <nl> - < translation type = " obsolete " > Bitte keine Sonderzeichen im Labelname verwenden . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Seeding mode error < / source > <nl> - < translation type = " obsolete " > Seeding - Modus - Fehler < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > You chose to skip file checking . However , local files do not seem to exist in the current destionation folder . Please disable this feature or update the save path . < / source > <nl> - < translation type = " obsolete " > Sie haben sich entschlossen das Überprüfen der Dateien zu überspringen . Lokale Dateien scheinen jedoch im aktuellen Zielverzeichnis nicht zu existieren . Bitte deaktivieren Sie diese Eigenschaft oder aktualisieren Sie den Speicherpfad . < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Invalid file selection < / source > <nl> - < translation type = " obsolete " > Ungültige Datei Auswahl < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > You must select at least one file in the torrent < / source > <nl> - < translation type = " obsolete " > Sie müssen mindestens eine Datei aus dem Torrent selektieren < / translation > <nl> - < / message > <nl> - < message > <nl> - < source > Priority < / source > <nl> - < translation type = " obsolete " > Priorität < / translation > <nl> - < / message > <nl> - < / context > <nl> - < / TS > <nl> + < / TS > <nl> \ No newline at end of file <nl>

Updated German translation from Transifex .

qbittorrent/qBittorrent

2ea427bd240dff1408bd0c542b87d5bc274af98d

2013-08-03T13:13:08Z

mmm a / dbtests / jstests . cpp <nl> ppp b / dbtests / jstests . cpp <nl> namespace JSTests { <nl> delete s ; <nl> } <nl> } ; <nl> + <nl> + class OtherJSTypes { <nl> + public : <nl> + void run ( ) { <nl> + Scope * s = globalScriptEngine - > createScope ( ) ; <nl> + <nl> + { / / date <nl> + BSONObj o ; <nl> + { <nl> + BSONObjBuilder b ; <nl> + b . appendDate ( " d " , 123456789 ) ; <nl> + o = b . obj ( ) ; <nl> + } <nl> + s - > setObject ( " x " , o ) ; <nl> + <nl> + s - > invoke ( " return x . d . getTime ( ) ! = 12 ; " , BSONObj ( ) ) ; <nl> + ASSERT_EQUALS ( true , s - > getBoolean ( " return " ) ) ; <nl> + <nl> + s - > invoke ( " z = x . d . getTime ( ) ; " , BSONObj ( ) ) ; <nl> + ASSERT_EQUALS ( 123456789 , s - > getNumber ( " z " ) ) ; <nl> + } <nl> + <nl> + { / / regex <nl> + <nl> + } <nl> + <nl> + delete s ; <nl> + } <nl> + } ; <nl> <nl> class All : public Suite { <nl> public : <nl> namespace JSTests { <nl> add < ObjectDecoding > ( ) ; <nl> add < JSOIDTests > ( ) ; <nl> add < ObjectModTests > ( ) ; <nl> + add < OtherJSTypes > ( ) ; <nl> } <nl> } ; <nl> <nl>

test for date

mongodb/mongo

4e781fbf5ef9c207437b97c81856986d00be11cc

2009-05-14T19:34:14Z

mmm a / contrib / Python / doc / gettingstarted . rst <nl> ppp b / contrib / Python / doc / gettingstarted . rst <nl> Getting started <nl> <nl> Installation <nl> mmmmmmmmmmmm <nl> - This page will guide you through three required steps : <nl> + This page will guide you through the following three required steps : <nl> <nl> # . Make sure that all Python requirements are met <nl> # . Build and install CNTK <nl> everything you need from ` Anaconda < https : / / www . continuum . io / downloads > ` _ . <nl> <nl> Installing CNTK <nl> ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ <nl> - Please follow the instruction on ` CNTK ' s GitHub page <nl> - < https : / / github . com / Microsoft / CNTK / wiki / CNTK - Binary - Download - and - Configuration > ` _ . <nl> + Please follow the instructions on ` CNTK ' s GitHub page <nl> + < https : / / github . com / Microsoft / CNTK / wiki / Setup - CNTK - on - your - machine > ` _ . <nl> After you have built the CNTK binary , find the build location . It will be <nl> something like ` ` < cntkpath > / x64 / Debug_CpuOnly / cntk ` ` . You will need this for <nl> the next step . <nl> Installing the Python module <nl> In this case , we have set ` ` clean_up = False ` ` so that you can now peek into the <nl> folder ` ` _cntk_demo ` ` and see what has been created under the hood for you . <nl> <nl> - Most likely , you will find issues or rough edges . Please help us improving CNTK <nl> - by posting them to https : / / github . com / Microsoft / CNTK / issues . Thanks ! <nl> + Most likely , you will find issues or rough edges . Please help us to improve CNTK <nl> + by posting any problems to https : / / github . com / Microsoft / CNTK / issues . Thanks ! <nl> <nl> Overview <nl> mmmmmmmmm - - <nl> <nl> - TODO : describe that currently only dense is supported , but soon sparse is <nl> - coming ( May ? ) <nl> + <nl> + <nl> <nl> Operators <nl> mmmmmmmmm - <nl>

small clean - up of getting started documentation

microsoft/CNTK

31dd03fc433b48b76e41fdd63d0295ecb82c5e47

2016-04-27T11:50:15Z

mmm a / modules / cudacodec / include / opencv2 / cudacodec . hpp <nl> ppp b / modules / cudacodec / include / opencv2 / cudacodec . hpp <nl> namespace cv { namespace cudacodec { <nl> / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Video Encoding / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / <nl> <nl> / / Works only under Windows . <nl> - / / Supports olny H264 video codec and AVI files . <nl> + / / Supports only H264 video codec and AVI files . <nl> <nl> enum SurfaceFormat <nl> { <nl> mmm a / modules / cudacodec / src / cuda / nv12_to_rgb . cu <nl> ppp b / modules / cudacodec / src / cuda / nv12_to_rgb . cu <nl> namespace <nl> return ARGBpixel ; <nl> } <nl> <nl> - / / CUDA kernel for outputing the final ARGB output from NV12 <nl> + / / CUDA kernel for outputting the final ARGB output from NV12 <nl> <nl> # define COLOR_COMPONENT_BIT_SIZE 10 <nl> # define COLOR_COMPONENT_MASK 0x3FF <nl> mmm a / modules / cudacodec / src / frame_queue . hpp <nl> ppp b / modules / cudacodec / src / frame_queue . hpp <nl> class FrameQueue <nl> <nl> / / Spins until frame becomes available or decoding gets canceled . <nl> / / If the requested frame is available the method returns true . <nl> - / / If decoding was interupted before the requested frame becomes <nl> + / / If decoding was interrupted before the requested frame becomes <nl> / / available , the method returns false . <nl> bool waitUntilFrameAvailable ( int pictureIndex ) ; <nl> <nl> mmm a / modules / cudacodec / src / video_reader . cpp <nl> ppp b / modules / cudacodec / src / video_reader . cpp <nl> namespace <nl> GpuMat decodedFrame = videoDecoder_ - > mapFrame ( frameInfo . first . picture_index , frameInfo . second ) ; <nl> <nl> / / perform post processing on the CUDA surface ( performs colors space conversion and post processing ) <nl> - / / comment this out if we inclue the line of code seen above <nl> + / / comment this out if we include the line of code seen above <nl> videoDecPostProcessFrame ( decodedFrame , frame , videoDecoder_ - > targetWidth ( ) , videoDecoder_ - > targetHeight ( ) ) ; <nl> <nl> / / unmap video frame <nl> mmm a / modules / cudafeatures2d / test / test_features2d . cpp <nl> ppp b / modules / cudafeatures2d / test / test_features2d . cpp <nl> PARAM_TEST_CASE ( BruteForceMatcher , cv : : cuda : : DeviceInfo , NormCode , DescriptorSiz <nl> rng . fill ( queryBuf , cv : : RNG : : UNIFORM , cv : : Scalar : : all ( 0 ) , cv : : Scalar : : all ( 3 ) ) ; <nl> queryBuf . convertTo ( queryBuf , CV_32FC1 ) ; <nl> <nl> - / / Generate train decriptors as follows : <nl> + / / Generate train descriptors as follows : <nl> / / copy each query descriptor to train set countFactor times <nl> / / and perturb some one element of the copied descriptors in <nl> / / in ascending order . General boundaries of the perturbation <nl> mmm a / modules / cudafilters / src / filtering . cpp <nl> ppp b / modules / cudafilters / src / filtering . cpp <nl> Ptr < Filter > cv : : cuda : : createDerivFilter ( int srcType , int dstType , int dx , int dy <nl> if ( scale ! = 1 ) <nl> { <nl> / / usually the smoothing part is the slowest to compute , <nl> - / / so try to scale it instead of the faster differenciating part <nl> + / / so try to scale it instead of the faster differentiating part <nl> if ( dx = = 0 ) <nl> kx * = scale ; <nl> else <nl> mmm a / modules / cudaimgproc / include / opencv2 / cudaimgproc . hpp <nl> ppp b / modules / cudaimgproc / include / opencv2 / cudaimgproc . hpp <nl> CV_EXPORTS Ptr < TemplateMatching > createTemplateMatching ( int srcType , int method , <nl> <nl> / * * @ brief Performs bilateral filtering of passed image <nl> <nl> - @ param src Source image . Supports only ( channles ! = 2 & & depth ( ) ! = CV_8S & & depth ( ) ! = CV_32S <nl> + @ param src Source image . Supports only ( channels ! = 2 & & depth ( ) ! = CV_8S & & depth ( ) ! = CV_32S <nl> & & depth ( ) ! = CV_64F ) . <nl> @ param dst Destination imagwe . <nl> @ param kernel_size Kernel window size . <nl> mmm a / modules / cudaimgproc / src / cuda / clahe . cu <nl> ppp b / modules / cudaimgproc / src / cuda / clahe . cu <nl> namespace clahe <nl> cudaSafeCall ( cudaDeviceSynchronize ( ) ) ; <nl> } <nl> <nl> - __global__ void tranformKernel ( const PtrStepSzb src , PtrStepb dst , const PtrStepb lut , const int2 tileSize , const int tilesX , const int tilesY ) <nl> + __global__ void transformKernel ( const PtrStepSzb src , PtrStepb dst , const PtrStepb lut , const int2 tileSize , const int tilesX , const int tilesY ) <nl> { <nl> const int x = blockIdx . x * blockDim . x + threadIdx . x ; <nl> const int y = blockIdx . y * blockDim . y + threadIdx . y ; <nl> namespace clahe <nl> const dim3 block ( 32 , 8 ) ; <nl> const dim3 grid ( divUp ( src . cols , block . x ) , divUp ( src . rows , block . y ) ) ; <nl> <nl> - cudaSafeCall ( cudaFuncSetCacheConfig ( tranformKernel , cudaFuncCachePreferL1 ) ) ; <nl> + cudaSafeCall ( cudaFuncSetCacheConfig ( transformKernel , cudaFuncCachePreferL1 ) ) ; <nl> <nl> - tranformKernel < < < grid , block , 0 , stream > > > ( src , dst , lut , tileSize , tilesX , tilesY ) ; <nl> + transformKernel < < < grid , block , 0 , stream > > > ( src , dst , lut , tileSize , tilesX , tilesY ) ; <nl> cudaSafeCall ( cudaGetLastError ( ) ) ; <nl> <nl> if ( stream = = 0 ) <nl> mmm a / modules / cudaimgproc / src / mssegmentation . cpp <nl> ppp b / modules / cudaimgproc / src / mssegmentation . cpp <nl> void cv : : cuda : : meanShiftSegmentation ( InputArray _src , OutputArray _dst , int sp , <nl> std : : vector < SegmLink > edges ; <nl> edges . reserve ( g . numv ) ; <nl> <nl> - / / Prepare edges connecting differnet components <nl> + / / Prepare edges connecting different components <nl> for ( int v = 0 ; v < g . numv ; + + v ) <nl> { <nl> int c1 = comps . find ( v ) ; <nl> void cv : : cuda : : meanShiftSegmentation ( InputArray _src , OutputArray _dst , int sp , <nl> } <nl> } <nl> <nl> - / / Sort all graph ' s edges connecting differnet components ( in asceding order ) <nl> + / / Sort all graph ' s edges connecting different components ( in asceding order ) <nl> std : : sort ( edges . begin ( ) , edges . end ( ) ) ; <nl> <nl> / / Exclude small components ( starting from the nearest couple ) <nl> mmm a / modules / cudalegacy / src / cuda / NCVHaarObjectDetection . cu <nl> ppp b / modules / cudalegacy / src / cuda / NCVHaarObjectDetection . cu <nl> static NCVStatus loadFromXML ( const cv : : String & filename , <nl> haar . ClassifierSize . width = oldCascade - > orig_window_size . width ; <nl> haar . ClassifierSize . height = oldCascade - > orig_window_size . height ; <nl> <nl> - int stagesCound = oldCascade - > count ; <nl> - for ( int s = 0 ; s < stagesCound ; + + s ) / / by stages <nl> + int stagesCount = oldCascade - > count ; <nl> + for ( int s = 0 ; s < stagesCount ; + + s ) / / by stages <nl> { <nl> HaarStage64 curStage ; <nl> curStage . setStartClassifierRootNodeOffset ( static_cast < Ncv32u > ( haarClassifierNodes . size ( ) ) ) ; <nl> mmm a / modules / cudaobjdetect / include / opencv2 / cudaobjdetect . hpp <nl> ppp b / modules / cudaobjdetect / include / opencv2 / cudaobjdetect . hpp <nl> class CV_EXPORTS HOG : public Algorithm <nl> virtual int getNumLevels ( ) const = 0 ; <nl> <nl> / / ! Threshold for the distance between features and SVM classifying plane . <nl> - / / ! Usually it is 0 and should be specfied in the detector coefficients ( as the last free <nl> + / / ! Usually it is 0 and should be specified in the detector coefficients ( as the last free <nl> / / ! coefficient ) . But if the free coefficient is omitted ( which is allowed ) , you can specify it <nl> / / ! manually here . <nl> virtual void setHitThreshold ( double hit_threshold ) = 0 ; <nl> mmm a / modules / cudaobjdetect / src / cascadeclassifier . cpp <nl> ppp b / modules / cudaobjdetect / src / cascadeclassifier . cpp <nl> namespace <nl> int totalWidth = level . workArea . width / step ; <nl> total + = totalWidth * ( level . workArea . height / step ) ; <nl> <nl> - / / go to next pyramide level <nl> + / / go to next pyramid level <nl> level = level . next ( scaleFactor_ , image . size ( ) , NxM , minObjectSize_ ) ; <nl> area = level . workArea ; <nl> <nl> mmm a / modules / cudev / include / opencv2 / cudev / block / block . hpp <nl> ppp b / modules / cudev / include / opencv2 / cudev / block / block . hpp <nl> __device__ __forceinline__ static void blockCopy ( InIt beg , InIt end , OutIt out ) <nl> } <nl> <nl> template < class InIt , class OutIt , class UnOp > <nl> - __device__ __forceinline__ static void blockTransfrom ( InIt beg , InIt end , OutIt out , const UnOp & op ) <nl> + __device__ __forceinline__ static void blockTransform ( InIt beg , InIt end , OutIt out , const UnOp & op ) <nl> { <nl> uint STRIDE = Block : : blockSize ( ) ; <nl> InIt t = beg + Block : : threadLineId ( ) ; <nl> __device__ __forceinline__ static void blockTransfrom ( InIt beg , InIt end , OutIt <nl> } <nl> <nl> template < class InIt1 , class InIt2 , class OutIt , class BinOp > <nl> - __device__ __forceinline__ static void blockTransfrom ( InIt1 beg1 , InIt1 end1 , InIt2 beg2 , OutIt out , const BinOp & op ) <nl> + __device__ __forceinline__ static void blockTransform ( InIt1 beg1 , InIt1 end1 , InIt2 beg2 , OutIt out , const BinOp & op ) <nl> { <nl> uint STRIDE = Block : : blockSize ( ) ; <nl> InIt1 t1 = beg1 + Block : : threadLineId ( ) ; <nl> mmm a / modules / cudev / include / opencv2 / cudev / ptr2d / gpumat . hpp <nl> ppp b / modules / cudev / include / opencv2 / cudev / ptr2d / gpumat . hpp <nl> class GpuMat_ : public GpuMat <nl> / / ! copy constructor <nl> __host__ GpuMat_ ( const GpuMat_ & m ) ; <nl> <nl> - / / ! copy / conversion contructor . If m is of different type , it ' s converted <nl> + / / ! copy / conversion constructor . If m is of different type , it ' s converted <nl> __host__ explicit GpuMat_ ( const GpuMat & m , Allocator * allocator = defaultAllocator ( ) ) ; <nl> <nl> / / ! constructs a matrix on top of user - allocated data . step is in bytes ( ! ! ! ) , regardless of the type <nl> mmm a / modules / features2d / include / opencv2 / features2d . hpp <nl> ppp b / modules / features2d / include / opencv2 / features2d . hpp <nl> class CV_EXPORTS_W MSER : public Feature2D <nl> @ param _delta it compares \ f $ ( size_ { i } - size_ { i - delta } ) / size_ { i - delta } \ f $ <nl> @ param _min_area prune the area which smaller than minArea <nl> @ param _max_area prune the area which bigger than maxArea <nl> - @ param _max_variation prune the area have simliar size to its children <nl> + @ param _max_variation prune the area have similar size to its children <nl> @ param _min_diversity for color image , trace back to cut off mser with diversity less than min_diversity <nl> @ param _max_evolution for color image , the evolution steps <nl> @ param _area_threshold for color image , the area threshold to cause re - initialize <nl> mmm a / modules / features2d / perf / perf_batchDistance . cpp <nl> ppp b / modules / features2d / perf / perf_batchDistance . cpp <nl> void generateData ( Mat & query , Mat & train , const int sourceType ) <nl> rng . fill ( buf , RNG : : UNIFORM , Scalar : : all ( 0 ) , Scalar ( 3 ) ) ; <nl> buf . convertTo ( query , sourceType ) ; <nl> <nl> - / / Generate train decriptors as follows : <nl> + / / Generate train descriptors as follows : <nl> / / copy each query descriptor to train set countFactor times <nl> / / and perturb some one element of the copied descriptors in <nl> / / in ascending order . General boundaries of the perturbation <nl> mmm a / modules / features2d / src / keypoint . cpp <nl> ppp b / modules / features2d / src / keypoint . cpp <nl> void KeyPointsFilter : : retainBest ( std : : vector < KeyPoint > & keypoints , int n_points ) <nl> } <nl> / / first use nth element to partition the keypoints into the best and worst . <nl> std : : nth_element ( keypoints . begin ( ) , keypoints . begin ( ) + n_points , keypoints . end ( ) , KeypointResponseGreater ( ) ) ; <nl> - / / this is the boundary response , and in the case of FAST may be ambigous <nl> + / / this is the boundary response , and in the case of FAST may be ambiguous <nl> float ambiguous_response = keypoints [ n_points - 1 ] . response ; <nl> / / use std : : partition to grab all of the keypoints with the boundary response . <nl> std : : vector < KeyPoint > : : const_iterator new_end = <nl> mmm a / modules / features2d / test / ocl / test_brute_force_matcher . cpp <nl> ppp b / modules / features2d / test / ocl / test_brute_force_matcher . cpp <nl> PARAM_TEST_CASE ( BruteForceMatcher , int , int ) <nl> rng . fill ( queryBuf , cv : : RNG : : UNIFORM , cv : : Scalar : : all ( 0 ) , cv : : Scalar : : all ( 3 ) ) ; <nl> queryBuf . convertTo ( queryBuf , CV_32FC1 ) ; <nl> <nl> - / / Generate train decriptors as follows : <nl> + / / Generate train descriptors as follows : <nl> / / copy each query descriptor to train set countFactor times <nl> / / and perturb some one element of the copied descriptors in <nl> / / in ascending order . General boundaries of the perturbation <nl> mmm a / modules / features2d / test / test_descriptors_regression . cpp <nl> ppp b / modules / features2d / test / test_descriptors_regression . cpp <nl> class CV_DescriptorExtractorTest : public cvtest : : BaseTest <nl> if ( ! fs . isOpened ( ) ) <nl> { <nl> fs . open ( keypoints_filename , FileStorage : : WRITE ) ; <nl> - ASSERT_TRUE ( fs . isOpened ( ) ) < < " File for writting keypoints can not be opened . " ; <nl> + ASSERT_TRUE ( fs . isOpened ( ) ) < < " File for writing keypoints can not be opened . " ; <nl> if ( detector . empty ( ) ) <nl> { <nl> Ptr < ORB > fd = ORB : : create ( ) ; <nl> mmm a / modules / features2d / test / test_matchers_algorithmic . cpp <nl> ppp b / modules / features2d / test / test_matchers_algorithmic . cpp <nl> void CV_DescriptorMatcherTest : : generateData ( Mat & query , Mat & train ) <nl> rng . fill ( buf , RNG : : UNIFORM , Scalar : : all ( 0 ) , Scalar ( 3 ) ) ; <nl> buf . convertTo ( query , CV_32FC1 ) ; <nl> <nl> - / / Generate train decriptors as follows : <nl> + / / Generate train descriptors as follows : <nl> / / copy each query descriptor to train set countFactor times <nl> / / and perturb some one element of the copied descriptors in <nl> / / in ascending order . General boundaries of the perturbation <nl> mmm a / modules / highgui / src / roiSelector . cpp <nl> ppp b / modules / highgui / src / roiSelector . cpp <nl> class ROISelector <nl> Scalar ( 255 , 0 , 0 ) , 2 , 1 ) ; <nl> } <nl> <nl> - / / show the image bouding box <nl> + / / show the image bounding box <nl> imshow ( windowName , selectorParams . image ) ; <nl> <nl> / / reset the image <nl> class ROISelector <nl> } <nl> } <nl> <nl> - / / save the keypressed characted <nl> + / / save the keypressed character <nl> int key ; <nl> Size imageSize ; <nl> } ; <nl> mmm a / modules / highgui / src / window_QT . cpp <nl> ppp b / modules / highgui / src / window_QT . cpp <nl> void CvWinProperties : : showEvent ( QShowEvent * evnt ) <nl> { <nl> / / why - 1 , - 1 ? : do this trick because the first time the code is run , <nl> / / no value pos was saved so we let Qt move the window in the middle of its parent ( event ignored ) . <nl> - / / then hide will save the last position and thus , we want to retreive it ( event accepted ) . <nl> + / / then hide will save the last position and thus , we want to retrieve it ( event accepted ) . <nl> QPoint mypos ( - 1 , - 1 ) ; <nl> QSettings settings ( " OpenCV2 " , objectName ( ) ) ; <nl> mypos = settings . value ( " pos " , mypos ) . toPoint ( ) ; <nl> mmm a / modules / highgui / src / window_QT . h <nl> ppp b / modules / highgui / src / window_QT . h <nl> private slots : <nl> void * userdata ; <nl> } ; <nl> <nl> - / / Both are top level window , so that a way to differenciate them . <nl> + / / Both are top level window , so that a way to differentiate them . <nl> / / if ( obj - > metaObject ( ) - > className ( ) = = " CvWindow " ) does not give me robust result <nl> <nl> enum typeWindow { type_CvWindow = 1 , type_CvWinProperties = 2 } ; <nl> mmm a / modules / highgui / src / window_carbon . cpp <nl> ppp b / modules / highgui / src / window_carbon . cpp <nl> CV_IMPL int cvNamedWindow ( const char * name , int flags ) <nl> } <nl> else <nl> { <nl> - fprintf ( stderr , " Failed to tranform process type : % d \ n " , ( int ) ret ) ; <nl> + fprintf ( stderr , " Failed to transform process type : % d \ n " , ( int ) ret ) ; <nl> fflush ( stderr ) ; <nl> } <nl> } <nl> mmm a / modules / imgcodecs / src / grfmt_gdal . cpp <nl> ppp b / modules / imgcodecs / src / grfmt_gdal . cpp <nl> bool GdalDecoder : : readHeader ( ) { <nl> return false ; <nl> } <nl> <nl> - / / extract the driver infomation <nl> + / / extract the driver information <nl> m_driver = m_dataset - > GetDriver ( ) ; <nl> <nl> / / if the driver failed , then exit <nl> mmm a / modules / imgcodecs / src / grfmt_pam . cpp <nl> ppp b / modules / imgcodecs / src / grfmt_pam . cpp <nl> bool PAMDecoder : : readData ( Mat & img ) <nl> <nl> / * the case where data fits the opencv matrix * / <nl> if ( m_sampledepth = = img . depth ( ) & & target_channels = = m_channels & & ! bit_mode ) { <nl> - / * special case for 16bit images with wrong endianess * / <nl> + / * special case for 16bit images with wrong endianness * / <nl> if ( m_sampledepth = = CV_16U & & ! isBigEndian ( ) ) <nl> { <nl> for ( y = 0 ; y < m_height ; y + + , data + = imp_stride ) <nl> bool PAMDecoder : : readData ( Mat & img ) <nl> { <nl> m_strm . getBytes ( src , src_stride ) ; <nl> <nl> - / * endianess correction * / <nl> + / * endianness correction * / <nl> if ( m_sampledepth = = CV_16U & & ! isBigEndian ( ) ) <nl> { <nl> for ( x = 0 ; x < src_elems_per_row ; x + + ) <nl> bool PAMEncoder : : write ( const Mat & img , const std : : vector < int > & params ) <nl> if ( img . depth ( ) = = CV_8U ) <nl> strm . putBytes ( data , stride * height ) ; <nl> else if ( img . depth ( ) = = CV_16U ) { <nl> - / * fix endianess * / <nl> + / * fix endianness * / <nl> if ( ! isBigEndian ( ) ) { <nl> for ( y = 0 ; y < height ; y + + ) { <nl> memcpy ( buffer , img . ptr ( y ) , stride ) ; <nl> mmm a / modules / imgcodecs / src / rgbe . cpp <nl> ppp b / modules / imgcodecs / src / rgbe . cpp <nl> int RGBE_ReadHeader ( FILE * fp , int * width , int * height , rgbe_header_info * info ) <nl> return rgbe_error ( rgbe_read_error , NULL ) ; <nl> if ( buf [ 0 ] = = ' \ n ' ) / / end of the header <nl> break ; <nl> - else if ( buf [ 0 ] = = ' # ' ) / / commment <nl> + else if ( buf [ 0 ] = = ' # ' ) / / comment <nl> continue ; <nl> else if ( strcmp ( buf , " FORMAT = 32 - bit_rle_rgbe \ n " ) = = 0 ) <nl> hasFormat = true ; <nl> mmm a / modules / imgproc / include / opencv2 / imgproc . hpp <nl> ppp b / modules / imgproc / include / opencv2 / imgproc . hpp <nl> for ( int i = 0 ; i < it2 . count ; i + + , + + it2 ) <nl> class CV_EXPORTS LineIterator <nl> { <nl> public : <nl> - / * * @ brief intializes the iterator <nl> + / * * @ brief initializes the iterator <nl> <nl> creates iterators for the line connecting pt1 and pt2 <nl> the line will be clipped on the image boundaries <nl> mmm a / modules / imgproc / misc / java / gen_dict . json <nl> ppp b / modules / imgproc / misc / java / gen_dict . json <nl> <nl> " return result ; " , <nl> " \ n " , <nl> " } catch ( const cv : : Exception & e ) { " , <nl> - " LOGD ( \ " Imgproc : : n_1getTextSize ( ) catched cv : : Exception : % s \ " , e . what ( ) ) ; " , <nl> + " LOGD ( \ " Imgproc : : n_1getTextSize ( ) caught cv : : Exception : % s \ " , e . what ( ) ) ; " , <nl> " jclass je = env - > FindClass ( \ " org / opencv / core / CvException \ " ) ; " , <nl> " if ( ! je ) je = env - > FindClass ( \ " java / lang / Exception \ " ) ; " , <nl> " env - > ThrowNew ( je , e . what ( ) ) ; " , <nl> " return NULL ; " , <nl> " } catch ( . . . ) { " , <nl> - " LOGD ( \ " Imgproc : : n_1getTextSize ( ) catched unknown exception ( . . . ) \ " ) ; " , <nl> + " LOGD ( \ " Imgproc : : n_1getTextSize ( ) caught unknown exception ( . . . ) \ " ) ; " , <nl> " jclass je = env - > FindClass ( \ " java / lang / Exception \ " ) ; " , <nl> " env - > ThrowNew ( je , \ " Unknown exception in JNI code { core : : getTextSize ( ) } \ " ) ; " , <nl> " return NULL ; " , <nl> mmm a / modules / imgproc / src / approx . cpp <nl> ppp b / modules / imgproc / src / approx . cpp <nl> cvApproxPoly ( const void * array , int header_size , <nl> } <nl> else <nl> { <nl> - CV_Error ( CV_StsBadArg , " Input curves have uknown type " ) ; <nl> + CV_Error ( CV_StsBadArg , " Input curves have unknown type " ) ; <nl> } <nl> } <nl> <nl> mmm a / modules / imgproc / src / color . cpp <nl> ppp b / modules / imgproc / src / color . cpp <nl> struct Lab2RGBinteger <nl> bo = tab [ bo ] ; <nl> } <nl> <nl> - / / L , a , b shoule be in their natural range <nl> + / / L , a , b should be in their natural range <nl> inline void processLabToXYZ ( const v_uint8x16 & lv , const v_uint8x16 & av , const v_uint8x16 & bv , <nl> v_int32x4 & xiv00 , v_int32x4 & yiv00 , v_int32x4 & ziv00 , <nl> v_int32x4 & xiv01 , v_int32x4 & yiv01 , v_int32x4 & ziv01 , <nl> mmm a / modules / imgproc / src / connectedcomponents . cpp <nl> ppp b / modules / imgproc / src / connectedcomponents . cpp <nl> namespace cv { <nl> const int h = img . rows ; <nl> const int w = img . cols ; <nl> <nl> - / / A quick and dirty upper bound for the maximimum number of labels . <nl> + / / A quick and dirty upper bound for the maximum number of labels . <nl> / / Following formula comes from the fact that a 2x2 block in 4 - way connectivity <nl> / / labeling can never have more than 2 new labels and 1 label for background . <nl> / / Worst case image example pattern : <nl> namespace cv { <nl> const int h = img . rows ; <nl> const int w = img . cols ; <nl> <nl> - / / A quick and dirty upper bound for the maximimum number of labels . <nl> + / / A quick and dirty upper bound for the maximum number of labels . <nl> / / Following formula comes from the fact that a 2x2 block in 4 - way connectivity <nl> / / labeling can never have more than 2 new labels and 1 label for background . <nl> / / Worst case image example pattern : <nl> namespace cv { <nl> const int h = img . rows ; <nl> const int w = img . cols ; <nl> <nl> - / / A quick and dirty upper bound for the maximimum number of labels . <nl> + / / A quick and dirty upper bound for the maximum number of labels . <nl> / / Following formula comes from the fact that a 2x2 block in 8 - connectivity case <nl> / / can never have more than 1 new label and 1 label for background . <nl> / / Worst case image example pattern : <nl> namespace cv { <nl> const int h = img . rows ; <nl> const int w = img . cols ; <nl> <nl> - / / A quick and dirty upper bound for the maximimum number of labels . <nl> + / / A quick and dirty upper bound for the maximum number of labels . <nl> / / Following formula comes from the fact that a 2x2 block in 8 - connectivity case <nl> / / can never have more than 1 new label and 1 label for background . <nl> / / Worst case image example pattern : <nl> mmm a / modules / imgproc / src / cornersubpix . cpp <nl> ppp b / modules / imgproc / src / cornersubpix . cpp <nl> void cv : : cornerSubPix ( InputArray _image , InputOutputArray _corners , <nl> int i , j , k ; <nl> int max_iters = ( criteria . type & CV_TERMCRIT_ITER ) ? MIN ( MAX ( criteria . maxCount , 1 ) , MAX_ITERS ) : MAX_ITERS ; <nl> double eps = ( criteria . type & CV_TERMCRIT_EPS ) ? MAX ( criteria . epsilon , 0 . ) : 0 ; <nl> - eps * = eps ; / / use square of error in comparsion operations <nl> + eps * = eps ; / / use square of error in comparison operations <nl> <nl> cv : : Mat src = _image . getMat ( ) , cornersmat = _corners . getMat ( ) ; <nl> int count = cornersmat . checkVector ( 2 , CV_32F ) ; <nl> mmm a / modules / imgproc / src / deriv . cpp <nl> ppp b / modules / imgproc / src / deriv . cpp <nl> namespace cv <nl> ivx : : Image : : createAddressing ( dst . cols , dst . rows , 2 , ( vx_int32 ) ( dst . step ) ) , dst . data ) ; <nl> <nl> / / ATTENTION : VX_CONTEXT_IMMEDIATE_BORDER attribute change could lead to strange issues in multi - threaded environments <nl> - / / since OpenVX standart says nothing about thread - safety for now <nl> + / / since OpenVX standard says nothing about thread - safety for now <nl> ivx : : border_t prevBorder = ctx . immediateBorder ( ) ; <nl> ctx . setImmediateBorder ( border , ( vx_uint8 ) ( 0 ) ) ; <nl> if ( dx ) <nl> void cv : : Scharr ( InputArray _src , OutputArray _dst , int ddepth , int dx , int dy , <nl> if ( scale ! = 1 ) <nl> { <nl> / / usually the smoothing part is the slowest to compute , <nl> - / / so try to scale it instead of the faster differenciating part <nl> + / / so try to scale it instead of the faster differentiating part <nl> if ( dx = = 0 ) <nl> kx * = scale ; <nl> else <nl> mmm a / modules / imgproc / src / drawing . cpp <nl> ppp b / modules / imgproc / src / drawing . cpp <nl> FillEdgeCollection ( Mat & img , std : : vector < PolyEdge > & edges , const void * color ) <nl> { <nl> if ( last & & last - > y1 = = y ) <nl> { <nl> - / / exclude edge if y reachs its lower point <nl> + / / exclude edge if y reaches its lower point <nl> prelast - > next = last - > next ; <nl> last = last - > next ; <nl> continue ; <nl> FillEdgeCollection ( Mat & img , std : : vector < PolyEdge > & edges , const void * color ) <nl> } <nl> else if ( i < total ) <nl> { <nl> - / / insert new edge into active list if y reachs its upper point <nl> + / / insert new edge into active list if y reaches its upper point <nl> prelast - > next = e ; <nl> e - > next = last ; <nl> prelast = e ; <nl> mmm a / modules / imgproc / src / filterengine . hpp <nl> ppp b / modules / imgproc / src / filterengine . hpp <nl> class BaseFilter <nl> Mat Iyy ( DELTA + kd . rows - 1 , src . cols , dst . type ( ) ) ; <nl> <nl> / / inside the loop we always pass DELTA rows to the filter <nl> - / / ( note that the " proceed " method takes care of possibe overflow , since <nl> + / / ( note that the " proceed " method takes care of possible overflow , since <nl> / / it was given the actual image height in the " start " method ) <nl> / / on output we can get : <nl> / / * < DELTA rows ( the initial buffer accumulation stage ) <nl> mmm a / modules / imgproc / src / geometry . cpp <nl> ppp b / modules / imgproc / src / geometry . cpp <nl> static int areaSign ( Point2f a , Point2f b , Point2f c ) <nl> } <nl> <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> - / / Returns true iff point c lies on the closed segement ab . <nl> + / / Returns true iff point c lies on the closed segment ab . <nl> / / Assumes it is already known that abc are collinear . <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> static bool between ( Point2f a , Point2f b , Point2f c ) <nl> mmm a / modules / imgproc / src / imgwarp . cpp <nl> ppp b / modules / imgproc / src / imgwarp . cpp <nl> static bool openvx_remap ( Mat src , Mat dst , Mat map1 , Mat map2 , int interpolation <nl> ivx : : Image : : createAddressing ( dst . cols , dst . rows , 1 , ( vx_int32 ) ( dst . step ) ) , dst . data ) ; <nl> <nl> / / ATTENTION : VX_CONTEXT_IMMEDIATE_BORDER attribute change could lead to strange issues in multi - threaded environments <nl> - / / since OpenVX standart says nothing about thread - safety for now <nl> + / / since OpenVX standard says nothing about thread - safety for now <nl> ivx : : border_t prevBorder = ctx . immediateBorder ( ) ; <nl> ctx . setImmediateBorder ( VX_BORDER_CONSTANT , ( vx_uint8 ) ( borderValue [ 0 ] ) ) ; <nl> <nl> mmm a / modules / imgproc / src / min_enclosing_triangle . cpp <nl> ppp b / modules / imgproc / src / min_enclosing_triangle . cpp <nl> static void advance ( unsigned int & index , unsigned int nrOfPoints ) { <nl> index = successor ( index , nrOfPoints ) ; <nl> } <nl> <nl> - / / ! Return the succesor of the provided point index <nl> + / / ! Return the successor of the provided point index <nl> / * ! <nl> - * The succesor of the last polygon point is the first polygon point <nl> + * The successor of the last polygon point is the first polygon point <nl> * ( circular referencing ) <nl> * <nl> * @ param index Index of the point <nl> mmm a / modules / imgproc / src / opencl / canny . cl <nl> ppp b / modules / imgproc / src / opencl / canny . cl <nl> __kernel void stage2_hysteresis ( __global uchar * map_ptr , int map_step , int map_o <nl> <nl> # elif defined GET_EDGES <nl> <nl> - / / Get the edge result . egde type of value 2 will be marked as an edge point and set to 255 . Otherwise 0 . <nl> + / / Get the edge result . edge type of value 2 will be marked as an edge point and set to 255 . Otherwise 0 . <nl> / / map edge type mappings <nl> / / dst edge output <nl> <nl> mmm a / modules / imgproc / src / rotcalipers . cpp <nl> ppp b / modules / imgproc / src / rotcalipers . cpp <nl> static void rotatingCalipers ( const Point2f * points , int n , int mode , float * out <nl> { <nl> case CALIPERS_MAXHEIGHT : <nl> { <nl> - / * now main element lies on edge alligned to calipers side * / <nl> + / * now main element lies on edge aligned to calipers side * / <nl> <nl> / * find opposite element i . e . transform * / <nl> / * 0 - > 2 , 1 - > 3 , 2 - > 0 , 3 - > 1 * / <nl> mmm a / modules / imgproc / src / smooth . cpp <nl> ppp b / modules / imgproc / src / smooth . cpp <nl> namespace cv <nl> ivx : : Image : : createAddressing ( dst . cols , dst . rows , 1 , ( vx_int32 ) ( dst . step ) ) , dst . data ) ; <nl> <nl> / / ATTENTION : VX_CONTEXT_IMMEDIATE_BORDER attribute change could lead to strange issues in multi - threaded environments <nl> - / / since OpenVX standart says nothing about thread - safety for now <nl> + / / since OpenVX standard says nothing about thread - safety for now <nl> ivx : : border_t prevBorder = ctx . immediateBorder ( ) ; <nl> ctx . setImmediateBorder ( border , ( vx_uint8 ) ( 0 ) ) ; <nl> ivx : : IVX_CHECK_STATUS ( vxuBox3x3 ( ctx , ia , ib ) ) ; <nl> static bool openvx_gaussianBlur ( InputArray _src , OutputArray _dst , Size ksize , <nl> ivx : : Image : : createAddressing ( dst . cols , dst . rows , 1 , ( vx_int32 ) ( dst . step ) ) , dst . data ) ; <nl> <nl> / / ATTENTION : VX_CONTEXT_IMMEDIATE_BORDER attribute change could lead to strange issues in multi - threaded environments <nl> - / / since OpenVX standart says nothing about thread - safety for now <nl> + / / since OpenVX standard says nothing about thread - safety for now <nl> ivx : : border_t prevBorder = ctx . immediateBorder ( ) ; <nl> ctx . setImmediateBorder ( border , ( vx_uint8 ) ( 0 ) ) ; <nl> ivx : : IVX_CHECK_STATUS ( vxuGaussian3x3 ( ctx , ia , ib ) ) ; <nl> namespace cv <nl> ivx : : Image : : createAddressing ( dst . cols , dst . rows , 1 , ( vx_int32 ) ( dst . step ) ) , dst . data ) ; <nl> <nl> / / ATTENTION : VX_CONTEXT_IMMEDIATE_BORDER attribute change could lead to strange issues in multi - threaded environments <nl> - / / since OpenVX standart says nothing about thread - safety for now <nl> + / / since OpenVX standard says nothing about thread - safety for now <nl> ivx : : border_t prevBorder = ctx . immediateBorder ( ) ; <nl> ctx . setImmediateBorder ( VX_BORDER_REPLICATE ) ; <nl> # ifdef VX_VERSION_1_1 <nl> mmm a / modules / imgproc / test / ocl / test_filter2d . cpp <nl> ppp b / modules / imgproc / test / ocl / test_filter2d . cpp <nl> OCL_INSTANTIATE_TEST_CASE_P ( ImageProc , Filter2D , <nl> Values ( CV_8U , CV_16U , CV_32F ) , <nl> OCL_ALL_CHANNELS , <nl> Values ( 3 , 5 , 7 ) , / / Kernel size <nl> - Values ( 1 , 4 , 8 ) , / / Width mutiple <nl> + Values ( 1 , 4 , 8 ) , / / Width multiple <nl> Values ( ( BorderType ) BORDER_CONSTANT , <nl> ( BorderType ) BORDER_REPLICATE , <nl> ( BorderType ) BORDER_REFLECT , <nl> mmm a / modules / imgproc / test / test_color . cpp <nl> ppp b / modules / imgproc / test / test_color . cpp <nl> static void validateResult ( const Mat & reference , const Mat & actual , const Mat & s <nl> int cn = reference . channels ( ) ; <nl> ssize . width * = cn ; <nl> bool next = true ; <nl> - / / RGB2Lab_f works throug LUT and brings additional error <nl> + / / RGB2Lab_f works through LUT and brings additional error <nl> static const float maxErr = 1 . f / 192 . f ; <nl> <nl> for ( int y = 0 ; y < ssize . height & & next ; + + y ) <nl> mmm a / modules / imgproc / test / test_imgwarp_strict . cpp <nl> ppp b / modules / imgproc / test / test_imgwarp_strict . cpp <nl> String CV_ImageWarpBaseTest : : interpolation_to_string ( int inter ) const <nl> if ( inverse ) <nl> str + = " | WARP_INVERSE_MAP " ; <nl> <nl> - return str . empty ( ) ? " Unsupported / Unkown interpolation type " : str ; <nl> + return str . empty ( ) ? " Unsupported / Unknown interpolation type " : str ; <nl> } <nl> <nl> Size CV_ImageWarpBaseTest : : randSize ( RNG & rng ) const <nl> const char * CV_Remap_Test : : borderType_to_string ( ) const <nl> return " BORDER_WRAP " ; <nl> if ( borderType = = BORDER_REFLECT_101 ) <nl> return " BORDER_REFLECT_101 " ; <nl> - return " Unsupported / Unkown border type " ; <nl> + return " Unsupported / Unknown border type " ; <nl> } <nl> <nl> void CV_Remap_Test : : prepare_test_data_for_reference_func ( ) <nl> mmm a / modules / java / generator / android / java / org / opencv / android / AsyncServiceHelper . java <nl> ppp b / modules / java / generator / android / java / org / opencv / android / AsyncServiceHelper . java <nl> public void cancel ( ) <nl> <nl> public void wait_install ( ) <nl> { <nl> - Log . e ( TAG , " Instalation was not started ! Nothing to wait ! " ) ; <nl> + Log . e ( TAG , " Installation was not started ! Nothing to wait ! " ) ; <nl> } <nl> } ; <nl> <nl> mmm a / modules / java / generator / gen_java . py <nl> ppp b / modules / java / generator / gen_java . py <nl> def __init__ ( self , decl , namespaces = [ ] ) : # [ ' class / struct cname ' , ' : base ' , [ mo <nl> self . cname = self . name . replace ( " . " , " : : " ) <nl> self . methods = [ ] <nl> self . methods_suffixes = { } <nl> - self . consts = [ ] # using a list to save the occurence order <nl> + self . consts = [ ] # using a list to save the occurrence order <nl> self . private_consts = [ ] <nl> self . imports = set ( ) <nl> self . props = [ ] <nl> mmm a / modules / java / generator / src / cpp / utils . cpp <nl> ppp b / modules / java / generator / src / cpp / utils . cpp <nl> JNIEXPORT void JNICALL Java_org_opencv_android_Utils_nBitmapToMat2 <nl> return ; <nl> } catch ( const cv : : Exception & e ) { <nl> AndroidBitmap_unlockPixels ( env , bitmap ) ; <nl> - LOGE ( " nBitmapToMat catched cv : : Exception : % s " , e . what ( ) ) ; <nl> + LOGE ( " nBitmapToMat caught cv : : Exception : % s " , e . what ( ) ) ; <nl> jclass je = env - > FindClass ( " org / opencv / core / CvException " ) ; <nl> if ( ! je ) je = env - > FindClass ( " java / lang / Exception " ) ; <nl> env - > ThrowNew ( je , e . what ( ) ) ; <nl> return ; <nl> } catch ( . . . ) { <nl> AndroidBitmap_unlockPixels ( env , bitmap ) ; <nl> - LOGE ( " nBitmapToMat catched unknown exception ( . . . ) " ) ; <nl> + LOGE ( " nBitmapToMat caught unknown exception ( . . . ) " ) ; <nl> jclass je = env - > FindClass ( " java / lang / Exception " ) ; <nl> env - > ThrowNew ( je , " Unknown exception in JNI code { nBitmapToMat } " ) ; <nl> return ; <nl> JNIEXPORT void JNICALL Java_org_opencv_android_Utils_nMatToBitmap2 <nl> return ; <nl> } catch ( const cv : : Exception & e ) { <nl> AndroidBitmap_unlockPixels ( env , bitmap ) ; <nl> - LOGE ( " nMatToBitmap catched cv : : Exception : % s " , e . what ( ) ) ; <nl> + LOGE ( " nMatToBitmap caught cv : : Exception : % s " , e . what ( ) ) ; <nl> jclass je = env - > FindClass ( " org / opencv / core / CvException " ) ; <nl> if ( ! je ) je = env - > FindClass ( " java / lang / Exception " ) ; <nl> env - > ThrowNew ( je , e . what ( ) ) ; <nl> return ; <nl> } catch ( . . . ) { <nl> AndroidBitmap_unlockPixels ( env , bitmap ) ; <nl> - LOGE ( " nMatToBitmap catched unknown exception ( . . . ) " ) ; <nl> + LOGE ( " nMatToBitmap caught unknown exception ( . . . ) " ) ; <nl> jclass je = env - > FindClass ( " java / lang / Exception " ) ; <nl> env - > ThrowNew ( je , " Unknown exception in JNI code { nMatToBitmap } " ) ; <nl> return ; <nl> mmm a / modules / python / src2 / cv2 . cpp <nl> ppp b / modules / python / src2 / cv2 . cpp <nl> PyObject * pyopencv_from ( const T & src ) ; <nl> <nl> enum { ARG_NONE = 0 , ARG_MAT = 1 , ARG_SCALAR = 2 } ; <nl> <nl> - / / special case , when the convertor needs full ArgInfo structure <nl> + / / special case , when the converter needs full ArgInfo structure <nl> static bool pyopencv_to ( PyObject * o , Mat & m , const ArgInfo info ) <nl> { <nl> bool allowND = true ; <nl> mmm a / modules / python / src2 / hdr_parser . py <nl> ppp b / modules / python / src2 / hdr_parser . py <nl> def parse_stmt ( self , stmt , end_token , use_umat = False , docstring = " " ) : <nl> def find_next_token ( self , s , tlist , p = 0 ) : <nl> " " " <nl> Finds the next token from the ' tlist ' in the input ' s ' , starting from position ' p ' . <nl> - Returns the first occured token and its position , or ( " " , len ( s ) ) when no token is found <nl> + Returns the first occurred token and its position , or ( " " , len ( s ) ) when no token is found <nl> " " " <nl> token = " " <nl> tpos = len ( s ) <nl> mmm a / modules / ts / include / opencv2 / ts / ts_gtest . h <nl> ppp b / modules / ts / include / opencv2 / ts / ts_gtest . h <nl> inline void FlushInfoLog ( ) { fflush ( NULL ) ; } <nl> / / <nl> / / GTEST_CHECK_ is an all - mode assert . It aborts the program if the condition <nl> / / is not satisfied . <nl> - / / Synopsys : <nl> + / / Synopsis : <nl> / / GTEST_CHECK_ ( boolean_condition ) ; <nl> / / or <nl> / / GTEST_CHECK_ ( boolean_condition ) < < " Additional message " ; <nl> const T & move ( const T & t ) { <nl> / / const Foo * ) . When you use ImplicitCast_ , the compiler checks that <nl> / / the cast is safe . Such explicit ImplicitCast_s are necessary in <nl> / / surprisingly many situations where C + + demands an exact type match <nl> - / / instead of an argument type convertable to a target type . <nl> + / / instead of an argument type convertible to a target type . <nl> / / <nl> / / The syntax for using ImplicitCast_ is the same as for static_cast : <nl> / / <nl> class GTEST_API_ FilePath { <nl> <nl> void Normalize ( ) ; <nl> <nl> - / / Returns a pointer to the last occurence of a valid path separator in <nl> + / / Returns a pointer to the last occurrence of a valid path separator in <nl> / / the FilePath . On Windows , for example , both ' / ' and ' \ ' are valid path <nl> / / separators . Returns NULL if no path separator was found . <nl> const char * FindLastPathSeparator ( ) const ; <nl> class GTEST_API_ UnitTest { <nl> internal : : UnitTestImpl * impl ( ) { return impl_ ; } <nl> const internal : : UnitTestImpl * impl ( ) const { return impl_ ; } <nl> <nl> - / / These classes and funcions are friends as they need to access private <nl> + / / These classes and functions are friends as they need to access private <nl> / / members of UnitTest . <nl> friend class Test ; <nl> friend class internal : : AssertHelper ; <nl> mmm a / modules / ts / src / ts_gtest . cpp <nl> ppp b / modules / ts / src / ts_gtest . cpp <nl> class Hunk { <nl> / / Print a unified diff header for one hunk . <nl> / / The format is <nl> / / " @ @ - < left_start > , < left_length > + < right_start > , < right_length > @ @ " <nl> - / / where the left / right parts are ommitted if unnecessary . <nl> + / / where the left / right parts are omitted if unnecessary . <nl> void PrintHeader ( std : : ostream * ss ) const { <nl> * ss < < " @ @ " ; <nl> if ( removes_ ) { <nl> FilePath FilePath : : RemoveExtension ( const char * extension ) const { <nl> return * this ; <nl> } <nl> <nl> - / / Returns a pointer to the last occurence of a valid path separator in <nl> + / / Returns a pointer to the last occurrence of a valid path separator in <nl> / / the FilePath . On Windows , for example , both ' / ' and ' \ ' are valid path <nl> / / separators . Returns NULL if no path separator was found . <nl> const char * FilePath : : FindLastPathSeparator ( ) const { <nl> namespace internal { <nl> / / Depending on the value of a char ( or wchar_t ) , we print it in one <nl> / / of three formats : <nl> / / - as is if it ' s a printable ASCII ( e . g . ' a ' , ' 2 ' , ' ' ) , <nl> - / / - as a hexidecimal escape sequence ( e . g . ' \ x7F ' ) , or <nl> + / / - as a hexadecimal escape sequence ( e . g . ' \ x7F ' ) , or <nl> / / - as a special escape sequence ( e . g . ' \ r ' , ' \ n ' ) . <nl> enum CharFormat { <nl> kAsIs , <nl> void PrintCharAndCodeTo ( Char c , ostream * os ) { <nl> return ; <nl> * os < < " ( " < < static_cast < int > ( c ) ; <nl> <nl> - / / For more convenience , we print c ' s code again in hexidecimal , <nl> + / / For more convenience , we print c ' s code again in hexadecimal , <nl> / / unless c was already printed in the form ' \ x # # ' or the code is in <nl> / / [ 1 , 9 ] . <nl> if ( format = = kHexEscape | | ( 1 < = c & & c < = 9 ) ) { <nl> mmm a / modules / video / include / opencv2 / video / background_segm . hpp <nl> ppp b / modules / video / include / opencv2 / video / background_segm . hpp <nl> CV_EXPORTS_W Ptr < BackgroundSubtractorMOG2 > <nl> createBackgroundSubtractorMOG2 ( int history = 500 , double varThreshold = 16 , <nl> bool detectShadows = true ) ; <nl> <nl> - / * * @ brief K - nearest neigbours - based Background / Foreground Segmentation Algorithm . <nl> + / * * @ brief K - nearest neighbours - based Background / Foreground Segmentation Algorithm . <nl> <nl> - The class implements the K - nearest neigbours background subtraction described in @ cite Zivkovic2006 . <nl> + The class implements the K - nearest neighbours background subtraction described in @ cite Zivkovic2006 . <nl> Very efficient if number of foreground pixels is low . <nl> * / <nl> class CV_EXPORTS_W BackgroundSubtractorKNN : public BackgroundSubtractor <nl> class CV_EXPORTS_W BackgroundSubtractorKNN : public BackgroundSubtractor <nl> pixel is matching the kNN background model . <nl> * / <nl> CV_WRAP virtual int getkNNSamples ( ) const = 0 ; <nl> - / * * @ brief Sets the k in the kNN . How many nearest neigbours need to match . <nl> + / * * @ brief Sets the k in the kNN . How many nearest neighbours need to match . <nl> * / <nl> CV_WRAP virtual void setkNNSamples ( int _nkNN ) = 0 ; <nl> <nl> mmm a / modules / video / src / bgfg_KNN . cpp <nl> ppp b / modules / video / src / bgfg_KNN . cpp <nl> class BackgroundSubtractorKNNImpl : public BackgroundSubtractorKNN <nl> / / / / / / / / / / / / / / / / / / / / / / / / <nl> int history ; <nl> / / alpha = 1 / history - speed of update - if the time interval you want to average over is T <nl> - / / set alpha = 1 / history . It is also usefull at start to make T slowly increase <nl> + / / set alpha = 1 / history . It is also useful at start to make T slowly increase <nl> / / from 1 until the desired T <nl> float fTb ; <nl> / / Tb - threshold on the squared distance from the sample used to decide if it is well described <nl> class BackgroundSubtractorKNNImpl : public BackgroundSubtractorKNN <nl> / / and that is Tb = 2 * 2 * 10 * 10 = 400 ; where we take typical pixel level sigma = 10 <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / less important parameters - things you might change but be carefull <nl> + / / less important parameters - things you might change but be careful <nl> / / / / / / / / / / / / / / / / / / / / / / / / <nl> int nN ; / / totlal number of samples <nl> int nkNN ; / / number on NN for detcting background - default K = [ 0 . 1 * nN ] <nl> mmm a / modules / video / src / bgfg_gaussmix2 . cpp <nl> ppp b / modules / video / src / bgfg_gaussmix2 . cpp <nl> <nl> <nl> / * / / Implementation of the Gaussian mixture model background subtraction from : <nl> / / <nl> - / / " Improved adaptive Gausian mixture model for background subtraction " <nl> + / / " Improved adaptive Gaussian mixture model for background subtraction " <nl> / / Z . Zivkovic <nl> / / International Conference Pattern Recognition , UK , August , 2004 <nl> / / http : / / www . zoranz . net / Publications / zivkovic2004ICPR . pdf <nl> namespace cv <nl> / * <nl> Interface of Gaussian mixture algorithm from : <nl> <nl> - " Improved adaptive Gausian mixture model for background subtraction " <nl> + " Improved adaptive Gaussian mixture model for background subtraction " <nl> Z . Zivkovic <nl> International Conference Pattern Recognition , UK , August , 2004 <nl> http : / / www . zoranz . net / Publications / zivkovic2004ICPR . pdf <nl> class BackgroundSubtractorMOG2Impl : public BackgroundSubtractorMOG2 <nl> / / and that is varThreshold = 4 * 4 = 16 ; Corresponds to Tb in the paper . <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / less important parameters - things you might change but be carefull <nl> + / / less important parameters - things you might change but be careful <nl> / / / / / / / / / / / / / / / / / / / / / / / / <nl> float backgroundRatio ; <nl> / / corresponds to fTB = 1 - cf from the paper <nl> struct GaussBGStatModel2Params <nl> int nHeight ; <nl> int nND ; / / number of data dimensions ( image channels ) <nl> <nl> - bool bPostFiltering ; / / defult 1 - do postfiltering - will make shadow detection results also give value 255 <nl> + bool bPostFiltering ; / / default 1 - do postfiltering - will make shadow detection results also give value 255 <nl> double minArea ; / / for postfiltering <nl> <nl> bool bInit ; / / default 1 , faster updates at start <nl> struct GaussBGStatModel2Params <nl> / / / / / / / / / / / / / / / / / / / / / / / / <nl> float fAlphaT ; <nl> / / alpha - speed of update - if the time interval you want to average over is T <nl> - / / set alpha = 1 / T . It is also usefull at start to make T slowly increase <nl> + / / set alpha = 1 / T . It is also useful at start to make T slowly increase <nl> / / from 1 until the desired T <nl> float fTb ; <nl> / / Tb - threshold on the squared Mahalan . dist . to decide if it is well described <nl> struct GaussBGStatModel2Params <nl> / / and that is Tb = 4 * 4 = 16 ; <nl> <nl> / / / / / / / / / / / / / / / / / / / / / / / / / <nl> - / / less important parameters - things you might change but be carefull <nl> + / / less important parameters - things you might change but be careful <nl> / / / / / / / / / / / / / / / / / / / / / / / / <nl> float fTg ; <nl> / / Tg - threshold on the squared Mahalan . dist . to decide <nl> struct GMM <nl> } ; <nl> <nl> / / shadow detection performed per pixel <nl> - / / should work for rgb data , could be usefull for gray scale and depth data as well <nl> + / / should work for rgb data , could be useful for gray scale and depth data as well <nl> / / See : Prati , Mikic , Trivedi , Cucchiara , " Detecting Moving Shadows . . . " , IEEE PAMI , 2003 . <nl> CV_INLINE bool <nl> detectShadowGMM ( const float * data , int nchannels , int nmodes , <nl> mmm a / modules / video / src / lkpyramid . cpp <nl> ppp b / modules / video / src / lkpyramid . cpp <nl> namespace <nl> std : : vector < UMat > prevPyr ; prevPyr . resize ( maxLevel + 1 ) ; <nl> std : : vector < UMat > nextPyr ; nextPyr . resize ( maxLevel + 1 ) ; <nl> <nl> - / / allocate buffers with aligned pitch to be able to use cl_khr_image2d_from_buffer extention <nl> + / / allocate buffers with aligned pitch to be able to use cl_khr_image2d_from_buffer extension <nl> / / This is the required pitch alignment in pixels <nl> int pitchAlign = ( int ) ocl : : Device : : getDefault ( ) . imagePitchAlignment ( ) ; <nl> if ( pitchAlign > 0 ) <nl> namespace <nl> for ( int level = 1 ; level < = maxLevel ; + + level ) <nl> { <nl> int cols , rows ; <nl> - / / allocate buffers with aligned pitch to be able to use image on buffer extention <nl> + / / allocate buffers with aligned pitch to be able to use image on buffer extension <nl> cols = ( prevPyr [ level - 1 ] . cols + 1 ) / 2 ; <nl> rows = ( prevPyr [ level - 1 ] . rows + 1 ) / 2 ; <nl> prevPyr [ level ] = UMat ( rows , ( cols + pitchAlign - 1 ) & ( - pitchAlign ) , prevPyr [ level - 1 ] . type ( ) ) . colRange ( 0 , cols ) ; <nl> mmm a / modules / videoio / include / opencv2 / videoio . hpp <nl> ppp b / modules / videoio / include / opencv2 / videoio . hpp <nl> class CV_EXPORTS_W VideoCapture <nl> ` VideoCapture - > API Backend - > Operating System - > Device Driver - > Device Hardware ` <nl> @ endcode <nl> The returned value might be different from what really used by the device or it could be encoded <nl> - using device dependant rules ( eg . steps or percentage ) . Effective behaviour depends from device <nl> + using device dependent rules ( eg . steps or percentage ) . Effective behaviour depends from device <nl> driver and API Backend <nl> <nl> * / <nl> mmm a / modules / videoio / include / opencv2 / videoio / videoio_c . h <nl> ppp b / modules / videoio / include / opencv2 / videoio / videoio_c . h <nl> enum <nl> CV_CAP_PROP_MONOCHROME = 19 , <nl> CV_CAP_PROP_SHARPNESS = 20 , <nl> CV_CAP_PROP_AUTO_EXPOSURE = 21 , / / exposure control done by camera , <nl> - / / user can adjust refernce level <nl> + / / user can adjust reference level <nl> / / using this feature <nl> CV_CAP_PROP_GAMMA = 22 , <nl> CV_CAP_PROP_TEMPERATURE = 23 , <nl> enum <nl> CV_CAP_PROP_XI_COLOR_FILTER_ARRAY = 475 , / / Returns color filter array type of RAW data . <nl> CV_CAP_PROP_XI_GAMMAY = 476 , / / Luminosity gamma <nl> CV_CAP_PROP_XI_GAMMAC = 477 , / / Chromaticity gamma <nl> - CV_CAP_PROP_XI_SHARPNESS = 478 , / / Sharpness Strenght <nl> + CV_CAP_PROP_XI_SHARPNESS = 478 , / / Sharpness Strength <nl> CV_CAP_PROP_XI_CC_MATRIX_00 = 479 , / / Color Correction Matrix element [ 0 ] [ 0 ] <nl> CV_CAP_PROP_XI_CC_MATRIX_01 = 480 , / / Color Correction Matrix element [ 0 ] [ 1 ] <nl> CV_CAP_PROP_XI_CC_MATRIX_02 = 481 , / / Color Correction Matrix element [ 0 ] [ 2 ] <nl> mmm a / modules / videoio / src / cap_aravis . cpp <nl> ppp b / modules / videoio / src / cap_aravis . cpp <nl> class CvCaptureCAM_Aravis : public CvCapture <nl> <nl> unsigned int payload ; / / Width x height x Pixel width . <nl> <nl> - int widthMin ; / / Camera sensor minium width . <nl> + int widthMin ; / / Camera sensor minimum width . <nl> int widthMax ; / / Camera sensor maximum width . <nl> - int heightMin ; / / Camera sensor minium height . <nl> + int heightMin ; / / Camera sensor minimum height . <nl> int heightMax ; / / Camera sensor maximum height . <nl> bool fpsAvailable ; <nl> - double fpsMin ; / / Camera minium fps . <nl> + double fpsMin ; / / Camera minimum fps . <nl> double fpsMax ; / / Camera maximum fps . <nl> bool gainAvailable ; <nl> double gainMin ; / / Camera minimum gain . <nl> void CvCaptureCAM_Aravis : : autoExposureControl ( IplImage * image ) <nl> ng = CLIP ( gain + ev + exposureCompensation , gainMin , gainMax ) ; <nl> <nl> if ( ng < gain ) { <nl> - / / piority 1 - reduce gain <nl> + / / priority 1 - reduce gain <nl> arv_camera_set_gain ( camera , ( gain = ng ) ) ; <nl> return ; <nl> } <nl> mmm a / modules / videoio / src / cap_avfoundation_mac . mm <nl> ppp b / modules / videoio / src / cap_avfoundation_mac . mm <nl> - ( int ) updateImage { <nl> return 0 ; <nl> } <nl> <nl> - / / Output image paramaters . <nl> + / / Output image parameters . <nl> int outChannels ; <nl> if ( mMode = = CV_CAP_MODE_BGR | | mMode = = CV_CAP_MODE_RGB ) { <nl> outChannels = 3 ; <nl> - ( int ) updateImage { <nl> mOutImage - > imageData = reinterpret_cast < char * > ( mOutImagedata ) ; <nl> mOutImage - > imageSize = int ( currSize ) ; <nl> <nl> - / / Device image paramaters and conversion code . <nl> + / / Device image parameters and conversion code . <nl> / / ( Not all of these conversions are used in production , but they were all tested to find the fastest options . ) <nl> int deviceChannels ; <nl> int cvtCode ; <nl> mmm a / modules / videoio / src / cap_dc1394_v2 . cpp <nl> ppp b / modules / videoio / src / cap_dc1394_v2 . cpp <nl> CvCaptureCAM_DC1394_v2_CPP : : CvCaptureCAM_DC1394_v2_CPP ( ) <nl> dcCam = 0 ; <nl> isoSpeed = 400 ; <nl> fps = 15 ; <nl> - / / Resetted the value here to 1 in order to ensure only a single frame is stored in the buffer ! <nl> + / / Reset the value here to 1 in order to ensure only a single frame is stored in the buffer ! <nl> nDMABufs = 8 ; <nl> started = false ; <nl> cameraId = 0 ; <nl> mmm a / modules / videoio / src / cap_dshow . cpp <nl> ppp b / modules / videoio / src / cap_dshow . cpp <nl> interface ISampleGrabber : public IUnknown <nl> / / optionally setup a second ( or third , fourth . . . ) device - same options as above <nl> VI . setupDevice ( device2 ) ; <nl> <nl> - / / As requested width and height can not always be accomodated <nl> + / / As requested width and height can not always be accommodated <nl> / / make sure to check the size once the device is setup <nl> <nl> int width = VI . getWidth ( device1 ) ; <nl> static void MyFreeMediaType ( AM_MEDIA_TYPE & mt ) { <nl> } <nl> if ( mt . pUnk ! = NULL ) <nl> { <nl> - / / Unecessary because pUnk should not be used , but safest . <nl> + / / Unnecessary because pUnk should not be used , but safest . <nl> mt . pUnk - > Release ( ) ; <nl> mt . pUnk = NULL ; <nl> } <nl> char * videoInput : : getDeviceName ( int deviceID ) { <nl> <nl> int videoInput : : listDevices ( bool silent ) { <nl> <nl> - / / COM Library Intialization <nl> + / / COM Library Initialization <nl> comInit ( ) ; <nl> <nl> if ( ! silent ) DebugPrintOut ( " \ nVIDEOINPUT SPY MODE ! \ n \ n " ) ; <nl> bool videoInput : : isFrameNew ( int id ) { <nl> EnterCriticalSection ( & VDList [ id ] - > sgCallback - > critSection ) ; <nl> result = VDList [ id ] - > sgCallback - > newFrame ; <nl> <nl> - / / we need to give it some time at the begining to start up so lets check after 400 frames <nl> + / / we need to give it some time at the beginning to start up so lets check after 400 frames <nl> if ( VDList [ id ] - > nFramesRunning > 400 & & VDList [ id ] - > sgCallback - > freezeCheck > VDList [ id ] - > nFramesForReconnect ) { <nl> freeze = true ; <nl> } <nl> bool videoInput : : isDeviceSetup ( int id ) const <nl> <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> / / Gives us a little pop up window to adjust settings <nl> - / / We do this in a seperate thread now ! <nl> + / / We do this in a separate thread now ! <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> <nl> <nl> bool videoInput : : setVideoSettingFilter ( int deviceID , long Property , long lValue , <nl> pAMVideoProcAmp - > Set ( Property , Default , VideoProcAmp_Flags_Auto ) ; <nl> } <nl> else { <nl> - / / Perhaps add a check that lValue and Flags are within the range aquired from GetRange above <nl> + / / Perhaps add a check that lValue and Flags are within the range acquired from GetRange above <nl> pAMVideoProcAmp - > Set ( Property , lValue , Flags ) ; <nl> } <nl> <nl> bool videoInput : : setVideoSettingCamera ( int deviceID , long Property , long lValue , <nl> } <nl> else <nl> { <nl> - / / Perhaps add a check that lValue and Flags are within the range aquired from GetRange above <nl> + / / Perhaps add a check that lValue and Flags are within the range acquired from GetRange above <nl> pIAMCameraControl - > Set ( Property , lValue , Flags ) ; <nl> } <nl> pIAMCameraControl - > Release ( ) ; <nl> videoInput : : ~ videoInput ( ) { <nl> { <nl> delete VDList [ i ] ; <nl> } <nl> - / / Unitialize com <nl> + / / Uninitialize com <nl> comUnInit ( ) ; <nl> } <nl> <nl> bool videoInput : : comInit ( ) { <nl> <nl> <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> - / / Same as above but to unitialize com , decreases counter and frees com <nl> + / / Same as above but to uninitialize com , decreases counter and frees com <nl> / / if no one else is using it <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> <nl> int videoInput : : start ( int deviceID , videoDevice * VD ) { <nl> return hr ; <nl> } <nl> <nl> - / / FITLER GRAPH MANAGER / / <nl> + / / FILTER GRAPH MANAGER / / <nl> / / Create the Filter Graph Manager . <nl> hr = CoCreateInstance ( CLSID_FilterGraph , 0 , CLSCTX_INPROC_SERVER , IID_IGraphBuilder , ( void * * ) & VD - > pGraph ) ; <nl> if ( FAILED ( hr ) ) <nl> HRESULT videoInput : : routeCrossbar ( ICaptureGraphBuilder2 * * ppBuild , IBaseFilter * <nl> } <nl> Crossbar - > Route ( pOIndex , pIndex ) ; <nl> } else { <nl> - DebugPrintOut ( " SETUP : Didn ' t find specified Physical Connection type . Using Defualt . \ n " ) ; <nl> + DebugPrintOut ( " SETUP : Didn ' t find specified Physical Connection type . Using Default . \ n " ) ; <nl> } <nl> <nl> / / we only free the crossbar when we close or restart the device <nl> mmm a / modules / videoio / src / cap_ffmpeg_impl . hpp <nl> ppp b / modules / videoio / src / cap_ffmpeg_impl . hpp <nl> static AVStream * icv_add_video_stream_FFMPEG ( AVFormatContext * oc , <nl> } <nl> if ( c - > codec_id = = CV_CODEC ( CODEC_ID_MPEG1VIDEO ) | | c - > codec_id = = CV_CODEC ( CODEC_ID_MSMPEG4V3 ) ) { <nl> / * needed to avoid using macroblocks in which some coeffs overflow <nl> - this doesnt happen with normal video , it just happens here as the <nl> - motion of the chroma plane doesnt match the luma plane * / <nl> + this doesn ' t happen with normal video , it just happens here as the <nl> + motion of the chroma plane doesn ' t match the luma plane * / <nl> / * avoid FFMPEG warning ' clipping 1 dct coefficients . . . ' * / <nl> c - > mb_decision = 2 ; <nl> } <nl> static AVStream * icv_add_video_stream_FFMPEG ( AVFormatContext * oc , <nl> # endif <nl> <nl> # if LIBAVCODEC_VERSION_INT > 0x000409 <nl> - / / some formats want stream headers to be seperate <nl> + / / some formats want stream headers to be separate <nl> if ( oc - > oformat - > flags & AVFMT_GLOBALHEADER ) <nl> { <nl> # if LIBAVCODEC_BUILD > CALC_FFMPEG_VERSION ( 56 , 35 , 0 ) <nl> AVStream * OutputMediaStream_FFMPEG : : addVideoStream ( AVFormatContext * oc , CV_CODEC <nl> if ( c - > codec_id = = CV_CODEC ( CODEC_ID_MPEG1VIDEO ) | | c - > codec_id = = CV_CODEC ( CODEC_ID_MSMPEG4V3 ) ) <nl> { <nl> / / needed to avoid using macroblocks in which some coeffs overflow <nl> - / / this doesnt happen with normal video , it just happens here as the <nl> - / / motion of the chroma plane doesnt match the luma plane <nl> + / / this doesn ' t happen with normal video , it just happens here as the <nl> + / / motion of the chroma plane doesn ' t match the luma plane <nl> <nl> / / avoid FFMPEG warning ' clipping 1 dct coefficients . . . ' <nl> <nl> AVStream * OutputMediaStream_FFMPEG : : addVideoStream ( AVFormatContext * oc , CV_CODEC <nl> } <nl> <nl> # if LIBAVCODEC_VERSION_INT > 0x000409 <nl> - / / some formats want stream headers to be seperate <nl> + / / some formats want stream headers to be separate <nl> if ( oc - > oformat - > flags & AVFMT_GLOBALHEADER ) <nl> { <nl> # if LIBAVCODEC_BUILD > CALC_FFMPEG_VERSION ( 56 , 35 , 0 ) <nl> mmm a / modules / videoio / src / cap_giganetix . cpp <nl> ppp b / modules / videoio / src / cap_giganetix . cpp <nl> wrprGetGigEVisionAPI ( ) <nl> \ brief Wrapper to GigEVisionAPI function <nl> \ param api <nl> \ param eventHandler <nl> - \ return true - succsess , else - false <nl> + \ return true - success , else - false <nl> See \ a wrprInitGigEVisionAPI , \ a gige : : IGigEVisionAPI <nl> <nl> * / <nl> mmm a / modules / videoio / src / cap_gphoto2 . cpp <nl> ppp b / modules / videoio / src / cap_gphoto2 . cpp <nl> int DigitalCameraCapture : : collectWidgets ( std : : ostream & os , <nl> / * * <nl> * Write message to @ field msgsBuffer if user want to store them <nl> * ( @ field collectMsgs ) . <nl> - * Print debug informations on screen . <nl> + * Print debug information on screen . <nl> * / <nl> template < typename OsstreamPrintable > <nl> void DigitalCameraCapture : : message ( MsgType msgType , const char * msg , <nl> mmm a / modules / videoio / src / cap_gstreamer . cpp <nl> ppp b / modules / videoio / src / cap_gstreamer . cpp <nl> bool CvCapture_GStreamer : : grabFrame ( ) <nl> / * ! <nl> * \ brief CvCapture_GStreamer : : retrieveFrame <nl> * \ return IplImage pointer . [ Transfer Full ] <nl> - * Retreive the previously grabbed buffer , and wrap it in an IPLImage structure <nl> + * Retrieve the previously grabbed buffer , and wrap it in an IPLImage structure <nl> * / <nl> IplImage * CvCapture_GStreamer : : retrieveFrame ( int ) <nl> { <nl> bool CvCapture_GStreamer : : open ( int type , const char * filename ) <nl> <nl> if ( ! gst_structure_get_int ( structure , " height " , & height ) ) <nl> { <nl> - CV_WARN ( " Cannot query video heigth \ n " ) ; <nl> + CV_WARN ( " Cannot query video height \ n " ) ; <nl> } <nl> <nl> gint num = 0 , denom = 1 ; <nl> bool CvCapture_GStreamer : : open ( int type , const char * filename ) <nl> } <nl> <nl> / * ! <nl> - * \ brief CvCapture_GStreamer : : getProperty retreive the requested property from the pipeline <nl> + * \ brief CvCapture_GStreamer : : getProperty retrieve the requested property from the pipeline <nl> * \ param propId requested property <nl> * \ return property value <nl> * <nl> - * There are two ways the properties can be retreived . For seek - based properties we can query the pipeline . <nl> + * There are two ways the properties can be retrieved . For seek - based properties we can query the pipeline . <nl> * For frame - based properties , we use the caps of the lasst receivef sample . This means that some properties <nl> * are not available until a first frame was received <nl> * / <nl> mmm a / modules / videoio / src / cap_libv4l . cpp <nl> ppp b / modules / videoio / src / cap_libv4l . cpp <nl> Second Patch : August 28 , 2004 Sfuncia Fabio fiblan @ yahoo . it <nl> For Release : OpenCV - Linux Beta4 Opencv - 0 . 9 . 6 <nl> <nl> FS : this patch fix not sequential index of device ( unplugged device ) , and real numCameras . <nl> - for - 1 index ( icvOpenCAM_V4L ) i dont use / dev / video but real device available , because <nl> + for - 1 index ( icvOpenCAM_V4L ) I don ' t use / dev / video but real device available , because <nl> if / dev / video is a link to / dev / video0 and i unplugged device on / dev / video0 , / dev / video <nl> is a bad link . I search the first available device with indexList . <nl> <nl> static int try_init_v4l ( CvCaptureCAM_V4L * capture , const char * deviceName ) <nl> int detect = 0 ; <nl> <nl> <nl> - / / Test device for V4L compability <nl> + / / Test device for V4L compatibility <nl> <nl> / * Test using an open to see if this new device name really does exists . * / <nl> / * No matter what the name - it still must be opened ! * / <nl> static int try_init_v4l2 ( CvCaptureCAM_V4L * capture , const char * deviceName ) <nl> int detect = 0 ; <nl> <nl> <nl> - / / Test device for V4L2 compability <nl> + / / Test device for V4L2 compatibility <nl> <nl> / * Open and test V4L2 device * / <nl> capture - > deviceHandle = v4l2_open ( deviceName , O_RDWR / * required * / | O_NONBLOCK , 0 ) ; <nl> static CvCaptureCAM_V4L * icvCaptureFromCAM_V4L ( int index ) <nl> char deviceName [ MAX_DEVICE_DRIVER_NAME ] ; <nl> <nl> if ( ! numCameras ) <nl> - icvInitCapture_V4L ( ) ; / * Havent called icvInitCapture yet - do it now ! * / <nl> + icvInitCapture_V4L ( ) ; / * Haven ' t called icvInitCapture yet - do it now ! * / <nl> if ( ! numCameras ) <nl> return NULL ; / * Are there any / dev / video input sources ? * / <nl> <nl> static CvCaptureCAM_V4L * icvCaptureFromCAM_V4L ( const char * deviceName ) <nl> capture - > buffers [ MAX_V4L_BUFFERS ] . start = NULL ; <nl> # endif <nl> <nl> - / * w / o memset some parts arent initialized - AKA : Fill it with zeros so it is clean * / <nl> + / * w / o memset some parts aren ' t initialized - AKA : Fill it with zeros so it is clean * / <nl> memset ( capture , 0 , sizeof ( CvCaptureCAM_V4L ) ) ; <nl> <nl> - / * Present the routines needed for V4L funtionality . They are inserted as part of <nl> + / * Present the routines needed for V4L functionality . They are inserted as part of <nl> the standard set of cv calls promoting transparency . " Vector Table " insertion . * / <nl> capture - > FirstCapture = 1 ; <nl> <nl> static int icvSetVideoSize ( CvCaptureCAM_V4L * capture , int w , int h ) { <nl> CLEAR ( capture - > form ) ; <nl> capture - > form . type = V4L2_BUF_TYPE_VIDEO_CAPTURE ; <nl> <nl> - / * read the current setting , mainly to retreive the pixelformat information * / <nl> + / * read the current setting , mainly to retrieve the pixelformat information * / <nl> xioctl ( capture - > deviceHandle , VIDIOC_G_FMT , & capture - > form ) ; <nl> <nl> / * set the values we want to change * / <nl> static int icvSetControl ( CvCaptureCAM_V4L * capture , int property_id , double val <nl> } <nl> <nl> if ( v4l1_ioctl ( capture - > deviceHandle , VIDIOCSPICT , & capture - > imageProperties ) < 0 ) { <nl> - fprintf ( stderr , " VIDEOIO ERROR : V4L : Unable to set video informations \ n " ) ; <nl> + fprintf ( stderr , " VIDEOIO ERROR : V4L : Unable to set video information \ n " ) ; <nl> icvCloseCAM_V4L ( capture ) ; <nl> return - 1 ; <nl> } <nl> mmm a / modules / videoio / src / cap_mjpeg_decoder . cpp <nl> ppp b / modules / videoio / src / cap_mjpeg_decoder . cpp <nl> struct BitmapInfoHeader <nl> { <nl> DWORD biSize ; / / Write header size of BITMAPINFO header structure <nl> LONG biWidth ; / / width in pixels <nl> - LONG biHeight ; / / heigth in pixels <nl> + LONG biHeight ; / / height in pixels <nl> WORD biPlanes ; / / Number of color planes in which the data is stored <nl> WORD biBitCount ; / / Number of bits per pixel <nl> DWORD biCompression ; / / Type of compression used ( uncompressed : NO_COMPRESSION = 0 ) <nl> mmm a / modules / videoio / src / cap_mjpeg_encoder . cpp <nl> ppp b / modules / videoio / src / cap_mjpeg_encoder . cpp <nl> static const int idct_prescale [ ] = <nl> <nl> static const char jpegHeader [ ] = <nl> " \ xFF \ xD8 " / / SOI - start of image <nl> - " \ xFF \ xE0 " / / APP0 - jfif extention <nl> + " \ xFF \ xE0 " / / APP0 - jfif extension <nl> " \ x00 \ x10 " / / 2 bytes : length of APP0 segment <nl> " JFIF \ x00 " / / JFIF signature <nl> " \ x01 \ x02 " / / version of JFIF <nl> mmm a / modules / videoio / src / cap_msmf . cpp <nl> ppp b / modules / videoio / src / cap_msmf . cpp <nl> <nl> Media Foundation - based Video Capturing module is based on <nl> videoInput library by Evgeny Pereguda : <nl> http : / / www . codeproject . com / Articles / 559437 / Capturing - of - video - from - web - camera - on - Windows - 7 - an <nl> - Originaly licensed under The Code Project Open License ( CPOL ) 1 . 02 : <nl> + Originally licensed under The Code Project Open License ( CPOL ) 1 . 02 : <nl> http : / / www . codeproject . com / info / cpol10 . aspx <nl> * / <nl> / / require Windows 8 for some of the formats defined otherwise could baseline on lower version <nl> void ImageGrabberThread : : setEmergencyStopEvent ( void * userData , void ( * func ) ( int , <nl> <nl> ImageGrabberThread : : ~ ImageGrabberThread ( void ) <nl> { <nl> - DebugPrintOut ( L " IMAGEGRABBERTHREAD VIDEODEVICE % i : Destroing ImageGrabberThread \ n " , igt_DeviceID ) ; <nl> + DebugPrintOut ( L " IMAGEGRABBERTHREAD VIDEODEVICE % i : Destroying ImageGrabberThread \ n " , igt_DeviceID ) ; <nl> if ( igt_Handle ) <nl> WaitForSingleObject ( igt_Handle , INFINITE ) ; <nl> delete igt_pImageGrabber ; <nl> mmm a / modules / videoio / src / cap_openni . cpp <nl> ppp b / modules / videoio / src / cap_openni . cpp <nl> bool CvCapture_OpenNI : : setDepthGeneratorProperty ( int propIdx , double propValue <nl> if ( propValue ! = 0 . 0 ) / / " on " <nl> { <nl> / / if there isn ' t image generator ( i . e . ASUS XtionPro doesn ' t have it ) <nl> - / / then the property isn ' t avaliable <nl> + / / then the property isn ' t available <nl> if ( imageGenerator . IsValid ( ) ) <nl> { <nl> if ( ! depthGenerator . GetAlternativeViewPointCap ( ) . IsViewPointAs ( imageGenerator ) ) <nl> mmm a / modules / videoio / src / cap_openni2 . cpp <nl> ppp b / modules / videoio / src / cap_openni2 . cpp <nl> bool CvCapture_OpenNI2 : : setDepthGeneratorProperty ( int propIdx , double propValue <nl> if ( propValue ! = 0 . 0 ) / / " on " <nl> { <nl> / / if there isn ' t image generator ( i . e . ASUS XtionPro doesn ' t have it ) <nl> - / / then the property isn ' t avaliable <nl> + / / then the property isn ' t available <nl> if ( streams [ CV_COLOR_STREAM ] . isValid ( ) ) <nl> { <nl> openni : : ImageRegistrationMode mode = propValue ! = 0 . 0 ? openni : : IMAGE_REGISTRATION_DEPTH_TO_COLOR : openni : : IMAGE_REGISTRATION_OFF ; <nl> mmm a / modules / videoio / src / cap_qt . cpp <nl> ppp b / modules / videoio / src / cap_qt . cpp <nl> static int icvOpenFile_QT_Movie ( CvCapture_QT_Movie * capture , const char * file <nl> <nl> / / we would use CFStringCreateWithFileSystemRepresentation ( kCFAllocatorDefault , filename ) on Mac OS X 10 . 4 <nl> CFStringRef inPath = CFStringCreateWithCString ( kCFAllocatorDefault , filename , kCFStringEncodingISOLatin1 ) ; <nl> - OPENCV_ASSERT ( ( inPath ! = nil ) , " icvOpenFile_QT_Movie " , " couldnt create CFString from a string " ) ; <nl> + OPENCV_ASSERT ( ( inPath ! = nil ) , " icvOpenFile_QT_Movie " , " couldn ' t create CFString from a string " ) ; <nl> <nl> / / create the data reference <nl> myErr = QTNewDataReferenceFromFullPathCFString ( inPath , kQTPOSIXPathStyle , 0 , & myDataRef , & myDataRefType ) ; <nl> static int icvOpenFile_QT_Movie ( CvCapture_QT_Movie * capture , const char * file <nl> / / create gworld for decompressed image <nl> myErr = QTNewGWorld ( & capture - > myGWorld , k32ARGBPixelFormat / * k24BGRPixelFormat geht leider nicht * / , <nl> & myRect , nil , nil , 0 ) ; <nl> - OPENCV_ASSERT ( myErr = = noErr , " icvOpenFile_QT_Movie " , " couldnt create QTNewGWorld ( ) for output image " ) ; <nl> + OPENCV_ASSERT ( myErr = = noErr , " icvOpenFile_QT_Movie " , " couldn ' t create QTNewGWorld ( ) for output image " ) ; <nl> SetMovieGWorld ( capture - > myMovie , capture - > myGWorld , nil ) ; <nl> <nl> / / build IplImage header that will point to the PixMap of the Movie ' s GWorld later on <nl> static const void * icvRetrieveFrame_QT_Movie ( CvCapture_QT_Movie * capture , int <nl> <nl> / / update IplImage header that points to PixMap of the Movie ' s GWorld . <nl> / / unfortunately , cvCvtColor doesn ' t know ARGB , the QuickTime pixel format , <nl> - / / so we pass a modfied address . <nl> + / / so we pass a modified address . <nl> / / ATTENTION : don ' t access the last pixel ' s alpha entry , it ' s inexistant <nl> myPixMapHandle = GetGWorldPixMap ( capture - > myGWorld ) ; <nl> LockPixels ( myPixMapHandle ) ; <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> char nameBuffer [ 255 ] ; <nl> <nl> result = GetComponentInfo ( component , & desc , nameHandle , nil , nil ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt GetComponentInfo ( ) " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t GetComponentInfo ( ) " ) ; <nl> OPENCV_ASSERT ( * nameHandle , " icvOpenCamera_QT " , " No name returned by GetComponentInfo ( ) " ) ; <nl> snprintf ( nameBuffer , ( * * nameHandle ) + 1 , " % s " , ( char * ) ( * nameHandle + 1 ) ) ; <nl> printf ( " - Videodevice : % s \ n " , nameBuffer ) ; <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> { <nl> result = VDGetNumberOfInputs ( capture - > grabber , & capture - > channel ) ; <nl> if ( result ! = noErr ) <nl> - fprintf ( stderr , " Couldnt GetNumberOfInputs : % d \ n " , ( int ) result ) ; <nl> + fprintf ( stderr , " Couldn ' t GetNumberOfInputs : % d \ n " , ( int ) result ) ; <nl> else <nl> { <nl> # ifndef NDEBUG <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> Str255 nameBuffer ; <nl> <nl> result = VDGetInputName ( capture - > grabber , capture - > channel , nameBuffer ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " ictOpenCamera_QT " , " couldnt GetInputName ( ) " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " ictOpenCamera_QT " , " couldn ' t GetInputName ( ) " ) ; <nl> snprintf ( name , * nameBuffer , " % s " , ( char * ) ( nameBuffer + 1 ) ) ; <nl> printf ( " Choosing input % d - % s \ n " , ( int ) capture - > channel , name ) ; <nl> # endif <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> <nl> / / Select the desired input <nl> result = VDSetInput ( capture - > grabber , capture - > channel ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt select video digitizer input " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t select video digitizer input " ) ; <nl> <nl> / / get the bounding rectangle of the video digitizer <nl> result = VDGetActiveSrcRect ( capture - > grabber , capture - > channel , & myRect ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt create VDGetActiveSrcRect from digitizer " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t create VDGetActiveSrcRect from digitizer " ) ; <nl> myRect . right = 640 ; myRect . bottom = 480 ; <nl> capture - > size = cvSize ( myRect . right - myRect . left , myRect . bottom - myRect . top ) ; <nl> printf ( " Source rect is % d , % d - - % d , % d \ n " , ( int ) myRect . left , ( int ) myRect . top , ( int ) myRect . right , ( int ) myRect . bottom ) ; <nl> <nl> / / create offscreen GWorld <nl> result = QTNewGWorld ( & capture - > myGWorld , k32ARGBPixelFormat , & myRect , nil , nil , 0 ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt create QTNewGWorld ( ) for output image " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t create QTNewGWorld ( ) for output image " ) ; <nl> <nl> / / get pixmap <nl> capture - > pixmap = GetGWorldPixMap ( capture - > myGWorld ) ; <nl> result = GetMoviesError ( ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt get pixmap " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t get pixmap " ) ; <nl> <nl> / / set digitizer rect <nl> result = VDSetDigitizerRect ( capture - > grabber , & myRect ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt create VDGetActiveSrcRect from digitizer " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t create VDGetActiveSrcRect from digitizer " ) ; <nl> <nl> / / set destination of digitized input <nl> result = VDSetPlayThruDestination ( capture - > grabber , capture - > pixmap , & myRect , nil , nil ) ; <nl> printf ( " QuickTime error : % d \ n " , ( int ) result ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set video destination " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set video destination " ) ; <nl> <nl> / / get destination of digitized images <nl> result = VDGetPlayThruDestination ( capture - > grabber , & capture - > pixmap , nil , nil , nil ) ; <nl> printf ( " QuickTime error : % d \ n " , ( int ) result ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt get video destination " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t get video destination " ) ; <nl> OPENCV_ASSERT ( capture - > pixmap ! = nil , " icvOpenCamera_QT " , " empty set video destination " ) ; <nl> <nl> / / get the bounding rectangle of the video digitizer <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> <nl> / / build IplImage header that will point to the PixMap of the Movie ' s GWorld later on <nl> capture - > image_rgb = cvCreateImageHeader ( capture - > size , IPL_DEPTH_8U , 4 ) ; <nl> - OPENCV_ASSERT ( capture - > image_rgb , " icvOpenCamera_QT " , " couldnt create image header " ) ; <nl> + OPENCV_ASSERT ( capture - > image_rgb , " icvOpenCamera_QT " , " couldn ' t create image header " ) ; <nl> <nl> / / create IplImage that hold correctly formatted result <nl> capture - > image_bgr = cvCreateImage ( capture - > size , IPL_DEPTH_8U , 3 ) ; <nl> - OPENCV_ASSERT ( capture - > image_bgr , " icvOpenCamera_QT " , " couldnt create image " ) ; <nl> + OPENCV_ASSERT ( capture - > image_bgr , " icvOpenCamera_QT " , " couldn ' t create image " ) ; <nl> <nl> / / notify digitizer component , that we well be starting grabbing soon <nl> result = VDCaptureStateChanging ( capture - > grabber , vdFlagCaptureIsForRecord | vdFlagCaptureStarting | vdFlagCaptureLowLatency ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set capture state " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set capture state " ) ; <nl> <nl> <nl> / / yeah , we did it <nl> static int icvClose_QT_Cam ( CvCapture_QT_Cam * capture ) <nl> <nl> / / notify digitizer component , that we well be stopping grabbing soon <nl> result = VDCaptureStateChanging ( capture - > grabber , vdFlagCaptureStopping ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set capture state " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set capture state " ) ; <nl> <nl> / / release memory <nl> cvReleaseImage ( & capture - > image_bgr ) ; <nl> static int icvClose_QT_Cam ( CvCapture_QT_Cam * capture ) <nl> DisposeGWorld ( capture - > myGWorld ) ; <nl> CloseComponent ( capture - > grabber ) ; <nl> <nl> - / / sucessful <nl> + / / successful <nl> return 1 ; <nl> } <nl> <nl> static const void * icvRetrieveFrame_QT_Cam ( CvCapture_QT_Cam * capture , int ) <nl> <nl> / / update IplImage header that points to PixMap of the Movie ' s GWorld . <nl> / / unfortunately , cvCvtColor doesn ' t know ARGB , the QuickTime pixel format , <nl> - / / so we pass a modfied address . <nl> + / / so we pass a modified address . <nl> / / ATTENTION : don ' t access the last pixel ' s alpha entry , it ' s inexistant <nl> / / myPixMapHandle = GetGWorldPixMap ( capture - > myGWorld ) ; <nl> myPixMapHandle = capture - > pixmap ; <nl> static OSErr icvDataProc_QT_Cam ( SGChannel channel , Ptr raw_data , long len , long <nl> <nl> / / we need a decompression sequence that fits the raw data coming from the camera <nl> err = SGGetChannelSampleDescription ( channel , ( Handle ) description ) ; <nl> - OPENCV_ASSERT ( err = = noErr , " icvDataProc_QT_Cam " , " couldnt get channel sample description " ) ; <nl> + OPENCV_ASSERT ( err = = noErr , " icvDataProc_QT_Cam " , " couldn ' t get channel sample description " ) ; <nl> <nl> / / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / / <nl> / / This fixed a bug when Quicktime is called twice to grab a frame ( black band bug ) - Yannick Verdie 2010 <nl> static OSErr icvDataProc_QT_Cam ( SGChannel channel , Ptr raw_data , long len , long <nl> err = DecompressSequenceBegin ( & capture - > sequence , description , capture - > gworld , 0 , & capture - > bounds , & scaleMatrix , srcCopy , NULL , 0 , codecNormalQuality , bestSpeedCodec ) ; <nl> / / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / / <nl> <nl> - OPENCV_ASSERT ( err = = noErr , " icvDataProc_QT_Cam " , " couldnt begin decompression sequence " ) ; <nl> + OPENCV_ASSERT ( err = = noErr , " icvDataProc_QT_Cam " , " couldn ' t begin decompression sequence " ) ; <nl> DisposeHandle ( ( Handle ) description ) ; <nl> } <nl> <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> <nl> / / open sequence grabber component <nl> capture - > grabber = OpenDefaultComponent ( SeqGrabComponentType , 0 ) ; <nl> - OPENCV_ASSERT ( capture - > grabber , " icvOpenCamera_QT " , " couldnt create image " ) ; <nl> + OPENCV_ASSERT ( capture - > grabber , " icvOpenCamera_QT " , " couldn ' t create image " ) ; <nl> <nl> / / initialize sequence grabber component <nl> result = SGInitialize ( capture - > grabber ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt initialize sequence grabber " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t initialize sequence grabber " ) ; <nl> result = SGSetDataRef ( capture - > grabber , 0 , 0 , seqGrabDontMakeMovie ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set data reference of sequence grabber " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set data reference of sequence grabber " ) ; <nl> <nl> / / set up video channel <nl> result = SGNewChannel ( capture - > grabber , VideoMediaType , & ( capture - > channel ) ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt create new video channel " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t create new video channel " ) ; <nl> <nl> / / select the camera indicated by index <nl> SGDeviceList device_list = 0 ; <nl> result = SGGetChannelDeviceList ( capture - > channel , 0 , & device_list ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt get channel device list " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t get channel device list " ) ; <nl> for ( int i = 0 , current_index = 1 ; i < ( * device_list ) - > count ; i + + ) <nl> { <nl> SGDeviceName device = ( * device_list ) - > entry [ i ] ; <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> if ( current_index = = index ) <nl> { <nl> result = SGSetChannelDevice ( capture - > channel , device . name ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set the channel video device " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set the channel video device " ) ; <nl> break ; <nl> } <nl> current_index + + ; <nl> } <nl> } <nl> result = SGDisposeDeviceList ( capture - > grabber , device_list ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt dispose the channel device list " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t dispose the channel device list " ) ; <nl> <nl> / / query natural camera resolution - - this will be wrong , but will be an upper <nl> / / bound on the actual resolution - - the actual resolution is set below <nl> / / after starting the frame grabber <nl> result = SGGetSrcVideoBounds ( capture - > channel , & ( capture - > bounds ) ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set video channel bounds " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set video channel bounds " ) ; <nl> <nl> / / create offscreen GWorld <nl> result = QTNewGWorld ( & ( capture - > gworld ) , k32ARGBPixelFormat , & ( capture - > bounds ) , 0 , 0 , 0 ) ; <nl> result = SGSetGWorld ( capture - > grabber , capture - > gworld , 0 ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set GWorld for sequence grabber " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set GWorld for sequence grabber " ) ; <nl> result = SGSetChannelBounds ( capture - > channel , & ( capture - > bounds ) ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set video channel bounds " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set video channel bounds " ) ; <nl> result = SGSetChannelUsage ( capture - > channel , seqGrabRecord ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set channel usage " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set channel usage " ) ; <nl> <nl> / / start recording so we can size <nl> result = SGStartRecord ( capture - > grabber ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt start recording " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t start recording " ) ; <nl> <nl> / / don ' t know * actual * resolution until now <nl> ImageDescriptionHandle imageDesc = ( ImageDescriptionHandle ) NewHandle ( 0 ) ; <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> <nl> / / stop grabber so that we can reset the parameters to the right size <nl> result = SGStop ( capture - > grabber ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icveClose_QT_Cam " , " couldnt stop recording " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icveClose_QT_Cam " , " couldn ' t stop recording " ) ; <nl> <nl> / / reset GWorld to correct image size <nl> GWorldPtr tmpgworld ; <nl> result = QTNewGWorld ( & tmpgworld , k32ARGBPixelFormat , & ( capture - > bounds ) , 0 , 0 , 0 ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt create offscreen GWorld " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t create offscreen GWorld " ) ; <nl> result = SGSetGWorld ( capture - > grabber , tmpgworld , 0 ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set GWorld for sequence grabber " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set GWorld for sequence grabber " ) ; <nl> DisposeGWorld ( capture - > gworld ) ; <nl> capture - > gworld = tmpgworld ; <nl> <nl> result = SGSetChannelBounds ( capture - > channel , & ( capture - > bounds ) ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set video channel bounds " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set video channel bounds " ) ; <nl> <nl> / / allocate images <nl> capture - > size = cvSize ( capture - > bounds . right - capture - > bounds . left , capture - > bounds . bottom - capture - > bounds . top ) ; <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> / / so we shift the base address by one byte . <nl> / / ATTENTION : don ' t access the last pixel ' s alpha entry , it ' s inexistant <nl> capture - > image_rgb = cvCreateImageHeader ( capture - > size , IPL_DEPTH_8U , 4 ) ; <nl> - OPENCV_ASSERT ( capture - > image_rgb , " icvOpenCamera_QT " , " couldnt create image header " ) ; <nl> + OPENCV_ASSERT ( capture - > image_rgb , " icvOpenCamera_QT " , " couldn ' t create image header " ) ; <nl> pixmap = GetGWorldPixMap ( capture - > gworld ) ; <nl> OPENCV_ASSERT ( pixmap , " icvOpenCamera_QT " , " didn ' t get GWorld PixMap handle " ) ; <nl> LockPixels ( pixmap ) ; <nl> static int icvOpenCamera_QT ( CvCapture_QT_Cam * capture , const int index ) <nl> <nl> / / create IplImage that hold correctly formatted result <nl> capture - > image_bgr = cvCreateImage ( capture - > size , IPL_DEPTH_8U , 3 ) ; <nl> - OPENCV_ASSERT ( capture - > image_bgr , " icvOpenCamera_QT " , " couldnt create image " ) ; <nl> + OPENCV_ASSERT ( capture - > image_bgr , " icvOpenCamera_QT " , " couldn ' t create image " ) ; <nl> <nl> <nl> / / tell the sequence grabber to invoke our data proc <nl> result = SGSetDataProc ( capture - > grabber , NewSGDataUPP ( icvDataProc_QT_Cam ) , ( long ) capture ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt set data proc " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t set data proc " ) ; <nl> <nl> / / start recording <nl> result = SGStartRecord ( capture - > grabber ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldnt start recording " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icvOpenCamera_QT " , " couldn ' t start recording " ) ; <nl> <nl> return 1 ; <nl> } <nl> static int icvClose_QT_Cam ( CvCapture_QT_Cam * capture ) <nl> <nl> / / stop recording <nl> result = SGStop ( capture - > grabber ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icveClose_QT_Cam " , " couldnt stop recording " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icveClose_QT_Cam " , " couldn ' t stop recording " ) ; <nl> <nl> / / close sequence grabber component <nl> result = CloseComponent ( capture - > grabber ) ; <nl> - OPENCV_ASSERT ( result = = noErr , " icveClose_QT_Cam " , " couldnt close sequence grabber component " ) ; <nl> + OPENCV_ASSERT ( result = = noErr , " icveClose_QT_Cam " , " couldn ' t close sequence grabber component " ) ; <nl> <nl> / / end decompression sequence <nl> CDSequenceEnd ( capture - > sequence ) ; <nl> static int icvClose_QT_Cam ( CvCapture_QT_Cam * capture ) <nl> cvReleaseImageHeader ( & capture - > image_rgb ) ; <nl> DisposeGWorld ( capture - > gworld ) ; <nl> <nl> - / / sucessful <nl> + / / successful <nl> return 1 ; <nl> } <nl> <nl> mmm a / modules / videoio / src / cap_v4l . cpp <nl> ppp b / modules / videoio / src / cap_v4l . cpp <nl> Second Patch : August 28 , 2004 Sfuncia Fabio fiblan @ yahoo . it <nl> For Release : OpenCV - Linux Beta4 Opencv - 0 . 9 . 6 <nl> <nl> FS : this patch fix not sequential index of device ( unplugged device ) , and real numCameras . <nl> - for - 1 index ( icvOpenCAM_V4L ) i dont use / dev / video but real device available , because <nl> + for - 1 index ( icvOpenCAM_V4L ) I don ' t use / dev / video but real device available , because <nl> if / dev / video is a link to / dev / video0 and i unplugged device on / dev / video0 , / dev / video <nl> is a bad link . I search the first available device with indexList . <nl> <nl> the symptoms were damaged image and ' Corrupt JPEG data : premature end of data se <nl> 11th patch : April 2 , 2013 , Forrest Reiling forrest . reiling @ gmail . com <nl> Added v4l2 support for getting capture property CV_CAP_PROP_POS_MSEC . <nl> Returns the millisecond timestamp of the last frame grabbed or 0 if no frames have been grabbed <nl> - Used to successfully synchonize 2 Logitech C310 USB webcams to within 16 ms of one another <nl> + Used to successfully synchronize 2 Logitech C310 USB webcams to within 16 ms of one another <nl> <nl> <nl> make & enjoy ! <nl> make & enjoy ! <nl> # endif <nl> <nl> # ifdef HAVE_VIDEOIO <nl> - / / NetBSD compability layer with V4L2 <nl> + / / NetBSD compatibility layer with V4L2 <nl> # include < sys / videoio . h > <nl> # endif <nl> <nl> static bool try_palette_v4l2 ( CvCaptureCAM_V4L * capture ) <nl> <nl> static int try_init_v4l2 ( CvCaptureCAM_V4L * capture , const char * deviceName ) <nl> { <nl> - / / Test device for V4L2 compability <nl> + / / Test device for V4L2 compatibility <nl> / / Return value : <nl> / / - 1 then unable to open device <nl> / / 0 then detected nothing <nl> bool CvCaptureCAM_V4L : : open ( int _index ) <nl> char _deviceName [ MAX_DEVICE_DRIVER_NAME ] ; <nl> <nl> if ( ! numCameras ) <nl> - icvInitCapture_V4L ( ) ; / * Havent called icvInitCapture yet - do it now ! * / <nl> + icvInitCapture_V4L ( ) ; / * Haven ' t called icvInitCapture yet - do it now ! * / <nl> if ( ! numCameras ) <nl> return false ; / * Are there any / dev / video input sources ? * / <nl> <nl> mmm a / modules / videoio / src / cap_ximea . cpp <nl> ppp b / modules / videoio / src / cap_ximea . cpp <nl> void CvCaptureCAM_XIMEA : : errMsg ( const char * msg , int errNum ) const <nl> case XI_WRITEREG : error_message = " Register write error " ; break ; <nl> case XI_FREE_RESOURCES : error_message = " Freeing resiurces error " ; break ; <nl> case XI_FREE_CHANNEL : error_message = " Freeing channel error " ; break ; <nl> - case XI_FREE_BANDWIDTH : error_message = " Freeing bandwith error " ; break ; <nl> + case XI_FREE_BANDWIDTH : error_message = " Freeing bandwidth error " ; break ; <nl> case XI_READBLK : error_message = " Read block error " ; break ; <nl> case XI_WRITEBLK : error_message = " Write block error " ; break ; <nl> case XI_NO_IMAGE : error_message = " No image " ; break ; <nl> void CvCaptureCAM_XIMEA : : errMsg ( const char * msg , int errNum ) const <nl> case XI_ACQUISITION_ALREADY_UP : error_message = " Acquisition already started " ; break ; <nl> case XI_OLD_DRIVER_VERSION : error_message = " Old version of device driver installed to the system . " ; break ; <nl> case XI_GET_LAST_ERROR : error_message = " To get error code please call GetLastError function . " ; break ; <nl> - case XI_CANT_PROCESS : error_message = " Data cant be processed " ; break ; <nl> + case XI_CANT_PROCESS : error_message = " Data can ' t be processed " ; break ; <nl> case XI_ACQUISITION_STOPED : error_message = " Acquisition has been stopped . It should be started before GetImage . " ; break ; <nl> - case XI_ACQUISITION_STOPED_WERR : error_message = " Acquisition has been stoped with error . " ; break ; <nl> + case XI_ACQUISITION_STOPED_WERR : error_message = " Acquisition has been stopped with error . " ; break ; <nl> case XI_INVALID_INPUT_ICC_PROFILE : error_message = " Input ICC profile missed or corrupted " ; break ; <nl> case XI_INVALID_OUTPUT_ICC_PROFILE : error_message = " Output ICC profile missed or corrupted " ; break ; <nl> case XI_DEVICE_NOT_READY : error_message = " Device not ready to operate " ; break ; <nl> case XI_SHADING_TOOCONTRAST : error_message = " Shading too contrast " ; break ; <nl> case XI_ALREADY_INITIALIZED : error_message = " Module already initialized " ; break ; <nl> - case XI_NOT_ENOUGH_PRIVILEGES : error_message = " Application doesnt enough privileges ( one or more app " ; break ; <nl> + case XI_NOT_ENOUGH_PRIVILEGES : error_message = " Application doesn ' t enough privileges ( one or more app " ; break ; <nl> case XI_NOT_COMPATIBLE_DRIVER : error_message = " Installed driver not compatible with current software " ; break ; <nl> case XI_TM_INVALID_RESOURCE : error_message = " TM file was not loaded successfully from resources " ; break ; <nl> - case XI_DEVICE_HAS_BEEN_RESETED : error_message = " Device has been reseted , abnormal initial state " ; break ; <nl> + case XI_DEVICE_HAS_BEEN_RESETED : error_message = " Device has been reset , abnormal initial state " ; break ; <nl> case XI_NO_DEVICES_FOUND : error_message = " No Devices Found " ; break ; <nl> case XI_RESOURCE_OR_FUNCTION_LOCKED : error_message = " Resource ( device ) or function locked by mutex " ; break ; <nl> case XI_BUFFER_SIZE_TOO_SMALL : error_message = " Buffer provided by user is too small " ; break ; <nl> - case XI_COULDNT_INIT_PROCESSOR : error_message = " Couldnt initialize processor . " ; break ; <nl> + case XI_COULDNT_INIT_PROCESSOR : error_message = " Couldn ' t initialize processor . " ; break ; <nl> case XI_NOT_INITIALIZED : error_message = " The object / module / procedure / process being referred to has not been started . " ; break ; <nl> case XI_RESOURCE_NOT_FOUND : error_message = " Resource not found ( could be processor , file , item . . ) . " ; break ; <nl> case XI_UNKNOWN_PARAM : error_message = " Unknown parameter " ; break ; <nl>

Merge pull request from luzpaz : misc - modules - typos - cont - 2

opencv/opencv

cfe84b953cd4218df88144e1d58c2580540c6972

2018-02-14T09:56:11Z

mmm a / appveyor . yml <nl> ppp b / appveyor . yml <nl> <nl> version : ' { build } ' <nl> - os : Visual Studio 2015 CTP <nl> + os : Visual Studio 2015 Preview <nl> + init : [ ] <nl> + install : [ ] <nl> build_script : <nl> - set PATH = C : \ Program Files ( x86 ) \ MSBuild \ 14 . 0 \ Bin ; % PATH % <nl> - - cmake . <nl> - build : <nl> - verbosity : detailed <nl> + - cmake <nl> + - msbuild json . sln <nl> test_script : <nl> - json_unit . exe <nl>

Appveyor

nlohmann/json

257bf461331c48e694946a335ecd03ebea934b22

2015-04-26T21:41:11Z

mmm a / src / Makefile <nl> ppp b / src / Makefile <nl> cscope : <nl> $ ( QUIET ) cscope - bR - f $ ( CSCOPE_XREF ) <nl> <nl> style : <nl> - $ ( QUIET ) find . - name \ * . cc - o - name \ * . hpp - o - name \ * . tcc | xargs . . / scripts / cpplint - - verbose 2 - - filter = - whitespace / end_of_line , - whitespace / parens , - whitespace / line_length , - readability / casting , - whitespace / braces , - readability / todo , - legal / copyright , - whitespace / comments , - build / include , - whitespace / labels , - runtime / int , - runtime / references , - whitespace / blank_line , - readability / function 2 > & 1 | grep - v Done \ processing <nl> + $ ( QUIET ) find . - name \ * . cc - o - name \ * . hpp - o - name \ * . tcc | xargs . . / scripts / cpplint - - verbose 2 - - filter = - whitespace / end_of_line , - whitespace / parens , - whitespace / line_length , - readability / casting , - whitespace / braces , - readability / todo , - legal / copyright , - whitespace / comments , - build / include , - whitespace / labels , - runtime / references , - whitespace / blank_line , - readability / function 2 > & 1 | grep - v Done \ processing <nl> <nl> showdefines : <nl> $ ( QUIET ) $ ( CXX ) $ ( CXXFLAGS ) - m32 - E - dM - < / dev / null <nl>

Removed the runtime / int filter from make style .

rethinkdb/rethinkdb

bd1efbd115f92c3668fe158c7e334178d634b4a3

2011-09-09T18:25:44Z

mmm a / atom / browser / ui / tray_icon_cocoa . h <nl> ppp b / atom / browser / ui / tray_icon_cocoa . h <nl> class TrayIconCocoa : public TrayIcon { <nl> void SetToolTip ( const std : : string & tool_tip ) override ; <nl> void SetTitle ( const std : : string & title ) override ; <nl> void SetHighlightMode ( bool highlight ) override ; <nl> - void PopContextMenu ( ) override ; <nl> + void PopContextMenu ( const gfx : : Point & pos ) override ; <nl> void SetContextMenu ( ui : : SimpleMenuModel * menu_model ) override ; <nl> <nl> private : <nl> mmm a / atom / browser / ui / tray_icon_cocoa . mm <nl> ppp b / atom / browser / ui / tray_icon_cocoa . mm <nl> - ( BOOL ) shouldHighlight { <nl> [ status_item_view_ setHighlight : highlight ] ; <nl> } <nl> <nl> - void TrayIconCocoa : : PopContextMenu ( ) { <nl> + void TrayIconCocoa : : PopContextMenu ( const gfx : : Point & pos ) { <nl> [ status_item_view_ popContextMenu ] ; <nl> } <nl> <nl>

Fix OS X build error .

electron/electron

736fe0c1db8c2fb5502eb1a6bb5d3cca9c63f750

2015-07-16T03:43:42Z

mmm a / tensorflow / core / profiler / utils / group_events . cc <nl> ppp b / tensorflow / core / profiler / utils / group_events . cc <nl> std : : string EventNode : : GetGroupName ( ) const { <nl> return name ; <nl> } <nl> <nl> + XStat * EventNode : : FindOrAddStatByType ( int64 stat_type ) { <nl> + const XStatMetadata * stat_metadata = plane_ - > GetStatMetadataByType ( stat_type ) ; <nl> + DCHECK ( stat_metadata ! = nullptr ) ; <nl> + return FindOrAddMutableStat ( * stat_metadata , raw_event_ ) ; <nl> + } <nl> + <nl> void EventNode : : SetGroupId ( int64 group_id ) { <nl> group_id_ = group_id ; <nl> - FindOrAddMutableStat ( * plane_ - > GetStatMetadataId ( StatType : : kGroupId ) , <nl> - raw_event_ ) <nl> - - > set_int64_value ( group_id ) ; <nl> + FindOrAddStatByType ( StatType : : kGroupId ) - > set_int64_value ( group_id ) ; <nl> } <nl> <nl> void EventNode : : PropagateGroupId ( int64 group_id , <nl> void EventNode : : PropagateGroupId ( int64 group_id , <nl> } <nl> <nl> void EventNode : : AddStepName ( absl : : string_view step_name ) { <nl> - FindOrAddMutableStat ( * plane_ - > GetStatMetadataId ( StatType : : kStepName ) , <nl> - raw_event_ ) <nl> + FindOrAddStatByType ( StatType : : kStepName ) <nl> - > set_str_value ( step_name . data ( ) , step_name . size ( ) ) ; <nl> } <nl> <nl> void EventNode : : AddSelectedGroupIds ( <nl> group_metadata . parents . end ( ) ) ; <nl> group_ids . insert ( group_ids . end ( ) , group_metadata . children . begin ( ) , <nl> group_metadata . children . end ( ) ) ; <nl> - FindOrAddMutableStat ( * plane_ - > GetStatMetadataId ( StatType : : kSelectedGroupIds ) , <nl> - raw_event_ ) <nl> + FindOrAddStatByType ( StatType : : kSelectedGroupIds ) <nl> - > set_str_value ( <nl> absl : : StrCat ( " ? selected_group_ids = " , absl : : StrJoin ( group_ids , " , " ) ) ) ; <nl> } <nl> <nl> void EventNode : : SetIsEager ( bool is_eager ) { <nl> - FindOrAddMutableStat ( * plane_ - > GetStatMetadataId ( StatType : : kIsEager ) , <nl> - raw_event_ ) <nl> - - > set_int64_value ( is_eager ? 1 : 0 ) ; <nl> + FindOrAddStatByType ( StatType : : kIsEager ) - > set_int64_value ( is_eager ? 1 : 0 ) ; <nl> } <nl> <nl> bool EventNode : : IsEager ( ) { <nl> mmm a / tensorflow / core / profiler / utils / group_events . h <nl> ppp b / tensorflow / core / profiler / utils / group_events . h <nl> class EventNode { <nl> bool StartsBefore ( const EventNode & other ) const ; <nl> <nl> private : <nl> + XStat * FindOrAddStatByType ( int64 stat_type ) ; <nl> + <nl> const XPlaneVisitor * plane_ ; <nl> XEventVisitor visitor_ ; <nl> XLine * raw_line_ ; <nl> mmm a / tensorflow / core / profiler / utils / group_events_test . cc <nl> ppp b / tensorflow / core / profiler / utils / group_events_test . cc <nl> TEST ( GroupEventsTest , GroupGpuTraceLegacyRootTest ) { <nl> XPlaneVisitor device_plane_visitor = CreateTfXPlaneVisitor ( device_plane ) ; <nl> EXPECT_EQ ( device_plane - > lines ( 0 ) . events ( 0 ) . stats_size ( ) , 3 ) ; <nl> EXPECT_EQ ( device_plane_visitor . GetStatType ( <nl> - device_plane - > lines ( 0 ) . events ( 0 ) . stats ( 1 ) ) , <nl> + device_plane - > lines ( 0 ) . events ( 0 ) . stats ( 1 ) . metadata_id ( ) ) , <nl> StatType : : kGroupId ) ; <nl> EXPECT_EQ ( group_metadata_map . size ( ) , 1 ) ; <nl> EXPECT_EQ ( group_metadata_map . at ( 0 ) . name , " train 123 " ) ; <nl> TEST ( GroupEventsTest , GroupGpuTraceTest ) { <nl> XPlaneVisitor device_plane_visitor = CreateTfXPlaneVisitor ( device_plane ) ; <nl> EXPECT_EQ ( device_plane - > lines ( 0 ) . events ( 0 ) . stats_size ( ) , 3 ) ; <nl> EXPECT_EQ ( device_plane_visitor . GetStatType ( <nl> - device_plane - > lines ( 0 ) . events ( 0 ) . stats ( 1 ) ) , <nl> + device_plane - > lines ( 0 ) . events ( 0 ) . stats ( 1 ) . metadata_id ( ) ) , <nl> StatType : : kGroupId ) ; <nl> EXPECT_EQ ( group_metadata_map . size ( ) , 1 ) ; <nl> EXPECT_EQ ( group_metadata_map . at ( 0 ) . name , " train 123 " ) ; <nl> TEST ( GroupEventsTest , GroupTensorFlowLoopTest ) { <nl> XPlaneVisitor device_plane_visitor = CreateTfXPlaneVisitor ( device_plane ) ; <nl> EXPECT_EQ ( device_plane - > lines ( 0 ) . events ( 0 ) . stats_size ( ) , 3 ) ; <nl> EXPECT_EQ ( device_plane_visitor . GetStatType ( <nl> - device_plane - > lines ( 0 ) . events ( 0 ) . stats ( 1 ) ) , <nl> + device_plane - > lines ( 0 ) . events ( 0 ) . stats ( 1 ) . metadata_id ( ) ) , <nl> StatType : : kGroupId ) ; <nl> EXPECT_EQ ( device_plane - > lines ( 0 ) . events ( 0 ) . stats ( 1 ) . int64_value ( ) , 10 ) ; <nl> EXPECT_EQ ( group_metadata_map . size ( ) , 1 ) ; <nl> TEST ( GroupEventsTest , EagerOpTest ) { <nl> XPlaneVisitor host_plane_visitor = CreateTfXPlaneVisitor ( host_plane ) ; <nl> const XEvent & eager_cpu_tf_op = host_plane - > lines ( 0 ) . events ( 3 ) ; <nl> EXPECT_EQ ( eager_cpu_tf_op . stats_size ( ) , 1 ) ; <nl> - EXPECT_EQ ( host_plane_visitor . GetStatType ( eager_cpu_tf_op . stats ( 0 ) ) , <nl> - StatType : : kIsEager ) ; <nl> + EXPECT_EQ ( <nl> + host_plane_visitor . GetStatType ( eager_cpu_tf_op . stats ( 0 ) . metadata_id ( ) ) , <nl> + StatType : : kIsEager ) ; <nl> EXPECT_EQ ( eager_cpu_tf_op . stats ( 0 ) . int64_value ( ) , 1 ) ; <nl> XPlaneVisitor device_plane_visitor = CreateTfXPlaneVisitor ( device_plane ) ; <nl> const XEvent & eager_gpu_kernel = device_plane - > lines ( 0 ) . events ( 0 ) ; <nl> EXPECT_EQ ( eager_gpu_kernel . stats_size ( ) , 2 ) ; <nl> - EXPECT_EQ ( device_plane_visitor . GetStatType ( eager_gpu_kernel . stats ( 1 ) ) , <nl> - StatType : : kIsEager ) ; <nl> + EXPECT_EQ ( <nl> + device_plane_visitor . GetStatType ( eager_gpu_kernel . stats ( 1 ) . metadata_id ( ) ) , <nl> + StatType : : kIsEager ) ; <nl> EXPECT_EQ ( eager_gpu_kernel . stats ( 1 ) . int64_value ( ) , 1 ) ; <nl> } <nl> <nl> TEST ( GroupEventsTest , FunctionOpTest ) { <nl> XPlaneVisitor host_plane_visitor = CreateTfXPlaneVisitor ( host_plane ) ; <nl> const XEvent & cpu_tf_op = host_plane - > lines ( 1 ) . events ( 2 ) ; <nl> EXPECT_EQ ( cpu_tf_op . stats_size ( ) , 2 ) ; <nl> - EXPECT_EQ ( host_plane_visitor . GetStatType ( cpu_tf_op . stats ( 1 ) ) , <nl> + EXPECT_EQ ( host_plane_visitor . GetStatType ( cpu_tf_op . stats ( 1 ) . metadata_id ( ) ) , <nl> StatType : : kIsEager ) ; <nl> EXPECT_EQ ( cpu_tf_op . stats ( 1 ) . int64_value ( ) , 0 ) ; <nl> XPlaneVisitor device_plane_visitor = CreateTfXPlaneVisitor ( device_plane ) ; <nl> const XEvent & gpu_kernel = device_plane - > lines ( 0 ) . events ( 0 ) ; <nl> EXPECT_EQ ( gpu_kernel . stats_size ( ) , 3 ) ; <nl> - EXPECT_EQ ( device_plane_visitor . GetStatType ( gpu_kernel . stats ( 2 ) ) , <nl> + EXPECT_EQ ( device_plane_visitor . GetStatType ( gpu_kernel . stats ( 2 ) . metadata_id ( ) ) , <nl> StatType : : kIsEager ) ; <nl> EXPECT_EQ ( gpu_kernel . stats ( 2 ) . int64_value ( ) , 0 ) ; <nl> } <nl> mmm a / tensorflow / core / profiler / utils / xplane_utils . cc <nl> ppp b / tensorflow / core / profiler / utils / xplane_utils . cc <nl> bool IsNested ( const XEvent & event , const XEvent & parent ) { <nl> return XEventTimespan ( parent ) . Includes ( XEventTimespan ( event ) ) ; <nl> } <nl> <nl> - XStat * FindOrAddMutableStat ( int64 metadata_id , XEvent * event ) { <nl> + XStat * FindOrAddMutableStat ( const XStatMetadata & stat_metadata , XEvent * event ) { <nl> for ( auto & stat : * event - > mutable_stats ( ) ) { <nl> - if ( stat . metadata_id ( ) = = metadata_id ) { <nl> + if ( stat . metadata_id ( ) = = stat_metadata . id ( ) ) { <nl> return & stat ; <nl> } <nl> } <nl> XStat * stat = event - > add_stats ( ) ; <nl> - stat - > set_metadata_id ( metadata_id ) ; <nl> + stat - > set_metadata_id ( stat_metadata . id ( ) ) ; <nl> return stat ; <nl> } <nl> <nl> mmm a / tensorflow / core / profiler / utils / xplane_utils . h <nl> ppp b / tensorflow / core / profiler / utils / xplane_utils . h <nl> std : : vector < XPlane * > FindMutablePlanesWithPrefix ( XSpace * space , <nl> bool IsNested ( const tensorflow : : profiler : : XEvent & event , <nl> const tensorflow : : profiler : : XEvent & parent ) ; <nl> <nl> - XStat * FindOrAddMutableStat ( int64 metadata_id , XEvent * event ) ; <nl> + XStat * FindOrAddMutableStat ( const XStatMetadata & stat_metadata , XEvent * event ) ; <nl> <nl> void RemovePlane ( XSpace * space , const XPlane * plane ) ; <nl> <nl> mmm a / tensorflow / core / profiler / utils / xplane_visitor . cc <nl> ppp b / tensorflow / core / profiler / utils / xplane_visitor . cc <nl> namespace tensorflow { <nl> namespace profiler { <nl> <nl> XStatVisitor : : XStatVisitor ( const XPlaneVisitor * plane , const XStat * stat ) <nl> - : stat_ ( stat ) , <nl> - metadata_ ( plane - > GetStatMetadata ( stat - > metadata_id ( ) ) ) , <nl> - plane_ ( plane ) , <nl> - type_ ( plane - > GetStatType ( stat - > metadata_id ( ) ) ) { } <nl> + : XStatVisitor ( plane , stat , plane - > GetStatMetadata ( stat - > metadata_id ( ) ) , <nl> + plane - > GetStatType ( stat - > metadata_id ( ) ) ) { } <nl> + <nl> + XStatVisitor : : XStatVisitor ( const XPlaneVisitor * plane , const XStat * stat , <nl> + const XStatMetadata * metadata , <nl> + absl : : optional < int64 > type ) <nl> + : stat_ ( stat ) , metadata_ ( metadata ) , plane_ ( plane ) , type_ ( type ) { } <nl> <nl> std : : string XStatVisitor : : ToString ( ) const { <nl> switch ( stat_ - > value_case ( ) ) { <nl> void XPlaneVisitor : : BuildEventTypeMap ( <nl> for ( const auto & event_type_getter : event_type_getter_list ) { <nl> absl : : optional < int64 > event_type = event_type_getter ( metadata . name ( ) ) ; <nl> if ( event_type . has_value ( ) ) { <nl> - auto result = event_metadata_id_map_ . emplace ( metadata_id , * event_type ) ; <nl> + auto result = event_type_by_id_ . emplace ( metadata_id , * event_type ) ; <nl> DCHECK ( result . second ) ; / / inserted <nl> - event_type_map_ . emplace ( * event_type , & metadata ) ; <nl> break ; <nl> } <nl> } <nl> } <nl> } <nl> <nl> + const XEventMetadata * XPlaneVisitor : : GetEventMetadata ( <nl> + int64 event_metadata_id ) const { <nl> + const auto & event_metadata_by_id = plane_ - > event_metadata ( ) ; <nl> + const auto it = event_metadata_by_id . find ( event_metadata_id ) ; <nl> + if ( it ! = event_metadata_by_id . end ( ) ) return & it - > second ; <nl> + return & XEventMetadata : : default_instance ( ) ; <nl> + } <nl> + <nl> + absl : : optional < int64 > XPlaneVisitor : : GetEventType ( <nl> + int64 event_metadata_id ) const { <nl> + const auto it = event_type_by_id_ . find ( event_metadata_id ) ; <nl> + if ( it ! = event_type_by_id_ . end ( ) ) return it - > second ; <nl> + return absl : : nullopt ; <nl> + } <nl> + <nl> void XPlaneVisitor : : BuildStatTypeMap ( <nl> const XPlane * plane , const TypeGetterList & stat_type_getter_list ) { <nl> for ( const auto & stat_metadata : plane - > stat_metadata ( ) ) { <nl> void XPlaneVisitor : : BuildStatTypeMap ( <nl> for ( const auto & stat_type_getter : stat_type_getter_list ) { <nl> absl : : optional < int64 > stat_type = stat_type_getter ( metadata . name ( ) ) ; <nl> if ( stat_type . has_value ( ) ) { <nl> - auto result = stat_metadata_id_map_ . emplace ( metadata_id , * stat_type ) ; <nl> + auto result = stat_type_by_id_ . emplace ( metadata_id , * stat_type ) ; <nl> DCHECK ( result . second ) ; / / inserted <nl> - stat_type_map_ . emplace ( * stat_type , & metadata ) ; <nl> + stat_metadata_by_type_ . emplace ( * stat_type , & metadata ) ; <nl> break ; <nl> } <nl> } <nl> void XPlaneVisitor : : BuildStatTypeMap ( <nl> <nl> const XStatMetadata * XPlaneVisitor : : GetStatMetadata ( <nl> int64 stat_metadata_id ) const { <nl> - const auto & stat_metadata_map = plane_ - > stat_metadata ( ) ; <nl> - const auto it = stat_metadata_map . find ( stat_metadata_id ) ; <nl> - if ( it ! = stat_metadata_map . end ( ) ) return & it - > second ; <nl> + const auto & stat_metadata_by_id = plane_ - > stat_metadata ( ) ; <nl> + const auto it = stat_metadata_by_id . find ( stat_metadata_id ) ; <nl> + if ( it ! = stat_metadata_by_id . end ( ) ) return & it - > second ; <nl> return & XStatMetadata : : default_instance ( ) ; <nl> } <nl> <nl> absl : : optional < int64 > XPlaneVisitor : : GetStatType ( int64 stat_metadata_id ) const { <nl> - const auto it = stat_metadata_id_map_ . find ( stat_metadata_id ) ; <nl> - if ( it ! = stat_metadata_id_map_ . end ( ) ) return it - > second ; <nl> + const auto it = stat_type_by_id_ . find ( stat_metadata_id ) ; <nl> + if ( it ! = stat_type_by_id_ . end ( ) ) return it - > second ; <nl> return absl : : nullopt ; <nl> } <nl> <nl> - absl : : optional < int64 > XPlaneVisitor : : GetStatMetadataId ( int64 stat_type ) const { <nl> - const auto it = stat_type_map_ . find ( stat_type ) ; <nl> - if ( it ! = stat_type_map_ . end ( ) ) return it - > second - > id ( ) ; <nl> - return absl : : nullopt ; <nl> - } <nl> - <nl> - const XEventMetadata * XPlaneVisitor : : GetEventMetadata ( <nl> - int64 event_metadata_id ) const { <nl> - const auto & event_metadata_map = plane_ - > event_metadata ( ) ; <nl> - const auto it = event_metadata_map . find ( event_metadata_id ) ; <nl> - if ( it ! = event_metadata_map . end ( ) ) return & it - > second ; <nl> - return & XEventMetadata : : default_instance ( ) ; <nl> - } <nl> - <nl> - absl : : optional < int64 > XPlaneVisitor : : GetEventType ( <nl> - int64 event_metadata_id ) const { <nl> - const auto it = event_metadata_id_map_ . find ( event_metadata_id ) ; <nl> - if ( it ! = event_metadata_id_map_ . end ( ) ) return it - > second ; <nl> - return absl : : nullopt ; <nl> + const XStatMetadata * XPlaneVisitor : : GetStatMetadataByType ( <nl> + int64 stat_type ) const { <nl> + const auto it = stat_metadata_by_type_ . find ( stat_type ) ; <nl> + if ( it ! = stat_metadata_by_type_ . end ( ) ) return it - > second ; <nl> + return nullptr ; <nl> } <nl> <nl> } / / namespace profiler <nl> mmm a / tensorflow / core / profiler / utils / xplane_visitor . h <nl> ppp b / tensorflow / core / profiler / utils / xplane_visitor . h <nl> class XStatVisitor { <nl> / / REQUIRED : plane and stat cannot be nullptr . <nl> XStatVisitor ( const XPlaneVisitor * plane , const XStat * stat ) ; <nl> <nl> + / / REQUIRED : plane , stat and metadata cannot be nullptr . <nl> + XStatVisitor ( const XPlaneVisitor * plane , const XStat * stat , <nl> + const XStatMetadata * metadata , absl : : optional < int64 > type ) ; <nl> + <nl> int64 Id ( ) const { return stat_ - > metadata_id ( ) ; } <nl> <nl> absl : : string_view Name ( ) const { return metadata_ - > name ( ) ; } <nl> class XPlaneVisitor : public XStatsOwner < XPlane > { <nl> } <nl> } <nl> <nl> - / / TODO ( jiesun ) : use single map look up for both StatMetadata and StatType . <nl> - const XStatMetadata * GetStatMetadata ( int64 stat_metadata_id ) const ; <nl> - absl : : optional < int64 > GetStatType ( int64 stat_metadata_id ) const ; <nl> - absl : : optional < int64 > GetStatType ( const XStat & stat ) const { <nl> - return GetStatType ( stat . metadata_id ( ) ) ; <nl> - } <nl> - absl : : optional < int64 > GetStatMetadataId ( int64 stat_type ) const ; <nl> + / / Returns event metadata given its id . Returns a default value if not found . <nl> const XEventMetadata * GetEventMetadata ( int64 event_metadata_id ) const ; <nl> + <nl> + / / Returns the type of an event given its id . <nl> absl : : optional < int64 > GetEventType ( int64 event_metadata_id ) const ; <nl> - absl : : optional < int64 > GetEventType ( const XEvent & event ) const { <nl> - return GetEventType ( event . metadata_id ( ) ) ; <nl> - } <nl> + <nl> + / / Returns stat metadata given its id . Returns a default value if not found . <nl> + const XStatMetadata * GetStatMetadata ( int64 stat_metadata_id ) const ; <nl> + <nl> + / / Returns stat metadata given its type . Returns nullptr if not found . <nl> + / / Use as an alternative to GetStatMetadata above . <nl> + const XStatMetadata * GetStatMetadataByType ( int64 stat_type ) const ; <nl> + <nl> + / / Returns the type of an stat given its id . <nl> + absl : : optional < int64 > GetStatType ( int64 stat_metadata_id ) const ; <nl> <nl> private : <nl> void BuildEventTypeMap ( const XPlane * plane , <nl> class XPlaneVisitor : public XStatsOwner < XPlane > { <nl> <nl> const XPlane * plane_ ; <nl> <nl> - absl : : flat_hash_map < int64 / * metadata_id * / , int64 / * StatType * / > <nl> - stat_metadata_id_map_ ; <nl> - absl : : flat_hash_map < int64 / * StatType * / , const XStatMetadata * > stat_type_map_ ; <nl> absl : : flat_hash_map < int64 / * metadata_id * / , int64 / * EventType * / > <nl> - event_metadata_id_map_ ; <nl> - absl : : flat_hash_map < int64 / * EventType * / , const XEventMetadata * > <nl> - event_type_map_ ; <nl> + event_type_by_id_ ; <nl> + absl : : flat_hash_map < int64 / * metadata_id * / , int64 / * StatType * / > <nl> + stat_type_by_id_ ; <nl> + absl : : flat_hash_map < int64 / * StatType * / , const XStatMetadata * > <nl> + stat_metadata_by_type_ ; <nl> } ; <nl> <nl> template < class T > <nl> absl : : optional < XStatVisitor > XStatsOwner < T > : : GetStat ( int64 stat_type ) const { <nl> - if ( absl : : optional < int64 > stat_metadata_id = <nl> - metadata_ - > GetStatMetadataId ( stat_type ) ) { <nl> + const auto * stat_metadata = metadata_ - > GetStatMetadataByType ( stat_type ) ; <nl> + if ( stat_metadata ! = nullptr ) { <nl> for ( const XStat & stat : stats_owner_ - > stats ( ) ) { <nl> - if ( stat . metadata_id ( ) = = * stat_metadata_id ) { <nl> - return XStatVisitor ( metadata_ , & stat ) ; <nl> + if ( stat . metadata_id ( ) = = stat_metadata - > id ( ) ) { <nl> + return XStatVisitor ( metadata_ , & stat , stat_metadata , stat_type ) ; <nl> } <nl> } <nl> } <nl>

Add GetStatMetadataByType to XPlaneVisitor

tensorflow/tensorflow

9def0ed7a4dc9c40d63424ed69baa2f54af1ff50

2020-11-10T01:21:04Z

mmm a / bench / formatter - bench . cpp <nl> ppp b / bench / formatter - bench . cpp <nl> void bench_formatter ( benchmark : : State & state , std : : string pattern ) <nl> void bench_formatters ( ) <nl> { <nl> / / basic patterns ( single flag ) <nl> - std : : string all_flags = " + vtPnlLaAbBcCYDmdHIMSefFprRTXzEisg @ l % " ; <nl> + std : : string all_flags = " + vtPnlLaAbBcCYDmdHIMSefFprRTXzEisg @ luioO % " ; <nl> std : : vector < std : : string > basic_patterns ; <nl> for ( auto & flag : all_flags ) <nl> { <nl>

Updated formatter bench

gabime/spdlog

1ac46bacfe5bf1fb2bd0f8b05a7f94cef0264d6e

2019-07-09T22:41:55Z

mmm a / validation - test / compiler_crashers / 28555 - unreachable - executed - at - swift - lib - ast - type - cpp - 1318 . swift <nl> ppp b / validation - test / compiler_crashers / 28555 - unreachable - executed - at - swift - lib - ast - type - cpp - 1318 . swift <nl> <nl> / / See https : / / swift . org / CONTRIBUTORS . txt for the list of Swift project authors <nl> <nl> / / FIXME : Disabled . This test does not always crash , which confuses CI . <nl> - / / REQUIRES : y - u - not - crash - always <nl> + / / REQUIRES : deterministic - behavior <nl> <nl> / / REQUIRES : OS = linux - gnu <nl> / / RUN : not - - crash % target - swift - frontend % s - emit - ir <nl> similarity index 80 % <nl> rename from validation - test / compiler_crashers / 28475 - swift - typechecker - validatedecl - swift - valuedecl - bool . swift <nl> rename to validation - test / compiler_crashers_fixed / 28475 - swift - typechecker - validatedecl - swift - valuedecl - bool . swift <nl> mmm a / validation - test / compiler_crashers / 28475 - swift - typechecker - validatedecl - swift - valuedecl - bool . swift <nl> ppp b / validation - test / compiler_crashers_fixed / 28475 - swift - typechecker - validatedecl - swift - valuedecl - bool . swift <nl> <nl> / / See https : / / swift . org / LICENSE . txt for license information <nl> / / See https : / / swift . org / CONTRIBUTORS . txt for the list of Swift project authors <nl> <nl> - / / REQUIRES : deterministic - behavior <nl> / / rdar : / / problem / 29145783 - The compiler is periodically hanging on this test . <nl> - / / REQUIRES : rdar29145783 <nl> <nl> - / / RUN : not - - crash % target - swift - frontend % s - emit - ir <nl> + / / RUN : not % target - swift - frontend % s - emit - ir <nl> protocol P { func c ( array : A . c <nl> class A : P <nl> similarity index 87 % <nl> rename from validation - test / compiler_crashers / 28493 - resolveidenttypecomponent - swift - typechecker - swift - declcontext - llvm - arrayref - swif . swift <nl> rename to validation - test / compiler_crashers_fixed / 28493 - resolveidenttypecomponent - swift - typechecker - swift - declcontext - llvm - arrayref - swif . swift <nl> mmm a / validation - test / compiler_crashers / 28493 - resolveidenttypecomponent - swift - typechecker - swift - declcontext - llvm - arrayref - swif . swift <nl> ppp b / validation - test / compiler_crashers_fixed / 28493 - resolveidenttypecomponent - swift - typechecker - swift - declcontext - llvm - arrayref - swif . swift <nl> <nl> / / See https : / / swift . org / LICENSE . txt for license information <nl> / / See https : / / swift . org / CONTRIBUTORS . txt for the list of Swift project authors <nl> <nl> - / / REQUIRES : deterministic - behavior <nl> - / / RUN : not - - crash % target - swift - frontend % s - emit - ir <nl> + / / RUN : not % target - swift - frontend % s - emit - ir <nl> class c : A <nl> let a <nl> { <nl>

Merge pull request from practicalswift / mark - as - fixed

apple/swift

dfed0507944d488eb0a985beb5e3d8cbbe7c9022

2017-01-04T03:14:52Z

mmm a / main . cpp <nl> ppp b / main . cpp <nl> int main ( int argc , char * * argv ) { <nl> model = new Model ( " obj / african_head . obj " ) ; <nl> } <nl> <nl> - Matrix ModelView = lookat ( eye , center , Vec3f ( 0 , 1 , 0 ) ) ; <nl> - Matrix ViewPort = viewport ( width / 8 , height / 8 , width * 3 / 4 , height * 3 / 4 ) ; <nl> - Matrix Projection = Matrix : : identity ( 4 ) ; <nl> - Projection [ 3 ] [ 2 ] = - 1 . f / ( eye - center ) . norm ( ) ; <nl> - Matrix MVPVP = ViewPort * Projection * ModelView ; <nl> + lookat ( eye , center , Vec3f ( 0 , 1 , 0 ) ) ; <nl> + viewport ( width / 8 , height / 8 , width * 3 / 4 , height * 3 / 4 ) ; <nl> + projection ( - 1 . f / ( eye - center ) . norm ( ) ) ; <nl> <nl> TGAImage image ( width , height , TGAImage : : RGB ) ; <nl> Shader shader ; <nl> int main ( int argc , char * * argv ) { <nl> Vec3f world_coords [ 3 ] ; <nl> for ( int j = 0 ; j < 3 ; j + + ) { <nl> Vec3f v = model - > vert ( face [ j ] ) ; <nl> - screen_coords [ j ] = Vec3f ( ViewPort * Projection * ModelView * Matrix ( v ) ) ; <nl> + screen_coords [ j ] = Vec3f ( Viewport * Projection * ModelView * Matrix ( v ) ) ; <nl> world_coords [ j ] = v ; <nl> shader . varying_inty [ j ] = model - > norm ( i , j ) * light_dir ; <nl> shader . varying_uv [ j ] = model - > uv ( i , j ) ; <nl> } <nl> - / / triangle ( screen_coords [ 0 ] , screen_coords [ 1 ] , screen_coords [ 2 ] , intensity [ 0 ] , intensity [ 1 ] , intensity [ 2 ] , image , zbuffer ) ; <nl> triangle ( screen_coords , shader , image , zbuffer ) ; <nl> } <nl> - image . flip_vertically ( ) ; / / i want to have the origin at the left bottom corner of the image <nl> + image . flip_vertically ( ) ; <nl> image . write_tga_file ( " output . tga " ) ; <nl> <nl> - zbuffer . flip_vertically ( ) ; / / i want to have the origin at the left bottom corner of the image <nl> + zbuffer . flip_vertically ( ) ; <nl> zbuffer . write_tga_file ( " zbuffer . tga " ) ; <nl> delete model ; <nl> return 0 ; <nl>

refactoring

ssloy/tinyrenderer

b04fb2c1636b4198b6cfef40680436dd3b8d012f

2015-01-25T19:13:15Z

mmm a / Tests / UnitTests / EvalTests / stdafx . h <nl> ppp b / Tests / UnitTests / EvalTests / stdafx . h <nl> <nl> # define _SCL_SECURE_NO_WARNINGS / / current API of matrix does not allow safe invokations . TODO : change api to proper one . <nl> <nl> # ifdef _WIN32 <nl> - # include " targetver . h " <nl> + # include " targetver . h " <nl> # endif <nl> <nl> # include < stdio . h > <nl> <nl> # include " Eval . h " <nl> <nl> / / Adding required boost header <nl> - # ifndef _WIN32 <nl> - / / Use dynamic library on Linux <nl> - # define BOOST_TEST_DYN_LINK <nl> - # endif <nl> # include < boost / test / unit_test . hpp > <nl> # include < boost / format . hpp > <nl>

Revert " Use dynamic library on Linux "

microsoft/CNTK

d2b752847433687563cb8023a4410ee3f382a971

2016-07-01T12:18:56Z

mmm a / osquery / sql / virtual_table . cpp <nl> ppp b / osquery / sql / virtual_table . cpp <nl> static int xBestIndex ( sqlite3_vtab * tab , sqlite3_index_info * pIdxInfo ) { <nl> constraints . push_back ( <nl> std : : make_pair ( name , Constraint ( constraint_info . op ) ) ) ; <nl> pIdxInfo - > aConstraintUsage [ i ] . argvIndex = + + expr_index ; <nl> - pIdxInfo - > estimatedRows + + ; <nl> # if defined ( DEBUG ) <nl> plan ( " Adding constraint for table : " + pVtab - > content - > name + <nl> " [ column = " + name + " arg_index = " + std : : to_string ( expr_index ) + <nl> mmm a / osquery / tables / system / tests / system_tables_tests . cpp <nl> ppp b / osquery / tables / system / tests / system_tables_tests . cpp <nl> TEST_F ( SystemsTablesTests , test_processes ) { <nl> results = SQL ( " select pid , name from processes where pid = - 1 " ) ; <nl> EXPECT_EQ ( results . rows ( ) . size ( ) , 0U ) ; <nl> } <nl> + <nl> + TEST_F ( SystemsTablesTests , test_abstract_joins ) { <nl> + / / Codify several assumptions about how tables should be joined into tests . <nl> + / / The first is an implicit inner join from processes to file information . <nl> + auto results = SQL ( <nl> + " select * from ( select pid , path from processes where path < > ' ' limit " <nl> + " 1 ) p join file using ( path ) ; " ) ; <nl> + ASSERT_EQ ( results . rows ( ) . size ( ) , 1U ) ; <nl> + <nl> + / / The same holds for an explicit left join . <nl> + results = SQL ( <nl> + " select * from ( select pid , path from processes where path < > ' ' limit " <nl> + " 1 ) p left join file using ( path ) ; " ) ; <nl> + ASSERT_EQ ( results . rows ( ) . size ( ) , 1U ) ; <nl> + <nl> + / / A secondary inner join against hash . <nl> + results = SQL ( <nl> + " select * from ( select pid , path from processes where path < > ' ' limit " <nl> + " 1 ) p join file using ( path ) join hash using ( path ) ; " ) ; <nl> + ASSERT_EQ ( results . rows ( ) . size ( ) , 1U ) ; <nl> + <nl> + results = SQL ( <nl> + " select * from ( select pid , path from processes where path < > ' ' limit " <nl> + " 1 ) p left join file using ( path ) left join hash using ( path ) ; " ) ; <nl> + ASSERT_EQ ( results . rows ( ) . size ( ) , 1U ) ; <nl> + <nl> + / / Check that a nested subselect on the same virtual table can perform and <nl> + / / inner join on a LIKE operand . It would be awesome if the base join against <nl> + / / hash did not need an explicit left join . <nl> + results = SQL ( <nl> + " select * from ( select file . * from ( select * from file where directory = " <nl> + " ' / etc ' and type = ' directory ' and mode = ' 0755 ' ) f join file on " <nl> + " file . path LIKE f . path | | ' / % ' where file . type = ' regular ' ) left join " <nl> + " hash using ( path ) ; " ) ; <nl> + ASSERT_GT ( results . rows ( ) . size ( ) , 0U ) ; <nl> + } <nl> } <nl> } <nl>

Add high level join tests for processes , file , and hash

osquery/osquery

ee1182f5261625a9fe46f21bbc26f7e51072faaa

2016-03-04T02:47:55Z

mmm a / swoole_coroutine . cc <nl> ppp b / swoole_coroutine . cc <nl> void PHPCoroutine : : main_func ( void * arg ) <nl> } <nl> <nl> / / resources release <nl> - zval_ptr_dtor ( retval ) ; <nl> - if ( fci_cache . object ) <nl> + if ( task - > context ) <nl> { <nl> - OBJ_RELEASE ( fci_cache . object ) ; <nl> + zend_object * context = task - > context ; <nl> + task - > context = ( zend_object * ) ~ 0 ; <nl> + OBJ_RELEASE ( context ) ; <nl> } <nl> - if ( task - > context ) <nl> + if ( fci_cache . object ) <nl> { <nl> - OBJ_RELEASE ( task - > context ) ; <nl> + OBJ_RELEASE ( fci_cache . object ) ; <nl> } <nl> + zval_ptr_dtor ( retval ) ; <nl> <nl> / / TODO : exceptions will only cause the coroutine to exit <nl> if ( UNEXPECTED ( EG ( exception ) ) ) <nl> PHP_METHOD ( swoole_coroutine , getContext ) <nl> { <nl> RETURN_NULL ( ) ; <nl> } <nl> + if ( UNEXPECTED ( task - > context = = ( zend_object * ) ~ 0 ) ) <nl> + { <nl> + / * bad context ( has been destroyed ) , see : https : / / github . com / swoole / swoole - src / issues / 2991 * / <nl> + php_swoole_fatal_error ( E_WARNING , " Context of this coroutine has been destroyed " ) ; <nl> + RETURN_NULL ( ) ; <nl> + } <nl> if ( UNEXPECTED ( ! task - > context ) ) <nl> { <nl> object_init_ex ( return_value , swoole_coroutine_context_ce ) ; <nl>

Fix

swoole/swoole-src

3023bcda39f4f2f6e4241e29f61bb907f9519240

2019-12-02T08:42:08Z

mmm a / tensorflow / g3doc / api_docs / python / contrib . learn . md <nl> ppp b / tensorflow / g3doc / api_docs / python / contrib . learn . md <nl> component of a nested object . <nl> <nl> Linear classifier model . <nl> <nl> - Example : <nl> - ` ` ` <nl> - installed_app_id = sparse_column_with_hash_bucket ( " installed_id " , 1e6 ) <nl> - impression_app_id = sparse_column_with_hash_bucket ( " impression_id " , 1e6 ) <nl> - <nl> - installed_x_impression = crossed_column ( <nl> - [ installed_app_id , impression_app_id ] ) <nl> - <nl> - # Estimator using the default optimizer . <nl> - estimator = LinearClassifier ( <nl> - feature_columns = [ impression_app_id , installed_x_impression ] ) <nl> - <nl> - # Or estimator using the FTRL optimizer with regularization . <nl> - estimator = LinearClassifier ( <nl> - feature_columns = [ impression_app_id , installed_x_impression ] , <nl> - optimizer = tf . train . FtrlOptimizer ( <nl> - learning_rate = 0 . 1 , <nl> - l1_regularization_strength = 0 . 001 <nl> - ) ) <nl> - <nl> - # Or estimator using the SDCAOptimizer . <nl> - estimator = LinearClassifier ( <nl> - feature_columns = [ impression_app_id , installed_x_impression ] , <nl> - optimizer = tf . contrib . learn . SDCAOptimizer ( <nl> - example_id_column = ' example_id ' , symmetric_l2_regularization = 2 . 0 <nl> - ) ) <nl> - <nl> - # Input builders <nl> - def input_fn_train : # returns x , y <nl> - . . . <nl> - def input_fn_eval : # returns x , y <nl> - . . . <nl> - estimator . fit ( input_fn = input_fn_train ) <nl> - estimator . evaluate ( input_fn = input_fn_eval ) <nl> - estimator . predict ( x = x ) <nl> - ` ` ` <nl> + Train a linear model to classify instances into one of multiple possible <nl> + classes . When number of possible classes is 2 , this is binary classification . <nl> + <nl> + Example : <nl> + ` ` ` python <nl> + installed_app_id = sparse_column_with_hash_bucket ( " installed_id " , 1e6 ) <nl> + impression_app_id = sparse_column_with_hash_bucket ( " impression_id " , 1e6 ) <nl> + <nl> + installed_x_impression = crossed_column ( <nl> + [ installed_app_id , impression_app_id ] ) <nl> + <nl> + # Estimator using the default optimizer . <nl> + estimator = LinearClassifier ( <nl> + feature_columns = [ impression_app_id , installed_x_impression ] ) <nl> + <nl> + # Or estimator using the FTRL optimizer with regularization . <nl> + estimator = LinearClassifier ( <nl> + feature_columns = [ impression_app_id , installed_x_impression ] , <nl> + optimizer = tf . train . FtrlOptimizer ( <nl> + learning_rate = 0 . 1 , <nl> + l1_regularization_strength = 0 . 001 <nl> + ) ) <nl> + <nl> + # Or estimator using the SDCAOptimizer . <nl> + estimator = LinearClassifier ( <nl> + feature_columns = [ impression_app_id , installed_x_impression ] , <nl> + optimizer = tf . contrib . learn . SDCAOptimizer ( <nl> + example_id_column = ' example_id ' , symmetric_l2_regularization = 2 . 0 <nl> + ) ) <nl> + <nl> + # Input builders <nl> + def input_fn_train : # returns x , y , where y is a tensor of dimension 1 <nl> + . . . <nl> + def input_fn_eval : # returns x , y , where y is a tensor of dimension 1 <nl> + . . . <nl> + estimator . fit ( input_fn = input_fn_train ) <nl> + estimator . evaluate ( input_fn = input_fn_eval ) <nl> + estimator . predict ( x = x ) <nl> + ` ` ` <nl> + <nl> + Input of ` fit ` and ` evaluate ` should have following features , <nl> + otherwise there will be a ` KeyError ` : <nl> + if ` weight_column_name ` is not ` None ` , a feature with <nl> + ` key = weight_column_name ` whose value is a ` Tensor ` . <nl> + for each ` column ` in ` feature_columns ` : <nl> + - if ` column ` is a ` SparseColumn ` , a feature with ` key = column . name ` <nl> + whose ` value ` is a ` SparseTensor ` . <nl> + - if ` column ` is a ` RealValuedColumn , a feature with ` key = column . name ` <nl> + whose ` value ` is a ` Tensor ` . <nl> + - if ` feauture_columns ` is ` None ` , then ` input ` must contains only real <nl> + valued ` Tensor ` . <nl> + - - - <nl> <nl> - Input of ` fit ` and ` evaluate ` should have following features , <nl> - otherwise there will be a ` KeyError ` : <nl> - if ` weight_column_name ` is not ` None ` , a feature with <nl> - ` key = weight_column_name ` whose value is a ` Tensor ` . <nl> - for each ` column ` in ` feature_columns ` : <nl> - - if ` column ` is a ` SparseColumn ` , a feature with ` key = column . name ` <nl> - whose ` value ` is a ` SparseTensor ` . <nl> - - if ` column ` is a ` RealValuedColumn , a feature with ` key = column . name ` <nl> - whose ` value ` is a ` Tensor ` . <nl> - - if ` feauture_columns ` is None , then ` input ` must contains only real <nl> - valued ` Tensor ` . <nl> + # # # # ` tf . contrib . learn . LinearClassifier . __init__ ( feature_columns = None , model_dir = None , n_classes = 2 , weight_column_name = None , optimizer = None , gradient_clip_norm = None , config = None ) ` { # LinearClassifier . __init__ } <nl> <nl> + Construct a ` LinearClassifier ` estimator object . <nl> <nl> - Parameters : <nl> - feature_columns : An iterable containing all the feature columns used by the <nl> - model . All items in the set should be instances of classes derived from <nl> - ` FeatureColumn ` . <nl> - model_dir : Directory to save model parameters , graph and etc . <nl> - n_classes : number of target classes . Default is binary classification . <nl> - weight_column_name : A string defining feature column name representing <nl> + # # # # # Args : <nl> + <nl> + <nl> + * < b > ` feature_columns ` < / b > : An iterable containing all the feature columns used by <nl> + the model . All items in the set should be instances of classes derived <nl> + from ` FeatureColumn ` . <nl> + * < b > ` model_dir ` < / b > : Directory to save model parameters , graph and etc . <nl> + * < b > ` n_classes ` < / b > : number of target classes . Default is binary classification . <nl> + * < b > ` weight_column_name ` < / b > : A string defining feature column name representing <nl> weights . It is used to down weight or boost examples during training . It <nl> will be multiplied by the loss of the example . <nl> - optimizer : The optimizer used to train the model . If specified , it should be <nl> - either an instance of ` tf . Optimizer ` or the SDCAOptimizer . If ` None ` , the <nl> - Ftrl optimizer will be used . <nl> - gradient_clip_norm : A float > 0 . If provided , gradients are clipped <nl> - to their global norm with this clipping ratio . See tf . clip_by_global_norm <nl> - for more details . <nl> - config : RunConfig object to configure the runtime settings . <nl> - - - - <nl> - <nl> - # # # # ` tf . contrib . learn . LinearClassifier . __init__ ( feature_columns = None , model_dir = None , n_classes = 2 , weight_column_name = None , optimizer = None , gradient_clip_norm = None , config = None ) ` { # LinearClassifier . __init__ } <nl> + * < b > ` optimizer ` < / b > : The optimizer used to train the model . If specified , it should <nl> + be either an instance of ` tf . Optimizer ` or the SDCAOptimizer . If ` None ` , <nl> + the Ftrl optimizer will be used . <nl> + * < b > ` gradient_clip_norm ` < / b > : A ` float ` > 0 . If provided , gradients are clipped <nl> + to their global norm with this clipping ratio . See <nl> + ` tf . clip_by_global_norm ` for more details . <nl> + * < b > ` config ` < / b > : ` RunConfig ` object to configure the runtime settings . <nl> <nl> + # # # # # Returns : <nl> <nl> + A ` LinearClassifier ` estimator . <nl> <nl> <nl> - - - <nl> component of a nested object . <nl> <nl> Linear regressor model . <nl> <nl> - Example : <nl> - ` ` ` <nl> - installed_app_id = sparse_column_with_hash_bucket ( " installed_id " , 1e6 ) <nl> - impression_app_id = sparse_column_with_hash_bucket ( " impression_id " , 1e6 ) <nl> - <nl> - installed_x_impression = crossed_column ( <nl> - [ installed_app_id , impression_app_id ] ) <nl> - <nl> - estimator = LinearRegressor ( <nl> - feature_columns = [ impression_app_id , installed_x_impression ] ) <nl> - <nl> - # Input builders <nl> - def input_fn_train : # returns x , y <nl> - . . . <nl> - def input_fn_eval : # returns x , y <nl> - . . . <nl> - estimator . fit ( input_fn = input_fn_train ) <nl> - estimator . evaluate ( input_fn = input_fn_eval ) <nl> - estimator . predict ( x = x ) <nl> - ` ` ` <nl> + Train a linear regression model to predict target variable value given <nl> + observation of feature values . <nl> + <nl> + Example : <nl> + ` ` ` python <nl> + installed_app_id = sparse_column_with_hash_bucket ( " installed_id " , 1e6 ) <nl> + impression_app_id = sparse_column_with_hash_bucket ( " impression_id " , 1e6 ) <nl> + <nl> + installed_x_impression = crossed_column ( <nl> + [ installed_app_id , impression_app_id ] ) <nl> + <nl> + estimator = LinearRegressor ( <nl> + feature_columns = [ impression_app_id , installed_x_impression ] ) <nl> + <nl> + # Input builders <nl> + def input_fn_train : # returns x , y , where y is a tensor of dimension 1 <nl> + . . . <nl> + def input_fn_eval : # returns x , y , where y is a tensor of dimension 1 <nl> + . . . <nl> + estimator . fit ( input_fn = input_fn_train ) <nl> + estimator . evaluate ( input_fn = input_fn_eval ) <nl> + estimator . predict ( x = x ) <nl> + ` ` ` <nl> + <nl> + Input of ` fit ` and ` evaluate ` should have following features , <nl> + otherwise there will be a KeyError : <nl> + if ` weight_column_name ` is not ` None ` : <nl> + key = weight_column_name , value = a ` Tensor ` <nl> + for column in ` feature_columns ` : <nl> + - if isinstance ( column , ` SparseColumn ` ) : <nl> + key = column . name , value = a ` SparseTensor ` <nl> + - if isinstance ( column , ` RealValuedColumn ` ) : <nl> + key = column . name , value = a ` Tensor ` <nl> + - if ` feauture_columns ` is ` None ` : <nl> + input must contains only real valued ` Tensor ` . <nl> + - - - <nl> <nl> - Input of ` fit ` and ` evaluate ` should have following features , <nl> - otherwise there will be a KeyError : <nl> - if ` weight_column_name ` is not None : <nl> - key = weight_column_name , value = a ` Tensor ` <nl> - for column in ` feature_columns ` : <nl> - - if isinstance ( column , ` SparseColumn ` ) : <nl> - key = column . name , value = a ` SparseTensor ` <nl> - - if isinstance ( column , ` RealValuedColumn ` ) : <nl> - key = column . name , value = a ` Tensor ` <nl> - - if ` feauture_columns ` is None : <nl> - input must contains only real valued ` Tensor ` . <nl> + # # # # ` tf . contrib . learn . LinearRegressor . __init__ ( feature_columns = None , model_dir = None , n_classes = 2 , weight_column_name = None , optimizer = None , gradient_clip_norm = None , config = None ) ` { # LinearRegressor . __init__ } <nl> <nl> - Parameters : <nl> - feature_columns : An iterable containing all the feature columns used by the <nl> - model . All items in the set should be instances of classes derived from <nl> - ` FeatureColumn ` . <nl> - model_dir : Directory to save model parameters , graph and etc . <nl> - weight_column_name : A string defining feature column name representing <nl> + Construct a ` LinearRegressor ` estimator object . <nl> + <nl> + # # # # # Args : <nl> + <nl> + <nl> + * < b > ` feature_columns ` < / b > : An iterable containing all the feature columns used by <nl> + the model . All items in the set should be instances of classes derived <nl> + from ` FeatureColumn ` . <nl> + * < b > ` model_dir ` < / b > : Directory to save model parameters , graph and etc . <nl> + * < b > ` n_classes ` < / b > : number of target classes . Default is binary classification . <nl> + * < b > ` weight_column_name ` < / b > : A string defining feature column name representing <nl> weights . It is used to down weight or boost examples during training . It <nl> will be multiplied by the loss of the example . <nl> - optimizer : An instance of ` tf . Optimizer ` used to train the model . If ` None ` , <nl> - will use an Ftrl optimizer . <nl> - gradient_clip_norm : A float > 0 . If provided , gradients are clipped <nl> - to their global norm with this clipping ratio . See tf . clip_by_global_norm <nl> - for more details . <nl> - config : RunConfig object to configure the runtime settings . <nl> - - - - <nl> - <nl> - # # # # ` tf . contrib . learn . LinearRegressor . __init__ ( feature_columns = None , model_dir = None , n_classes = 2 , weight_column_name = None , optimizer = None , gradient_clip_norm = None , config = None ) ` { # LinearRegressor . __init__ } <nl> + * < b > ` optimizer ` < / b > : An instance of ` tf . Optimizer ` used to train the model . If <nl> + ` None ` , will use an Ftrl optimizer . <nl> + * < b > ` gradient_clip_norm ` < / b > : A ` float ` > 0 . If provided , gradients are clipped <nl> + to their global norm with this clipping ratio . See <nl> + ` tf . clip_by_global_norm ` for more details . <nl> + * < b > ` config ` < / b > : ` RunConfig ` object to configure the runtime settings . <nl> <nl> + # # # # # Returns : <nl> <nl> + A ` LinearRegressor ` estimator . <nl> <nl> <nl> - - - <nl> mmm a / tensorflow / g3doc / api_docs / python / functions_and_classes / shard0 / tf . contrib . learn . LinearRegressor . md <nl> ppp b / tensorflow / g3doc / api_docs / python / functions_and_classes / shard0 / tf . contrib . learn . LinearRegressor . md <nl> <nl> Linear regressor model . <nl> <nl> - Example : <nl> - ` ` ` <nl> - installed_app_id = sparse_column_with_hash_bucket ( " installed_id " , 1e6 ) <nl> - impression_app_id = sparse_column_with_hash_bucket ( " impression_id " , 1e6 ) <nl> - <nl> - installed_x_impression = crossed_column ( <nl> - [ installed_app_id , impression_app_id ] ) <nl> - <nl> - estimator = LinearRegressor ( <nl> - feature_columns = [ impression_app_id , installed_x_impression ] ) <nl> - <nl> - # Input builders <nl> - def input_fn_train : # returns x , y <nl> - . . . <nl> - def input_fn_eval : # returns x , y <nl> - . . . <nl> - estimator . fit ( input_fn = input_fn_train ) <nl> - estimator . evaluate ( input_fn = input_fn_eval ) <nl> - estimator . predict ( x = x ) <nl> - ` ` ` <nl> - <nl> - Input of ` fit ` and ` evaluate ` should have following features , <nl> - otherwise there will be a KeyError : <nl> - if ` weight_column_name ` is not None : <nl> - key = weight_column_name , value = a ` Tensor ` <nl> - for column in ` feature_columns ` : <nl> - - if isinstance ( column , ` SparseColumn ` ) : <nl> - key = column . name , value = a ` SparseTensor ` <nl> - - if isinstance ( column , ` RealValuedColumn ` ) : <nl> - key = column . name , value = a ` Tensor ` <nl> - - if ` feauture_columns ` is None : <nl> - input must contains only real valued ` Tensor ` . <nl> - <nl> - Parameters : <nl> - feature_columns : An iterable containing all the feature columns used by the <nl> - model . All items in the set should be instances of classes derived from <nl> - ` FeatureColumn ` . <nl> - model_dir : Directory to save model parameters , graph and etc . <nl> - weight_column_name : A string defining feature column name representing <nl> - weights . It is used to down weight or boost examples during training . It <nl> - will be multiplied by the loss of the example . <nl> - optimizer : An instance of ` tf . Optimizer ` used to train the model . If ` None ` , <nl> - will use an Ftrl optimizer . <nl> - gradient_clip_norm : A float > 0 . If provided , gradients are clipped <nl> - to their global norm with this clipping ratio . See tf . clip_by_global_norm <nl> - for more details . <nl> - config : RunConfig object to configure the runtime settings . <nl> + Train a linear regression model to predict target variable value given <nl> + observation of feature values . <nl> + <nl> + Example : <nl> + ` ` ` python <nl> + installed_app_id = sparse_column_with_hash_bucket ( " installed_id " , 1e6 ) <nl> + impression_app_id = sparse_column_with_hash_bucket ( " impression_id " , 1e6 ) <nl> + <nl> + installed_x_impression = crossed_column ( <nl> + [ installed_app_id , impression_app_id ] ) <nl> + <nl> + estimator = LinearRegressor ( <nl> + feature_columns = [ impression_app_id , installed_x_impression ] ) <nl> + <nl> + # Input builders <nl> + def input_fn_train : # returns x , y , where y is a tensor of dimension 1 <nl> + . . . <nl> + def input_fn_eval : # returns x , y , where y is a tensor of dimension 1 <nl> + . . . <nl> + estimator . fit ( input_fn = input_fn_train ) <nl> + estimator . evaluate ( input_fn = input_fn_eval ) <nl> + estimator . predict ( x = x ) <nl> + ` ` ` <nl> + <nl> + Input of ` fit ` and ` evaluate ` should have following features , <nl> + otherwise there will be a KeyError : <nl> + if ` weight_column_name ` is not ` None ` : <nl> + key = weight_column_name , value = a ` Tensor ` <nl> + for column in ` feature_columns ` : <nl> + - if isinstance ( column , ` SparseColumn ` ) : <nl> + key = column . name , value = a ` SparseTensor ` <nl> + - if isinstance ( column , ` RealValuedColumn ` ) : <nl> + key = column . name , value = a ` Tensor ` <nl> + - if ` feauture_columns ` is ` None ` : <nl> + input must contains only real valued ` Tensor ` . <nl> - - - <nl> <nl> # # # # ` tf . contrib . learn . LinearRegressor . __init__ ( feature_columns = None , model_dir = None , n_classes = 2 , weight_column_name = None , optimizer = None , gradient_clip_norm = None , config = None ) ` { # LinearRegressor . __init__ } <nl> <nl> + Construct a ` LinearRegressor ` estimator object . <nl> + <nl> + # # # # # Args : <nl> + <nl> + <nl> + * < b > ` feature_columns ` < / b > : An iterable containing all the feature columns used by <nl> + the model . All items in the set should be instances of classes derived <nl> + from ` FeatureColumn ` . <nl> + * < b > ` model_dir ` < / b > : Directory to save model parameters , graph and etc . <nl> + * < b > ` n_classes ` < / b > : number of target classes . Default is binary classification . <nl> + * < b > ` weight_column_name ` < / b > : A string defining feature column name representing <nl> + weights . It is used to down weight or boost examples during training . It <nl> + will be multiplied by the loss of the example . <nl> + * < b > ` optimizer ` < / b > : An instance of ` tf . Optimizer ` used to train the model . If <nl> + ` None ` , will use an Ftrl optimizer . <nl> + * < b > ` gradient_clip_norm ` < / b > : A ` float ` > 0 . If provided , gradients are clipped <nl> + to their global norm with this clipping ratio . See <nl> + ` tf . clip_by_global_norm ` for more details . <nl> + * < b > ` config ` < / b > : ` RunConfig ` object to configure the runtime settings . <nl> + <nl> + # # # # # Returns : <nl> <nl> + A ` LinearRegressor ` estimator . <nl> <nl> <nl> - - - <nl> mmm a / tensorflow / g3doc / api_docs / python / functions_and_classes / shard1 / tf . contrib . learn . LinearClassifier . md <nl> ppp b / tensorflow / g3doc / api_docs / python / functions_and_classes / shard1 / tf . contrib . learn . LinearClassifier . md <nl> <nl> Linear classifier model . <nl> <nl> - Example : <nl> - ` ` ` <nl> - installed_app_id = sparse_column_with_hash_bucket ( " installed_id " , 1e6 ) <nl> - impression_app_id = sparse_column_with_hash_bucket ( " impression_id " , 1e6 ) <nl> - <nl> - installed_x_impression = crossed_column ( <nl> - [ installed_app_id , impression_app_id ] ) <nl> - <nl> - # Estimator using the default optimizer . <nl> - estimator = LinearClassifier ( <nl> - feature_columns = [ impression_app_id , installed_x_impression ] ) <nl> - <nl> - # Or estimator using the FTRL optimizer with regularization . <nl> - estimator = LinearClassifier ( <nl> - feature_columns = [ impression_app_id , installed_x_impression ] , <nl> - optimizer = tf . train . FtrlOptimizer ( <nl> - learning_rate = 0 . 1 , <nl> - l1_regularization_strength = 0 . 001 <nl> - ) ) <nl> - <nl> - # Or estimator using the SDCAOptimizer . <nl> - estimator = LinearClassifier ( <nl> - feature_columns = [ impression_app_id , installed_x_impression ] , <nl> - optimizer = tf . contrib . learn . SDCAOptimizer ( <nl> - example_id_column = ' example_id ' , symmetric_l2_regularization = 2 . 0 <nl> - ) ) <nl> - <nl> - # Input builders <nl> - def input_fn_train : # returns x , y <nl> - . . . <nl> - def input_fn_eval : # returns x , y <nl> - . . . <nl> - estimator . fit ( input_fn = input_fn_train ) <nl> - estimator . evaluate ( input_fn = input_fn_eval ) <nl> - estimator . predict ( x = x ) <nl> - ` ` ` <nl> - <nl> - Input of ` fit ` and ` evaluate ` should have following features , <nl> - otherwise there will be a ` KeyError ` : <nl> - if ` weight_column_name ` is not ` None ` , a feature with <nl> - ` key = weight_column_name ` whose value is a ` Tensor ` . <nl> - for each ` column ` in ` feature_columns ` : <nl> - - if ` column ` is a ` SparseColumn ` , a feature with ` key = column . name ` <nl> - whose ` value ` is a ` SparseTensor ` . <nl> - - if ` column ` is a ` RealValuedColumn , a feature with ` key = column . name ` <nl> - whose ` value ` is a ` Tensor ` . <nl> - - if ` feauture_columns ` is None , then ` input ` must contains only real <nl> - valued ` Tensor ` . <nl> - <nl> - <nl> - Parameters : <nl> - feature_columns : An iterable containing all the feature columns used by the <nl> - model . All items in the set should be instances of classes derived from <nl> - ` FeatureColumn ` . <nl> - model_dir : Directory to save model parameters , graph and etc . <nl> - n_classes : number of target classes . Default is binary classification . <nl> - weight_column_name : A string defining feature column name representing <nl> - weights . It is used to down weight or boost examples during training . It <nl> - will be multiplied by the loss of the example . <nl> - optimizer : The optimizer used to train the model . If specified , it should be <nl> - either an instance of ` tf . Optimizer ` or the SDCAOptimizer . If ` None ` , the <nl> - Ftrl optimizer will be used . <nl> - gradient_clip_norm : A float > 0 . If provided , gradients are clipped <nl> - to their global norm with this clipping ratio . See tf . clip_by_global_norm <nl> - for more details . <nl> - config : RunConfig object to configure the runtime settings . <nl> + Train a linear model to classify instances into one of multiple possible <nl> + classes . When number of possible classes is 2 , this is binary classification . <nl> + <nl> + Example : <nl> + ` ` ` python <nl> + installed_app_id = sparse_column_with_hash_bucket ( " installed_id " , 1e6 ) <nl> + impression_app_id = sparse_column_with_hash_bucket ( " impression_id " , 1e6 ) <nl> + <nl> + installed_x_impression = crossed_column ( <nl> + [ installed_app_id , impression_app_id ] ) <nl> + <nl> + # Estimator using the default optimizer . <nl> + estimator = LinearClassifier ( <nl> + feature_columns = [ impression_app_id , installed_x_impression ] ) <nl> + <nl> + # Or estimator using the FTRL optimizer with regularization . <nl> + estimator = LinearClassifier ( <nl> + feature_columns = [ impression_app_id , installed_x_impression ] , <nl> + optimizer = tf . train . FtrlOptimizer ( <nl> + learning_rate = 0 . 1 , <nl> + l1_regularization_strength = 0 . 001 <nl> + ) ) <nl> + <nl> + # Or estimator using the SDCAOptimizer . <nl> + estimator = LinearClassifier ( <nl> + feature_columns = [ impression_app_id , installed_x_impression ] , <nl> + optimizer = tf . contrib . learn . SDCAOptimizer ( <nl> + example_id_column = ' example_id ' , symmetric_l2_regularization = 2 . 0 <nl> + ) ) <nl> + <nl> + # Input builders <nl> + def input_fn_train : # returns x , y , where y is a tensor of dimension 1 <nl> + . . . <nl> + def input_fn_eval : # returns x , y , where y is a tensor of dimension 1 <nl> + . . . <nl> + estimator . fit ( input_fn = input_fn_train ) <nl> + estimator . evaluate ( input_fn = input_fn_eval ) <nl> + estimator . predict ( x = x ) <nl> + ` ` ` <nl> + <nl> + Input of ` fit ` and ` evaluate ` should have following features , <nl> + otherwise there will be a ` KeyError ` : <nl> + if ` weight_column_name ` is not ` None ` , a feature with <nl> + ` key = weight_column_name ` whose value is a ` Tensor ` . <nl> + for each ` column ` in ` feature_columns ` : <nl> + - if ` column ` is a ` SparseColumn ` , a feature with ` key = column . name ` <nl> + whose ` value ` is a ` SparseTensor ` . <nl> + - if ` column ` is a ` RealValuedColumn , a feature with ` key = column . name ` <nl> + whose ` value ` is a ` Tensor ` . <nl> + - if ` feauture_columns ` is ` None ` , then ` input ` must contains only real <nl> + valued ` Tensor ` . <nl> - - - <nl> <nl> # # # # ` tf . contrib . learn . LinearClassifier . __init__ ( feature_columns = None , model_dir = None , n_classes = 2 , weight_column_name = None , optimizer = None , gradient_clip_norm = None , config = None ) ` { # LinearClassifier . __init__ } <nl> <nl> + Construct a ` LinearClassifier ` estimator object . <nl> + <nl> + # # # # # Args : <nl> + <nl> + <nl> + * < b > ` feature_columns ` < / b > : An iterable containing all the feature columns used by <nl> + the model . All items in the set should be instances of classes derived <nl> + from ` FeatureColumn ` . <nl> + * < b > ` model_dir ` < / b > : Directory to save model parameters , graph and etc . <nl> + * < b > ` n_classes ` < / b > : number of target classes . Default is binary classification . <nl> + * < b > ` weight_column_name ` < / b > : A string defining feature column name representing <nl> + weights . It is used to down weight or boost examples during training . It <nl> + will be multiplied by the loss of the example . <nl> + * < b > ` optimizer ` < / b > : The optimizer used to train the model . If specified , it should <nl> + be either an instance of ` tf . Optimizer ` or the SDCAOptimizer . If ` None ` , <nl> + the Ftrl optimizer will be used . <nl> + * < b > ` gradient_clip_norm ` < / b > : A ` float ` > 0 . If provided , gradients are clipped <nl> + to their global norm with this clipping ratio . See <nl> + ` tf . clip_by_global_norm ` for more details . <nl> + * < b > ` config ` < / b > : ` RunConfig ` object to configure the runtime settings . <nl> + <nl> + # # # # # Returns : <nl> <nl> + A ` LinearClassifier ` estimator . <nl> <nl> <nl> - - - <nl>

Update generated Python Op docs .

tensorflow/tensorflow

4f4b729fb45482308b4aa17512b978383e32148f

2016-06-15T19:34:16Z

mmm a / src / builtins - ia32 . cc <nl> ppp b / src / builtins - ia32 . cc <nl> void Builtins : : Generate_JSConstructCall ( MacroAssembler * masm ) { <nl> __ test ( edi , Immediate ( kSmiTagMask ) ) ; <nl> __ j ( zero , & rt_call ) ; <nl> / / Check that function is a JSFunction <nl> - __ mov ( eax , FieldOperand ( edi , JSFunction : : kMapOffset ) ) ; <nl> - __ movzx_b ( eax , FieldOperand ( eax , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( eax , JS_FUNCTION_TYPE ) ; <nl> + __ CmpObjectType ( edi , JS_FUNCTION_TYPE , eax ) ; <nl> __ j ( not_equal , & rt_call ) ; <nl> <nl> / / Verified that the constructor is a JSFunction . <nl> void Builtins : : Generate_JSConstructCall ( MacroAssembler * masm ) { <nl> __ j ( zero , & rt_call ) ; <nl> / / edi : constructor <nl> / / eax : initial map ( if proven valid below ) <nl> - __ mov ( ebx , FieldOperand ( eax , JSFunction : : kMapOffset ) ) ; <nl> - __ movzx_b ( ebx , FieldOperand ( ebx , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( ebx , MAP_TYPE ) ; <nl> + __ CmpObjectType ( eax , MAP_TYPE , ebx ) ; <nl> __ j ( not_equal , & rt_call ) ; <nl> <nl> / / Check that the constructor is not constructing a JSFunction ( see comments <nl> void Builtins : : Generate_JSConstructCall ( MacroAssembler * masm ) { <nl> / / instance type would be JS_FUNCTION_TYPE . <nl> / / edi : constructor <nl> / / eax : initial map <nl> - __ movzx_b ( ebx , FieldOperand ( eax , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( ebx , JS_FUNCTION_TYPE ) ; <nl> + __ CmpInstanceType ( eax , JS_FUNCTION_TYPE ) ; <nl> __ j ( equal , & rt_call ) ; <nl> <nl> / / Now allocate the JSObject on the heap . <nl> void Builtins : : Generate_FunctionCall ( MacroAssembler * masm ) { <nl> __ mov ( edi , Operand ( esp , eax , times_4 , + 1 * kPointerSize ) ) ; <nl> __ test ( edi , Immediate ( kSmiTagMask ) ) ; <nl> __ j ( zero , & non_function , not_taken ) ; <nl> - __ mov ( ecx , FieldOperand ( edi , HeapObject : : kMapOffset ) ) ; / / get the map <nl> - __ movzx_b ( ecx , FieldOperand ( ecx , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( ecx , JS_FUNCTION_TYPE ) ; <nl> + __ CmpObjectType ( edi , JS_FUNCTION_TYPE , ecx ) ; <nl> __ j ( equal , & function , taken ) ; <nl> <nl> / / Non - function called : Clear the function to force exception . <nl> mmm a / src / codegen - ia32 . cc <nl> ppp b / src / codegen - ia32 . cc <nl> void CodeGenerator : : GenerateFastCaseSwitchJumpTable ( <nl> / / heap number . <nl> Result temp = allocator ( ) - > Allocate ( ) ; <nl> ASSERT ( temp . is_valid ( ) ) ; <nl> - __ mov ( temp . reg ( ) , FieldOperand ( switch_value . reg ( ) , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( temp . reg ( ) , FieldOperand ( temp . reg ( ) , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( temp . reg ( ) , HEAP_NUMBER_TYPE ) ; <nl> + __ CmpObjectType ( switch_value . reg ( ) , HEAP_NUMBER_TYPE , temp . reg ( ) ) ; <nl> temp . Unuse ( ) ; <nl> default_target - > Branch ( not_equal ) ; <nl> <nl> void CodeGenerator : : GenerateIsArray ( ZoneList < Expression * > * args ) { <nl> / / It is a heap object - get map . <nl> Result temp = allocator ( ) - > Allocate ( ) ; <nl> ASSERT ( temp . is_valid ( ) ) ; <nl> - __ mov ( temp . reg ( ) , FieldOperand ( value . reg ( ) , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( temp . reg ( ) , FieldOperand ( temp . reg ( ) , Map : : kInstanceTypeOffset ) ) ; <nl> / / Check if the object is a JS array or not . <nl> - __ cmp ( temp . reg ( ) , JS_ARRAY_TYPE ) ; <nl> + __ CmpObjectType ( value . reg ( ) , JS_ARRAY_TYPE , temp . reg ( ) ) ; <nl> value . Unuse ( ) ; <nl> temp . Unuse ( ) ; <nl> destination ( ) - > Split ( equal ) ; <nl> void CodeGenerator : : GenerateValueOf ( ZoneList < Expression * > * args ) { <nl> / / It is a heap object - get map . <nl> Result temp = allocator ( ) - > Allocate ( ) ; <nl> ASSERT ( temp . is_valid ( ) ) ; <nl> - __ mov ( temp . reg ( ) , FieldOperand ( object . reg ( ) , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( temp . reg ( ) , FieldOperand ( temp . reg ( ) , Map : : kInstanceTypeOffset ) ) ; <nl> / / if ( ! object - > IsJSValue ( ) ) return object . <nl> - __ cmp ( temp . reg ( ) , JS_VALUE_TYPE ) ; <nl> + __ CmpObjectType ( object . reg ( ) , JS_VALUE_TYPE , temp . reg ( ) ) ; <nl> leave . Branch ( not_equal , not_taken ) ; <nl> __ mov ( temp . reg ( ) , FieldOperand ( object . reg ( ) , JSValue : : kValueOffset ) ) ; <nl> object . Unuse ( ) ; <nl> void CodeGenerator : : GenerateSetValueOf ( ZoneList < Expression * > * args ) { <nl> / / It is a heap object - get its map . <nl> Result scratch = allocator_ - > Allocate ( ) ; <nl> ASSERT ( scratch . is_valid ( ) ) ; <nl> - __ mov ( scratch . reg ( ) , FieldOperand ( object . reg ( ) , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( scratch . reg ( ) , <nl> - FieldOperand ( scratch . reg ( ) , Map : : kInstanceTypeOffset ) ) ; <nl> / / if ( ! object - > IsJSValue ( ) ) return value . <nl> - __ cmp ( scratch . reg ( ) , JS_VALUE_TYPE ) ; <nl> + __ CmpObjectType ( object . reg ( ) , JS_VALUE_TYPE , scratch . reg ( ) ) ; <nl> leave . Branch ( not_equal , & value , not_taken ) ; <nl> <nl> / / Store the value . <nl> void CodeGenerator : : VisitCompareOperation ( CompareOperation * node ) { <nl> __ test ( answer . reg ( ) , Immediate ( kSmiTagMask ) ) ; <nl> destination ( ) - > false_target ( ) - > Branch ( zero ) ; <nl> frame_ - > Spill ( answer . reg ( ) ) ; <nl> - __ mov ( answer . reg ( ) , FieldOperand ( answer . reg ( ) , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( answer . reg ( ) , <nl> - FieldOperand ( answer . reg ( ) , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( answer . reg ( ) , JS_FUNCTION_TYPE ) ; <nl> + __ CmpObjectType ( answer . reg ( ) , JS_FUNCTION_TYPE , answer . reg ( ) ) ; <nl> answer . Unuse ( ) ; <nl> destination ( ) - > Split ( equal ) ; <nl> <nl> void CallFunctionStub : : Generate ( MacroAssembler * masm ) { <nl> / / Check that the function really is a JavaScript function . <nl> __ test ( edi , Immediate ( kSmiTagMask ) ) ; <nl> __ j ( zero , & slow , not_taken ) ; <nl> - / / Get the map . <nl> - __ mov ( ecx , FieldOperand ( edi , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( ecx , FieldOperand ( ecx , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( ecx , JS_FUNCTION_TYPE ) ; <nl> + / / Goto slow case if we do not have a function . <nl> + __ CmpObjectType ( edi , JS_FUNCTION_TYPE , ecx ) ; <nl> __ j ( not_equal , & slow , not_taken ) ; <nl> <nl> / / Fast - case : Just invoke the function . <nl> mmm a / src / ic - ia32 . cc <nl> ppp b / src / ic - ia32 . cc <nl> static void GenerateCheckNonFunctionOrLoaded ( MacroAssembler * masm , Label * miss , <nl> __ test ( value , Immediate ( kSmiTagMask ) ) ; <nl> __ j ( zero , & done , not_taken ) ; <nl> / / Check if the value is a function . <nl> - __ mov ( scratch , FieldOperand ( value , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( scratch , FieldOperand ( scratch , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( scratch , JS_FUNCTION_TYPE ) ; <nl> + __ CmpObjectType ( value , JS_FUNCTION_TYPE , scratch ) ; <nl> __ j ( not_equal , & done , taken ) ; <nl> / / Check if the function has been loaded . <nl> __ mov ( scratch , FieldOperand ( value , JSFunction : : kSharedFunctionInfoOffset ) ) ; <nl> void CallIC : : GenerateMegamorphic ( MacroAssembler * masm , int argc ) { <nl> / / Check for number . <nl> __ test ( edx , Immediate ( kSmiTagMask ) ) ; <nl> __ j ( zero , & number , not_taken ) ; <nl> - __ mov ( ebx , FieldOperand ( edx , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( ebx , FieldOperand ( ebx , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( ebx , HEAP_NUMBER_TYPE ) ; <nl> + __ CmpObjectType ( edx , HEAP_NUMBER_TYPE , ebx ) ; <nl> __ j ( not_equal , & non_number , taken ) ; <nl> __ bind ( & number ) ; <nl> StubCompiler : : GenerateLoadGlobalFunctionPrototype ( <nl> static void GenerateNormalHelper ( MacroAssembler * masm , <nl> __ j ( zero , miss , not_taken ) ; <nl> <nl> / / Check that the value is a JavaScript function . <nl> - __ mov ( edx , FieldOperand ( edx , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( edx , FieldOperand ( edx , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( edx , JS_FUNCTION_TYPE ) ; <nl> + __ CmpObjectType ( edx , JS_FUNCTION_TYPE , edx ) ; <nl> __ j ( not_equal , miss , not_taken ) ; <nl> <nl> / / Check that the function has been loaded . <nl> mmm a / src / macro - assembler - ia32 . cc <nl> ppp b / src / macro - assembler - ia32 . cc <nl> void MacroAssembler : : Set ( const Operand & dst , const Immediate & x ) { <nl> } <nl> <nl> <nl> + void MacroAssembler : : CmpObjectType ( Register heap_object , <nl> + InstanceType type , <nl> + Register map ) { <nl> + mov ( map , FieldOperand ( heap_object , HeapObject : : kMapOffset ) ) ; <nl> + CmpInstanceType ( map , type ) ; <nl> + } <nl> + <nl> + <nl> + void MacroAssembler : : CmpInstanceType ( Register map , InstanceType type ) { <nl> + cmpb ( FieldOperand ( map , Map : : kInstanceTypeOffset ) , <nl> + static_cast < int8_t > ( type ) ) ; <nl> + } <nl> + <nl> + <nl> void MacroAssembler : : FCmp ( ) { <nl> fcompp ( ) ; <nl> push ( eax ) ; <nl> void MacroAssembler : : TryGetFunctionPrototype ( Register function , <nl> j ( zero , miss , not_taken ) ; <nl> <nl> / / Check that the function really is a function . <nl> - mov ( result , FieldOperand ( function , HeapObject : : kMapOffset ) ) ; <nl> - movzx_b ( scratch , FieldOperand ( result , Map : : kInstanceTypeOffset ) ) ; <nl> - cmp ( scratch , JS_FUNCTION_TYPE ) ; <nl> + CmpObjectType ( function , JS_FUNCTION_TYPE , result ) ; <nl> j ( not_equal , miss , not_taken ) ; <nl> <nl> / / Make sure that the function has an instance prototype . <nl> void MacroAssembler : : TryGetFunctionPrototype ( Register function , <nl> <nl> / / If the function does not have an initial map , we ' re done . <nl> Label done ; <nl> - mov ( scratch , FieldOperand ( result , HeapObject : : kMapOffset ) ) ; <nl> - movzx_b ( scratch , FieldOperand ( scratch , Map : : kInstanceTypeOffset ) ) ; <nl> - cmp ( scratch , MAP_TYPE ) ; <nl> + CmpObjectType ( result , MAP_TYPE , scratch ) ; <nl> j ( not_equal , & done ) ; <nl> <nl> / / Get the prototype from the initial map . <nl> mmm a / src / macro - assembler - ia32 . h <nl> ppp b / src / macro - assembler - ia32 . h <nl> class MacroAssembler : public Assembler { <nl> void Set ( Register dst , const Immediate & x ) ; <nl> void Set ( const Operand & dst , const Immediate & x ) ; <nl> <nl> + / / Compare object type for heap object . <nl> + / / Incoming register is heap_object and outgoing register is map . <nl> + void CmpObjectType ( Register heap_object , InstanceType type , Register map ) ; <nl> + <nl> + / / Compare instance type for map . <nl> + void CmpInstanceType ( Register map , InstanceType type ) ; <nl> + <nl> / / FCmp is similar to integer cmp , but requires unsigned <nl> / / jcc instructions ( je , ja , jae , jb , jbe , je , and jz ) . <nl> void FCmp ( ) ; <nl> mmm a / src / stub - cache - ia32 . cc <nl> ppp b / src / stub - cache - ia32 . cc <nl> void StubCompiler : : GenerateLoadArrayLength ( MacroAssembler * masm , <nl> __ j ( zero , miss_label , not_taken ) ; <nl> <nl> / / Check that the object is a JS array . <nl> - __ mov ( scratch , FieldOperand ( receiver , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( scratch , FieldOperand ( scratch , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( scratch , JS_ARRAY_TYPE ) ; <nl> + __ CmpObjectType ( receiver , JS_ARRAY_TYPE , scratch ) ; <nl> __ j ( not_equal , miss_label , not_taken ) ; <nl> <nl> / / Load length directly from the JS array . <nl> Object * CallStubCompiler : : CompileCallField ( Object * object , <nl> / / Check that the function really is a function . <nl> __ test ( edi , Immediate ( kSmiTagMask ) ) ; <nl> __ j ( zero , & miss , not_taken ) ; <nl> - __ mov ( ebx , FieldOperand ( edi , HeapObject : : kMapOffset ) ) ; / / get the map <nl> - __ movzx_b ( ebx , FieldOperand ( ebx , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( ebx , JS_FUNCTION_TYPE ) ; <nl> + __ CmpObjectType ( edi , JS_FUNCTION_TYPE , ebx ) ; <nl> __ j ( not_equal , & miss , not_taken ) ; <nl> <nl> / / Patch the receiver on the stack with the global proxy if <nl> Object * CallStubCompiler : : CompileCallConstant ( Object * object , <nl> / / Check that the object is a smi or a heap number . <nl> __ test ( edx , Immediate ( kSmiTagMask ) ) ; <nl> __ j ( zero , & fast , taken ) ; <nl> - __ mov ( ecx , FieldOperand ( edx , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( ecx , FieldOperand ( ecx , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( ecx , HEAP_NUMBER_TYPE ) ; <nl> + __ CmpObjectType ( edx , HEAP_NUMBER_TYPE , ecx ) ; <nl> __ j ( not_equal , & miss , not_taken ) ; <nl> __ bind ( & fast ) ; <nl> / / Check that the maps starting from the prototype haven ' t changed . <nl> Object * CallStubCompiler : : CompileCallInterceptor ( Object * object , <nl> / / Check that the function really is a function . <nl> __ test ( edi , Immediate ( kSmiTagMask ) ) ; <nl> __ j ( zero , & miss , not_taken ) ; <nl> - __ mov ( ebx , FieldOperand ( edi , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( ebx , FieldOperand ( ebx , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( ebx , JS_FUNCTION_TYPE ) ; <nl> + __ CmpObjectType ( edi , JS_FUNCTION_TYPE , ebx ) ; <nl> __ j ( not_equal , & miss , not_taken ) ; <nl> <nl> / / Patch the receiver on the stack with the global proxy if <nl> mmm a / src / virtual - frame - ia32 . cc <nl> ppp b / src / virtual - frame - ia32 . cc <nl> void VirtualFrame : : Enter ( ) { <nl> __ test ( edi , Immediate ( kSmiTagMask ) ) ; <nl> __ Check ( not_zero , <nl> " VirtualFrame : : Enter - edi is not a function ( smi check ) . " ) ; <nl> - __ mov ( eax , FieldOperand ( edi , HeapObject : : kMapOffset ) ) ; <nl> - __ movzx_b ( eax , FieldOperand ( eax , Map : : kInstanceTypeOffset ) ) ; <nl> - __ cmp ( eax , JS_FUNCTION_TYPE ) ; <nl> + __ CmpObjectType ( edi , JS_FUNCTION_TYPE , eax ) ; <nl> __ Check ( equal , <nl> " VirtualFrame : : Enter - edi is not a function ( map check ) . " ) ; <nl> # endif <nl>

Reduced the code sequence for testing for object type .

v8/v8

9c96c68ab4284d30494339b436c1952429aa9589

2009-03-09T14:00:51Z

mmm a / docs / en / sql - reference / statements / select / index . md <nl> ppp b / docs / en / sql - reference / statements / select / index . md <nl> Specifics of each optional clause are covered in separate sections , which are li <nl> - [ SELECT clause ] ( # select - clause ) <nl> - [ DISTINCT clause ] ( . . / . . / . . / sql - reference / statements / select / distinct . md ) <nl> - [ LIMIT clause ] ( . . / . . / . . / sql - reference / statements / select / limit . md ) <nl> - - [ UNION clause ] ( . . / . . / . . / sql - reference / statements / select / union . md ) <nl> + - [ UNION clause ] ( . . / . . / . . / sql - reference / statements / select / union - all . md ) <nl> - [ INTO OUTFILE clause ] ( . . / . . / . . / sql - reference / statements / select / into - outfile . md ) <nl> - [ FORMAT clause ] ( . . / . . / . . / sql - reference / statements / select / format . md ) <nl> <nl> similarity index 86 % <nl> rename from docs / en / sql - reference / statements / select / union . md <nl> rename to docs / en / sql - reference / statements / select / union - all . md <nl> mmm a / docs / en / sql - reference / statements / select / union . md <nl> ppp b / docs / en / sql - reference / statements / select / union - all . md <nl> Queries that are parts of ` UNION ALL ` can ’ t be enclosed in round brackets . [ OR <nl> The difference between ` UNION ALL ` and ` UNION DISTINCT ` is that ` UNION DISTINCT ` will do a distinct transform for union result , it is equivalent to ` SELECT DISTINCT ` from a subquery containing ` UNION ALL ` . <nl> <nl> # UNION Clause { # union - clause } <nl> - By defaul , ` UNION ` has same react as ` UNION ALL ` , but you can specify union mode by setting ` union_default_mode ` , values can be ' ALL ' , ' DISTINCT ' or empty string . However , if you use ` UNION ` with setting ` union_default_mode ` to empty string , it will throw an exception . <nl> + By defaul , ` UNION ` has same react as ` UNION DISTINCT ` , but you can specify union mode by setting ` union_default_mode ` , values can be ' ALL ' , ' DISTINCT ' or empty string . However , if you use ` UNION ` with setting ` union_default_mode ` to empty string , it will throw an exception . <nl> <nl> <nl> # # Implementation Details { # implementation - details } <nl> mmm a / src / Core / Settings . h <nl> ppp b / src / Core / Settings . h <nl> class IColumn ; <nl> M ( Bool , allow_experimental_database_atomic , true , " Obsolete setting , does nothing . Will be removed after 2021 - 02 - 12 " , 0 ) \ <nl> M ( Bool , allow_non_metadata_alters , true , " Allow to execute alters which affects not only tables metadata , but also data on disk " , 0 ) \ <nl> M ( Bool , enable_global_with_statement , false , " Propagate WITH statements to UNION queries and all subqueries " , 0 ) \ <nl> - M ( UnionMode , union_default_mode , UnionMode : : ALL , " Set default Union Mode in SelectWithUnion query . Possible values : empty string , ' ALL ' , ' DISTINCT ' . If empty , query without Union Mode will throw exception . " , 0 ) <nl> + M ( UnionMode , union_default_mode , UnionMode : : DISTINCT , " Set default Union Mode in SelectWithUnion query . Possible values : empty string , ' ALL ' , ' DISTINCT ' . If empty , query without Union Mode will throw exception . " , 0 ) <nl> <nl> / / End of COMMON_SETTINGS <nl> / / Please add settings related to formats into the FORMAT_FACTORY_SETTINGS below . <nl> mmm a / src / Interpreters / InterpreterSelectWithUnionQuery . cpp <nl> ppp b / src / Interpreters / InterpreterSelectWithUnionQuery . cpp <nl> <nl> + # include < ctime > <nl> + # include < memory > <nl> # include < Interpreters / InterpreterSelectWithUnionQuery . h > <nl> # include < Interpreters / InterpreterSelectQuery . h > <nl> # include < Interpreters / Context . h > <nl> InterpreterSelectWithUnionQuery : : InterpreterSelectWithUnionQuery ( <nl> if ( ! num_selects ) <nl> throw Exception ( " Logical error : no children in ASTSelectWithUnionQuery " , ErrorCodes : : LOGICAL_ERROR ) ; <nl> <nl> - / / / For SELECT . . . UNION / UNION ALL / UNION DISTINCT SELECT . . . query , <nl> - / / / rewrite ast with settings . union_default_mode <nl> + / / / Rewrite ast with settings . union_default_mode <nl> if ( num_selects > 1 ) <nl> { <nl> - if ( ast . mode = = ASTSelectWithUnionQuery : : Mode : : Unspecified ) <nl> + const Settings & settings = context - > getSettingsRef ( ) ; <nl> + for ( auto & mode : ast . union_modes ) <nl> { <nl> - const Settings & settings = context - > getSettingsRef ( ) ; <nl> - <nl> - if ( settings . union_default_mode = = UnionMode : : ALL ) <nl> - ast . mode = ASTSelectWithUnionQuery : : Mode : : ALL ; <nl> - else if ( settings . union_default_mode = = UnionMode : : DISTINCT ) <nl> - ast . mode = ASTSelectWithUnionQuery : : Mode : : DISTINCT ; <nl> - else <nl> - throw Exception ( <nl> - " Expected ALL or DISTINCT in SelectWithUnion query , because setting ( union_default_mode ) is empty " , <nl> - DB : : ErrorCodes : : EXPECTED_ALL_OR_DISTINCT ) ; <nl> + if ( mode = = ASTSelectWithUnionQuery : : Mode : : Unspecified ) <nl> + { <nl> + <nl> + if ( settings . union_default_mode = = UnionMode : : ALL ) <nl> + mode = ASTSelectWithUnionQuery : : Mode : : ALL ; <nl> + else if ( settings . union_default_mode = = UnionMode : : DISTINCT ) <nl> + mode = ASTSelectWithUnionQuery : : Mode : : DISTINCT ; <nl> + else <nl> + throw Exception ( <nl> + " Expected ALL or DISTINCT in SelectWithUnion query , because setting ( union_default_mode ) is empty " , <nl> + DB : : ErrorCodes : : EXPECTED_ALL_OR_DISTINCT ) ; <nl> + } <nl> + } <nl> + / / / Optimize : if there is UNION DISTINCT , all previous UNION DISTINCT can be rewritten to UNION ALL . <nl> + / / / Therefore we have at most one UNION DISTINCT in a sequence . <nl> + for ( auto rit = ast . union_modes . rbegin ( ) ; rit ! = ast . union_modes . rend ( ) ; + + rit ) <nl> + { <nl> + if ( * rit = = ASTSelectWithUnionQuery : : Mode : : DISTINCT ) <nl> + { <nl> + / / / Number of streams need to do a DISTINCT transform after unite <nl> + union_distinct_num = ast . union_modes . rend ( ) - rit + 1 ; <nl> + for ( auto mode_to_modify = + + rit ; mode_to_modify ! = ast . union_modes . rend ( ) ; + + mode_to_modify ) <nl> + * mode_to_modify = ASTSelectWithUnionQuery : : Mode : : ALL ; <nl> + break ; <nl> + } <nl> } <nl> - <nl> - if ( ast . mode = = ASTSelectWithUnionQuery : : Mode : : DISTINCT ) <nl> - distinct_union = true ; <nl> } <nl> <nl> / / / Initialize interpreters for each SELECT query . <nl> void InterpreterSelectWithUnionQuery : : buildQueryPlan ( QueryPlan & query_plan ) <nl> return ; <nl> } <nl> <nl> - std : : vector < std : : unique_ptr < QueryPlan > > plans ( num_plans ) ; <nl> - DataStreams data_streams ( num_plans ) ; <nl> - <nl> - for ( size_t i = 0 ; i < num_plans ; + + i ) <nl> + / / / All UNION streams in the chain does not need to do DISTINCT transform <nl> + if ( union_distinct_num = = 0 ) <nl> { <nl> - plans [ i ] = std : : make_unique < QueryPlan > ( ) ; <nl> - nested_interpreters [ i ] - > buildQueryPlan ( * plans [ i ] ) ; <nl> - data_streams [ i ] = plans [ i ] - > getCurrentDataStream ( ) ; <nl> - } <nl> + std : : vector < std : : unique_ptr < QueryPlan > > plans ( num_plans ) ; <nl> + DataStreams data_streams ( num_plans ) ; <nl> + <nl> + for ( size_t i = 0 ; i < num_plans ; + + i ) <nl> + { <nl> + plans [ i ] = std : : make_unique < QueryPlan > ( ) ; <nl> + nested_interpreters [ i ] - > buildQueryPlan ( * plans [ i ] ) ; <nl> + data_streams [ i ] = plans [ i ] - > getCurrentDataStream ( ) ; <nl> + } <nl> <nl> - auto max_threads = context - > getSettingsRef ( ) . max_threads ; <nl> - auto union_step = std : : make_unique < UnionStep > ( std : : move ( data_streams ) , result_header , max_threads ) ; <nl> + auto max_threads = context - > getSettingsRef ( ) . max_threads ; <nl> + auto union_step = std : : make_unique < UnionStep > ( std : : move ( data_streams ) , result_header , max_threads ) ; <nl> <nl> - query_plan . unitePlans ( std : : move ( union_step ) , std : : move ( plans ) ) ; <nl> + query_plan . unitePlans ( std : : move ( union_step ) , std : : move ( plans ) ) ; <nl> + } <nl> <nl> - / / / Add distinct transform for UNION DISTINCT query <nl> - if ( distinct_union ) <nl> + / / / The first union_distinct_num UNION streams need to do a DISTINCT transform after unite <nl> + else <nl> { <nl> + QueryPlan distinct_query_plan ; <nl> + <nl> + std : : vector < std : : unique_ptr < QueryPlan > > plans ( union_distinct_num ) ; <nl> + DataStreams data_streams ( union_distinct_num ) ; <nl> + <nl> + for ( size_t i = 0 ; i < union_distinct_num ; + + i ) <nl> + { <nl> + plans [ i ] = std : : make_unique < QueryPlan > ( ) ; <nl> + nested_interpreters [ i ] - > buildQueryPlan ( * plans [ i ] ) ; <nl> + data_streams [ i ] = plans [ i ] - > getCurrentDataStream ( ) ; <nl> + } <nl> + <nl> + auto max_threads = context - > getSettingsRef ( ) . max_threads ; <nl> + auto union_step = std : : make_unique < UnionStep > ( std : : move ( data_streams ) , result_header , max_threads ) ; <nl> + <nl> + distinct_query_plan . unitePlans ( std : : move ( union_step ) , std : : move ( plans ) ) ; <nl> + <nl> + / / / Add distinct transform <nl> const Settings & settings = context - > getSettingsRef ( ) ; <nl> SizeLimits limits ( settings . max_rows_in_distinct , settings . max_bytes_in_distinct , settings . distinct_overflow_mode ) ; <nl> <nl> - auto distinct_step = std : : make_unique < DistinctStep > ( query_plan . getCurrentDataStream ( ) , limits , 0 , result_header . getNames ( ) , false ) ; <nl> + auto distinct_step <nl> + = std : : make_unique < DistinctStep > ( distinct_query_plan . getCurrentDataStream ( ) , limits , 0 , result_header . getNames ( ) , false ) ; <nl> + <nl> + distinct_query_plan . addStep ( std : : move ( distinct_step ) ) ; <nl> + <nl> + / / / No other UNION streams after DISTINCT stream <nl> + if ( num_plans = = union_distinct_num ) <nl> + { <nl> + query_plan = std : : move ( distinct_query_plan ) ; <nl> + return ; <nl> + } <nl> + <nl> + / / / Build final UNION step <nl> + std : : vector < std : : unique_ptr < QueryPlan > > final_plans ( num_plans - union_distinct_num + 1 ) ; <nl> + DataStreams final_data_streams ( num_plans - union_distinct_num + 1 ) ; <nl> <nl> - query_plan . addStep ( std : : move ( distinct_step ) ) ; <nl> + final_plans [ 0 ] = std : : make_unique < QueryPlan > ( std : : move ( distinct_query_plan ) ) ; <nl> + final_data_streams [ 0 ] = final_plans [ 0 ] - > getCurrentDataStream ( ) ; <nl> + <nl> + for ( size_t i = 1 ; i < num_plans - union_distinct_num + 1 ; + + i ) <nl> + { <nl> + final_plans [ i ] = std : : make_unique < QueryPlan > ( ) ; <nl> + nested_interpreters [ union_distinct_num + i - 1 ] - > buildQueryPlan ( * final_plans [ i ] ) ; <nl> + final_data_streams [ i ] = final_plans [ i ] - > getCurrentDataStream ( ) ; <nl> + } <nl> + <nl> + auto final_union_step = std : : make_unique < UnionStep > ( std : : move ( final_data_streams ) , result_header , max_threads ) ; <nl> + query_plan . unitePlans ( std : : move ( final_union_step ) , std : : move ( final_plans ) ) ; <nl> } <nl> + <nl> } <nl> <nl> BlockIO InterpreterSelectWithUnionQuery : : execute ( ) <nl> mmm a / src / Interpreters / InterpreterSelectWithUnionQuery . h <nl> ppp b / src / Interpreters / InterpreterSelectWithUnionQuery . h <nl> <nl> # pragma once <nl> <nl> + # include < cstddef > <nl> # include < Core / QueryProcessingStage . h > <nl> # include < Interpreters / IInterpreter . h > <nl> # include < Interpreters / SelectQueryOptions . h > <nl> class InterpreterSelectWithUnionQuery : public IInterpreter <nl> <nl> size_t max_streams = 1 ; <nl> <nl> - bool distinct_union = false ; <nl> + / / / First union_distinct_num streams need to do a DISTINCT transform after unite <nl> + size_t union_distinct_num = 0 ; <nl> <nl> static Block getCommonHeaderForUnion ( const Blocks & headers ) ; <nl> } ; <nl> mmm a / src / Parsers / ASTSelectWithUnionQuery . cpp <nl> ppp b / src / Parsers / ASTSelectWithUnionQuery . cpp <nl> void ASTSelectWithUnionQuery : : formatQueryImpl ( const FormatSettings & settings , F <nl> { <nl> std : : string indent_str = settings . one_line ? " " : std : : string ( 4 * frame . indent , ' ' ) ; <nl> <nl> - std : : string mode_str ; <nl> - switch ( mode ) <nl> + auto mode_to_str = [ & ] ( auto mode ) <nl> { <nl> - case Mode : : Unspecified : <nl> - mode_str = " " ; <nl> - break ; <nl> - case Mode : : ALL : <nl> - mode_str = " ALL " ; <nl> - break ; <nl> - case Mode : : DISTINCT : <nl> - mode_str = " DISTINCT " ; <nl> - break ; <nl> - } <nl> + if ( mode = = Mode : : Unspecified ) <nl> + return " " ; <nl> + else if ( mode = = Mode : : ALL ) <nl> + return " ALL " ; <nl> + else <nl> + return " DISTINCT " ; <nl> + } ; <nl> <nl> for ( ASTs : : const_iterator it = list_of_selects - > children . begin ( ) ; it ! = list_of_selects - > children . end ( ) ; + + it ) <nl> { <nl> if ( it ! = list_of_selects - > children . begin ( ) ) <nl> - settings . ostr < < settings . nl_or_ws < < indent_str <nl> - < < ( settings . hilite ? hilite_keyword : " " ) <nl> - < < " UNION " < < mode_str <nl> - < < ( settings . hilite ? hilite_none : " " ) <nl> + settings . ostr < < settings . nl_or_ws < < indent_str < < ( settings . hilite ? hilite_keyword : " " ) < < " UNION " <nl> + < < mode_to_str ( union_modes [ it - list_of_selects - > children . begin ( ) - 1 ] ) < < ( settings . hilite ? hilite_none : " " ) <nl> < < settings . nl_or_ws ; <nl> <nl> ( * it ) - > formatImpl ( settings , state , frame ) ; <nl> mmm a / src / Parsers / ASTSelectWithUnionQuery . h <nl> ppp b / src / Parsers / ASTSelectWithUnionQuery . h <nl> class ASTSelectWithUnionQuery : public ASTQueryWithOutput <nl> DISTINCT <nl> } ; <nl> <nl> - Mode mode = Mode : : Unspecified ; <nl> + using Modes = std : : vector < Mode > ; <nl> + <nl> + Modes union_modes ; <nl> <nl> ASTPtr list_of_selects ; <nl> } ; <nl> mmm a / src / Parsers / ExpressionListParsers . cpp <nl> ppp b / src / Parsers / ExpressionListParsers . cpp <nl> <nl> + # include < tuple > <nl> # include < Parsers / IAST . h > <nl> # include < Parsers / ASTExpressionList . h > <nl> # include < Parsers / ASTFunction . h > <nl> bool ParserList : : parseImpl ( Pos & pos , ASTPtr & node , Expected & expected ) <nl> return true ; <nl> } <nl> <nl> + bool ParserUnionList : : parseImpl ( Pos & pos , ASTPtr & node , Expected & expected ) <nl> + { <nl> + ASTs elements ; <nl> + <nl> + auto parse_element = [ & ] <nl> + { <nl> + ASTPtr element ; <nl> + if ( ! elem_parser - > parse ( pos , element , expected ) ) <nl> + return false ; <nl> + <nl> + elements . push_back ( element ) ; <nl> + return true ; <nl> + } ; <nl> + <nl> + / / / Parse UNION type <nl> + auto parse_separator = [ & ] <nl> + { <nl> + if ( s_union_parser - > ignore ( pos , expected ) ) <nl> + { <nl> + / / SELECT . . . UNION ALL SELECT . . . <nl> + if ( s_all_parser - > check ( pos , expected ) ) <nl> + { <nl> + union_modes . push_back ( ASTSelectWithUnionQuery : : Mode : : ALL ) ; <nl> + } <nl> + / / SELECT . . . UNION DISTINCT SELECT . . . <nl> + else if ( s_distinct_parser - > check ( pos , expected ) ) <nl> + { <nl> + union_modes . push_back ( ASTSelectWithUnionQuery : : Mode : : DISTINCT ) ; <nl> + } <nl> + / / SELECT . . . UNION SELECT . . . <nl> + else <nl> + union_modes . push_back ( ASTSelectWithUnionQuery : : Mode : : Unspecified ) ; <nl> + return true ; <nl> + } <nl> + return false ; <nl> + } ; <nl> + <nl> + if ( ! parseUtil ( pos , parse_element , parse_separator ) ) <nl> + return false ; <nl> + <nl> + auto list = std : : make_shared < ASTExpressionList > ( result_separator ) ; <nl> + list - > children = std : : move ( elements ) ; <nl> + node = list ; <nl> + return true ; <nl> + } <nl> <nl> static bool parseOperator ( IParser : : Pos & pos , const char * op , Expected & expected ) <nl> { <nl> mmm a / src / Parsers / ExpressionListParsers . h <nl> ppp b / src / Parsers / ExpressionListParsers . h <nl> <nl> # include < Parsers / IParserBase . h > <nl> # include < Parsers / CommonParsers . h > <nl> <nl> + # include < Parsers / ASTSelectWithUnionQuery . h > <nl> <nl> namespace DB <nl> { <nl> class ParserList : public IParserBase <nl> char result_separator ; <nl> } ; <nl> <nl> + class ParserUnionList : public IParserBase <nl> + { <nl> + public : <nl> + ParserUnionList ( ParserPtr & & elem_parser_ , ParserPtr & & s_union_parser_ , ParserPtr & & s_all_parser_ , ParserPtr & & s_distinct_parser_ ) <nl> + : elem_parser ( std : : move ( elem_parser_ ) ) <nl> + , s_union_parser ( std : : move ( s_union_parser_ ) ) <nl> + , s_all_parser ( std : : move ( s_all_parser_ ) ) <nl> + , s_distinct_parser ( std : : move ( s_distinct_parser_ ) ) <nl> + { <nl> + } <nl> + <nl> + template < typename ElemFunc , typename SepFunc > <nl> + static bool parseUtil ( Pos & pos , const ElemFunc & parse_element , const SepFunc & parse_separator ) <nl> + { <nl> + Pos begin = pos ; <nl> + if ( ! parse_element ( ) ) <nl> + { <nl> + pos = begin ; <nl> + return false ; <nl> + } <nl> + <nl> + while ( true ) <nl> + { <nl> + begin = pos ; <nl> + if ( ! parse_separator ( ) | | ! parse_element ( ) ) <nl> + { <nl> + pos = begin ; <nl> + return true ; <nl> + } <nl> + } <nl> + <nl> + return false ; <nl> + } <nl> + <nl> + auto getUnionModes ( ) const { return union_modes ; } <nl> + <nl> + protected : <nl> + const char * getName ( ) const override { return " list of union elements " ; } <nl> + bool parseImpl ( Pos & pos , ASTPtr & node , Expected & expected ) override ; <nl> + private : <nl> + ParserPtr elem_parser ; <nl> + ParserPtr s_union_parser ; <nl> + ParserPtr s_all_parser ; <nl> + ParserPtr s_distinct_parser ; <nl> + char result_separator = ' , ' ; <nl> + ASTSelectWithUnionQuery : : Modes union_modes ; <nl> + } ; <nl> <nl> / * * An expression with an infix binary left - associative operator . <nl> * For example , a + b - c + d . <nl> mmm a / src / Parsers / ParserSelectWithUnionQuery . cpp <nl> ppp b / src / Parsers / ParserSelectWithUnionQuery . cpp <nl> <nl> + # include < memory > <nl> # include < Parsers / ExpressionListParsers . h > <nl> # include < Parsers / ParserSelectWithUnionQuery . h > <nl> # include < Parsers / ASTSelectWithUnionQuery . h > <nl> bool ParserSelectWithUnionQuery : : parseImpl ( Pos & pos , ASTPtr & node , Expected & <nl> { <nl> ASTPtr list_node ; <nl> <nl> - ParserList parser_union ( std : : make_unique < ParserUnionQueryElement > ( ) , std : : make_unique < ParserKeyword > ( " UNION " ) , false ) ; <nl> - ParserList parser_union_all ( std : : make_unique < ParserUnionQueryElement > ( ) , std : : make_unique < ParserKeyword > ( " UNION ALL " ) , false ) ; <nl> - ParserList parser_union_distinct ( std : : make_unique < ParserUnionQueryElement > ( ) , std : : make_unique < ParserKeyword > ( " UNION DISTINCT " ) , false ) ; <nl> + ParserUnionList parser ( <nl> + std : : make_unique < ParserUnionQueryElement > ( ) , <nl> + std : : make_unique < ParserKeyword > ( " UNION " ) , <nl> + std : : make_unique < ParserKeyword > ( " ALL " ) , <nl> + std : : make_unique < ParserKeyword > ( " DISTINCT " ) ) ; <nl> <nl> - auto begin = pos ; <nl> - auto current_expected = expected ; <nl> - ASTSelectWithUnionQuery : : Mode union_mode = ASTSelectWithUnionQuery : : Mode : : ALL ; <nl> - <nl> - / / / Parser SELECT lists and UNION type , must have UNION <nl> - auto union_parser = [ & ] ( auto & parser , auto mode ) <nl> - { <nl> - if ( ! parser . parse ( pos , list_node , expected ) ) <nl> - { <nl> - pos = begin ; <nl> - expected = current_expected ; <nl> - return false ; <nl> - } <nl> - / / / number of SELECT lists should not less than 2 <nl> - if ( list_node - > children . size ( ) < 2 ) <nl> - { <nl> - pos = begin ; <nl> - expected = current_expected ; <nl> - return false ; <nl> - } <nl> - union_mode = mode ; <nl> - return true ; <nl> - } ; <nl> - <nl> - / / / We first parse : SELECT . . . UNION SELECT . . . <nl> - / / / SELECT . . . UNION ALL SELECT . . . <nl> - / / / SELECT . . . UNION DISTINCT SELECT . . . <nl> - if ( ! union_parser ( parser_union , ASTSelectWithUnionQuery : : Mode : : Unspecified ) <nl> - & & ! union_parser ( parser_union_all , ASTSelectWithUnionQuery : : Mode : : ALL ) <nl> - & & ! union_parser ( parser_union_distinct , ASTSelectWithUnionQuery : : Mode : : DISTINCT ) ) <nl> - { <nl> - / / / If above parse failed , we back to parse SELECT without UNION <nl> - if ( ! parser_union . parse ( pos , list_node , expected ) ) <nl> - return false ; <nl> - } <nl> + if ( ! parser . parse ( pos , list_node , expected ) ) <nl> + return false ; <nl> <nl> auto select_with_union_query = std : : make_shared < ASTSelectWithUnionQuery > ( ) ; <nl> <nl> node = select_with_union_query ; <nl> select_with_union_query - > list_of_selects = std : : make_shared < ASTExpressionList > ( ) ; <nl> select_with_union_query - > children . push_back ( select_with_union_query - > list_of_selects ) ; <nl> - select_with_union_query - > mode = union_mode ; <nl> + select_with_union_query - > union_modes = parser . getUnionModes ( ) ; <nl> <nl> / / flatten inner union query <nl> for ( auto & child : list_node - > children ) <nl>

fix

ClickHouse/ClickHouse

a9e4c7144c1d4b139bde4a0c6884eef7bd99e97a

2020-10-26T09:33:34Z

mmm a / lib / Sema / ConstraintLocator . cpp <nl> ppp b / lib / Sema / ConstraintLocator . cpp <nl> void ConstraintLocator : : Profile ( llvm : : FoldingSetNodeID & id , Expr * anchor , <nl> <nl> void ConstraintLocator : : dump ( SourceManager * sm ) { <nl> dump ( sm , llvm : : errs ( ) ) ; <nl> + llvm : : errs ( ) < < " \ n " ; <nl> } <nl> <nl> void ConstraintLocator : : dump ( SourceManager * sm , raw_ostream & out ) { <nl>

add \ n to another debugging dump ( ) method .

apple/swift

5e8b90d23b58bb7d36f9d3e77cfea0b57bb456c5

2015-04-28T03:41:53Z

mmm a / code / data_structures / src / list / singly_linked_list / operations / rotate_a_linked_list_by_k_nodes / rotate_a_linked_list_by_k_nodes . cpp <nl> ppp b / code / data_structures / src / list / singly_linked_list / operations / rotate_a_linked_list_by_k_nodes / rotate_a_linked_list_by_k_nodes . cpp <nl> class node { <nl> node * next ; <nl> <nl> node ( int data ) { <nl> - this - > data = data ; <nl> - next = NULL ; <nl> - } <nl> + this - > data = data ; <nl> + next = NULL ; <nl> + } <nl> } ; <nl> <nl> node * insert ( ) { <nl> - / / no . of values to insert <nl> - std : : cout < < " Enter no . of nodes you want to insert in linked list : " < < " \ n " ; <nl> - int n ; <nl> - std : : cin > > n ; <nl> - node * head = NULL ; <nl> - node * temp = head ; <nl> + / / no . of values to insert <nl> + std : : cout < < " Enter no . of nodes you want to insert in linked list : " < < " \ n " ; <nl> + int n ; <nl> + std : : cin > > n ; <nl> + node * head = NULL ; <nl> + node * temp = head ; <nl> <nl> - std : : cout < < " Enter " < < n < < " values of linked list : " < < " \ n " ; <nl> - for ( int i = 0 ; i < n ; i + + ) { <nl> - int value ; <nl> - std : : cin > > value ; <nl> - if ( i = = 0 ) { <nl> - / / insert at head <nl> - head = new node ( value ) ; <nl> - temp = head ; <nl> - continue ; <nl> - } else { <nl> - temp - > next = new node ( value ) ; <nl> - temp = temp - > next ; <nl> - } <nl> - } <nl> - return head ; <nl> + std : : cout < < " Enter " < < n < < " values of linked list : " < < " \ n " ; <nl> + for ( int i = 0 ; i < n ; i + + ) { <nl> + int value ; <nl> + std : : cin > > value ; <nl> + if ( i = = 0 ) { <nl> + / / insert at head <nl> + head = new node ( value ) ; <nl> + temp = head ; <nl> + continue ; <nl> + } else { <nl> + temp - > next = new node ( value ) ; <nl> + temp = temp - > next ; <nl> + } <nl> + } <nl> + return head ; <nl> } <nl> <nl> node * rotate ( node * head , int k ) { <nl> - / / first check whether k is small or greater than length of linked list <nl> - / / so first find length of linked list <nl> - int len = 0 ; <nl> - node * temp = head ; <nl> - while ( temp ! = NULL ) { <nl> - temp = temp - > next ; <nl> - len + + ; <nl> - } <nl> - / / length of linked list = len <nl> + / / first check whether k is small or greater than length of linked list <nl> + / / so first find length of linked list <nl> + int len = 0 ; <nl> + node * temp = head ; <nl> + while ( temp ! = NULL ) { <nl> + temp = temp - > next ; <nl> + len + + ; <nl> + } <nl> + / / length of linked list = len <nl> <nl> - / / update k according to length of linked list <nl> - / / because k can be greater than length of linked list <nl> - k = k % len ; <nl> + / / update k according to length of linked list <nl> + / / because k can be greater than length of linked list <nl> + k = k % len ; <nl> <nl> - if ( k = = 0 ) { <nl> - / / since when k is multiple of len its mod becomes zero <nl> - / / so we have to correct it <nl> - k = len ; <nl> - } <nl> - if ( k = = len ) { <nl> - / / since if k = = len then even after rotating it linked list will remain same <nl> - return head ; <nl> - } <nl> + if ( k = = 0 ) { <nl> + / / since when k is multiple of len its mod becomes zero <nl> + / / so we have to correct it <nl> + k = len ; <nl> + } <nl> + if ( k = = len ) { <nl> + / / since if k = = len then even after rotating it linked list will remain same <nl> + return head ; <nl> + } <nl> <nl> - int count = 1 ; <nl> - temp = head ; <nl> - while ( count < k and temp ! = NULL ) { <nl> - temp = temp - > next ; <nl> - count + + ; <nl> - } <nl> + int count = 1 ; <nl> + temp = head ; <nl> + while ( count < k and temp ! = NULL ) { <nl> + temp = temp - > next ; <nl> + count + + ; <nl> + } <nl> <nl> - node * newHead = temp - > next ; <nl> - temp - > next = NULL ; <nl> - temp = newHead ; <nl> + node * newHead = temp - > next ; <nl> + temp - > next = NULL ; <nl> + temp = newHead ; <nl> <nl> - while ( temp - > next ! = NULL ) { <nl> - temp = temp - > next ; <nl> - } <nl> - temp - > next = head ; <nl> - return newHead ; <nl> + while ( temp - > next ! = NULL ) { <nl> + temp = temp - > next ; <nl> + } <nl> + temp - > next = head ; <nl> + return newHead ; <nl> } <nl> <nl> void printList ( node * head ) { <nl> - node * temp = head ; <nl> - while ( temp ! = NULL ) { <nl> - std : : cout < < temp - > data < < " - - > " ; <nl> - temp = temp - > next ; <nl> - } <nl> - std : : cout < < " NULL " < < " \ n " ; <nl> - return ; <nl> + node * temp = head ; <nl> + while ( temp ! = NULL ) { <nl> + std : : cout < < temp - > data < < " - - > " ; <nl> + temp = temp - > next ; <nl> + } <nl> + std : : cout < < " NULL " < < " \ n " ; <nl> + return ; <nl> } <nl> <nl> int main ( ) { <nl> - node * head = insert ( ) ; <nl> - printList ( head ) ; <nl> - std : : cout < < " Enter value of k : " < < " \ n " ; <nl> - int k ; <nl> - std : : cin > > k ; <nl> - head = rotate ( head , k ) ; <nl> - std : : cout < < " After rotation : " < < " \ n " ; <nl> - printList ( head ) ; <nl> - return 0 ; <nl> + node * head = insert ( ) ; <nl> + printList ( head ) ; <nl> + std : : cout < < " Enter value of k : " < < " \ n " ; <nl> + int k ; <nl> + std : : cin > > k ; <nl> + head = rotate ( head , k ) ; <nl> + std : : cout < < " After rotation : " < < " \ n " ; <nl> + printList ( head ) ; <nl> + return 0 ; <nl> } <nl> <nl> / / Input and Output : <nl>

Update rotate_a_linked_list_by_k_nodes . cpp

OpenGenus/cosmos

5d7bf52d90cb63a0eb6f42595c8ef1065ee8e027

2020-03-27T06:12:57Z

mmm a / tensorflow / python / tpu / tensor_tracer . py <nl> ppp b / tensorflow / python / tpu / tensor_tracer . py <nl> def __init__ ( self ) : <nl> self . _report_proto = None <nl> self . _temp_cache_var = [ ] <nl> self . _report_proto_path = ' ' <nl> + self . _outmost_context = None <nl> <nl> def report_proto ( self ) : <nl> " " " Getter for tensor_tracer . proto object for summary and full_tensor_summary modes . <nl> def _is_in_control_flow ( self , op ) : <nl> " " " <nl> return control_flow_util . IsInCond ( op ) <nl> <nl> + def _is_in_outmost_while_loop ( self , op ) : <nl> + ctxt = self . _get_op_control_flow_context ( op ) <nl> + outer_while_context = control_flow_util . GetContainingWhileContext ( ctxt ) <nl> + return outer_while_context = = control_flow_util . GetContainingWhileContext ( <nl> + self . _outmost_context ) <nl> + <nl> def _should_trace_in_control_flow ( self ) : <nl> " " " Returns false incase it is not safe to trace ops in tf . cond or tf . while_loop . " " " <nl> # As different from the other trace modes , TRACE_MODE_OPTIONAL_SUMMARY <nl> def _skip_op ( self , op_id , op , ops_in_exec_path , report_handler ) : <nl> report_handler . instrument_op ( <nl> op , TensorTracer . reason ( op_id , _REASON_NOT_EXECUTED ) ) <nl> return True <nl> - if self . _is_in_control_flow ( op ) : <nl> + if self . _is_in_control_flow ( op ) or not self . _is_in_outmost_while_loop ( op ) : <nl> if not self . _should_trace_in_control_flow ( ) : <nl> report_handler . instrument_op ( <nl> op , TensorTracer . reason ( op_id , _REASON_IN_CONTROL_FLOW ) ) <nl> def _determine_trace_and_create_report ( self , graph , ops_in_exec_path ) : <nl> report_handler = tensor_tracer_report . TTReportHandle ( ) <nl> traced_tensors = self . _determine_and_instrument_traced_tensors ( <nl> graph_order , ops_in_exec_path , tensor_trace_points , report_handler ) <nl> + logging . info ( ' TensorTracer is tracing % d tensors . ' , len ( traced_tensors ) ) <nl> <nl> tensor_trace_order = tensor_tracer_report . TensorTraceOrder ( graph_order , <nl> traced_tensors ) <nl> def _cast_unsupported_dtypes ( tensor ) : <nl> <nl> trace_mode = self . _parameters . trace_mode <nl> device_type = self . _tt_config . device_type <nl> + # pylint : disable = protected - access <nl> + self . _outmost_context = graph . _get_control_flow_context ( ) <nl> + # pylint : enable = protected - access <nl> <nl> analytics . track_usage ( ' tensor_tracer ' , [ trace_mode , device_type ] ) <nl> TensorTracer . check_device_type ( device_type ) <nl> def _cast_unsupported_dtypes ( tensor ) : <nl> tensor_fetch_set = set ( processed_t_fetches ) <nl> tracing_ops = [ ] <nl> <nl> - # pylint : disable = protected - access <nl> - current_control_flow_context = graph . _get_control_flow_context ( ) <nl> - # pylint : enable = protected - access <nl> - <nl> sorted_exec_op_list = list ( exec_op_set ) <nl> sorted_exec_op_list . sort ( key = lambda op : op . name ) <nl> # Trace ops only if they are in the execution path . <nl> def conditional_trace_fn ( predicate_tensor , out_tensor , trace_fn , <nl> <nl> if op_control_flow_context : <nl> # pylint : disable = protected - access <nl> - graph . _set_control_flow_context ( current_control_flow_context ) <nl> + graph . _set_control_flow_context ( self . _outmost_context ) <nl> # pylint : enable = protected - access <nl> if trace_op : <nl> if is_a_fetched_tensor : <nl> def conditional_trace_fn ( predicate_tensor , out_tensor , trace_fn , <nl> # pylint : enable = protected - access <nl> <nl> # pylint : disable = protected - access <nl> - graph . _set_control_flow_context ( current_control_flow_context ) <nl> + graph . _set_control_flow_context ( self . _outmost_context ) <nl> # pylint : enable = protected - access <nl> if tracing_ops : <nl> # If we are tracing a fetched tensor , their dependency is stored in <nl>

Fixing trace of a while loop operation .

tensorflow/tensorflow

e25c02773ccbc4b6f35e86d1703b90431f00ef49

2020-09-24T16:58:16Z

mmm a / src / rdb_protocol / terms / db_table . cc <nl> ppp b / src / rdb_protocol / terms / db_table . cc <nl> name_string_t get_name ( counted_t < val_t > val , const term_t * caller ) { <nl> / / Meta operations ( BUT NOT TABLE TERMS ) should inherit from this . It will <nl> / / handle a lot of the nasty semilattice initialization stuff for them , <nl> / / including the thread switching . <nl> - class meta_op_t : public op_term_t { <nl> + class meta_op_term_t : public op_term_t { <nl> public : <nl> - meta_op_t ( compile_env_t * env , protob_t < const Term > term , argspec_t argspec , <nl> + meta_op_term_t ( compile_env_t * env , protob_t < const Term > term , argspec_t argspec , <nl> optargspec_t optargspec = optargspec_t ( { } ) ) <nl> : op_term_t ( env , std : : move ( term ) , std : : move ( argspec ) , std : : move ( optargspec ) ) { } <nl> <nl> struct rethreading_metadata_accessor_t : public on_thread_t { <nl> } ; <nl> <nl> <nl> - class meta_write_op_t : public meta_op_t { <nl> + class meta_write_op_t : public meta_op_term_t { <nl> public : <nl> meta_write_op_t ( compile_env_t * env , protob_t < const Term > term , argspec_t argspec , <nl> optargspec_t optargspec = optargspec_t ( { } ) ) <nl> - : meta_op_t ( env , std : : move ( term ) , std : : move ( argspec ) , std : : move ( optargspec ) ) { } <nl> + : meta_op_term_t ( env , std : : move ( term ) , std : : move ( argspec ) , std : : move ( optargspec ) ) { } <nl> <nl> protected : <nl> clone_ptr_t < watchable_t < std : : map < peer_id_t , cluster_directory_metadata_t > > > <nl> class meta_write_op_t : public meta_op_t { <nl> } <nl> } ; <nl> <nl> - class db_term_t : public meta_op_t { <nl> + class db_term_t : public meta_op_term_t { <nl> public : <nl> - db_term_t ( compile_env_t * env , const protob_t < const Term > & term ) : meta_op_t ( env , term , argspec_t ( 1 ) ) { } <nl> + db_term_t ( compile_env_t * env , const protob_t < const Term > & term ) : meta_op_term_t ( env , term , argspec_t ( 1 ) ) { } <nl> private : <nl> virtual counted_t < val_t > eval_impl ( scope_env_t * env , UNUSED eval_flags_t flags ) { <nl> name_string_t db_name = get_name ( arg ( env , 0 ) , this ) ; <nl> class table_drop_term_t : public meta_write_op_t { <nl> virtual const char * name ( ) const { return " table_drop " ; } <nl> } ; <nl> <nl> - class db_list_term_t : public meta_op_t { <nl> + class db_list_term_t : public meta_op_term_t { <nl> public : <nl> db_list_term_t ( compile_env_t * env , const protob_t < const Term > & term ) : <nl> - meta_op_t ( env , term , argspec_t ( 0 ) ) { } <nl> + meta_op_term_t ( env , term , argspec_t ( 0 ) ) { } <nl> private : <nl> virtual counted_t < val_t > eval_impl ( scope_env_t * env , UNUSED eval_flags_t flags ) { <nl> std : : vector < std : : string > dbs ; <nl> class db_list_term_t : public meta_op_t { <nl> virtual const char * name ( ) const { return " db_list " ; } <nl> } ; <nl> <nl> - class table_list_term_t : public meta_op_t { <nl> + class table_list_term_t : public meta_op_term_t { <nl> public : <nl> table_list_term_t ( compile_env_t * env , const protob_t < const Term > & term ) : <nl> - meta_op_t ( env , term , argspec_t ( 0 , 1 ) ) { } <nl> + meta_op_term_t ( env , term , argspec_t ( 0 , 1 ) ) { } <nl> private : <nl> virtual counted_t < val_t > eval_impl ( scope_env_t * env , UNUSED eval_flags_t flags ) { <nl> uuid_u db_id ; <nl>

Made meta_op_t be meta_op_term_t .

rethinkdb/rethinkdb

4e3707367f23120b97d920c4fa4a71cd37c81dac

2013-09-13T06:55:20Z

mmm a / src / network / Port . c <nl> ppp b / src / network / Port . c <nl> int swPort_enable_ssl_encrypt ( swListenPort * ls ) <nl> swWarn ( " swSSL_get_context ( ) error . " ) ; <nl> return SW_ERR ; <nl> } <nl> - / * * <nl> - * OpenSSL thread - safe <nl> - * / <nl> - swSSL_init_thread_safety ( ) ; <nl> - <nl> if ( ls - > ssl_option . client_cert_file <nl> & & swSSL_set_client_certificate ( ls - > ssl_context , ls - > ssl_option . client_cert_file , <nl> ls - > ssl_option . verify_depth ) = = SW_ERR ) <nl> mmm a / src / network / Server . c <nl> ppp b / src / network / Server . c <nl> static int swServer_start_check ( swServer * serv ) <nl> ls - > protocol . package_max_length = SW_BUFFER_MIN_SIZE ; <nl> } <nl> } <nl> + <nl> + # ifdef SW_USE_OPENSSL <nl> + / * * <nl> + * OpenSSL thread - safe <nl> + * / <nl> + if ( serv - > factory_mode ! = SW_MODE_SINGLE ) <nl> + { <nl> + swSSL_init_thread_safety ( ) ; <nl> + } <nl> + # endif <nl> + <nl> return SW_OK ; <nl> } <nl> <nl> mmm a / src / protocol / SSL . c <nl> ppp b / src / protocol / SSL . c <nl> static ulong_t swSSL_id_callback ( void ) <nl> <nl> void swSSL_init_thread_safety ( ) <nl> { <nl> + if ( ! openssl_init ) <nl> + { <nl> + return ; <nl> + } <nl> int i ; <nl> lock_array = ( pthread_mutex_t * ) OPENSSL_malloc ( CRYPTO_num_locks ( ) * sizeof ( pthread_mutex_t ) ) ; <nl> for ( i = 0 ; i < CRYPTO_num_locks ( ) ; i + + ) <nl> mmm a / swoole_http . h <nl> ppp b / swoole_http . h <nl> extern zend_class_entry * swoole_http_request_class_entry_ptr ; <nl> extern swString * swoole_http_buffer ; <nl> # ifdef SW_HAVE_ZLIB <nl> extern swString * swoole_zlib_buffer ; <nl> + int swoole_http_response_compress ( swString * body , int level ) ; <nl> # endif <nl> <nl> static sw_inline int http_parse_set_cookies ( const char * at , size_t length , zval * cookies , zval * set_cookie_headers ) <nl> mmm a / swoole_http_server . c <nl> ppp b / swoole_http_server . c <nl> static inline long http_fast_parse ( php_http_parser * parser , char * data , size_t l <nl> # endif <nl> <nl> # ifdef SW_HAVE_ZLIB <nl> - static int http_response_compress ( swString * body , int level ) ; <nl> voidpf php_zlib_alloc ( voidpf opaque , uInt items , uInt size ) ; <nl> void php_zlib_free ( voidpf opaque , voidpf address ) ; <nl> # endif <nl> static PHP_METHOD ( swoole_http_response , write ) <nl> # ifdef SW_HAVE_ZLIB <nl> if ( ctx - > gzip_enable ) <nl> { <nl> - http_response_compress ( & http_body , ctx - > gzip_level ) ; <nl> + swoole_http_response_compress ( & http_body , ctx - > gzip_level ) ; <nl> <nl> hex_string = swoole_dec2hex ( swoole_zlib_buffer - > length , 16 ) ; <nl> hex_len = strlen ( hex_string ) ; <nl> void php_zlib_free ( voidpf opaque , voidpf address ) <nl> efree ( ( void * ) address ) ; <nl> } <nl> <nl> - static int http_response_compress ( swString * body , int level ) <nl> + int swoole_http_response_compress ( swString * body , int level ) <nl> { <nl> assert ( level > 0 | | level < 10 ) ; <nl> <nl> static PHP_METHOD ( swoole_http_response , end ) <nl> { <nl> if ( http_body . length > 0 ) <nl> { <nl> - http_response_compress ( & http_body , ctx - > gzip_level ) ; <nl> + swoole_http_response_compress ( & http_body , ctx - > gzip_level ) ; <nl> } <nl> else <nl> { <nl> mmm a / swoole_http_v2_server . c <nl> ppp b / swoole_http_v2_server . c <nl> static int http2_build_header ( http_context * ctx , uchar * buffer , int body_length <nl> <nl> swServer * serv = SwooleG . serv ; <nl> <nl> - char buf [ SW_HTTP_HEADER_MAX_SIZE ] ; <nl> char * date_str = NULL ; <nl> char intbuf [ 2 ] [ 16 ] ; <nl> <nl> static int http2_build_header ( http_context * ctx , uchar * buffer , int body_length <nl> body_length = swoole_zlib_buffer - > length ; <nl> } <nl> # endif <nl> - ret = swoole_itoa ( buf , body_length ) ; <nl> - http2_add_header ( & nv [ index + + ] , ZEND_STRL ( " content - length " ) , buf , ret ) ; <nl> + ret = swoole_itoa ( intbuf [ 1 ] , body_length ) ; <nl> + http2_add_header ( & nv [ index + + ] , ZEND_STRL ( " content - length " ) , intbuf [ 1 ] , ret ) ; <nl> } <nl> / / http cookies <nl> if ( ctx - > response . zcookie ) <nl> int swoole_http2_do_response ( http_context * ctx , swString * body ) <nl> char header_buffer [ 8192 ] ; <nl> int ret ; <nl> <nl> + # ifdef SW_HAVE_ZLIB <nl> + if ( ctx - > gzip_enable ) <nl> + { <nl> + if ( body - > length > 0 ) <nl> + { <nl> + swoole_http_response_compress ( body , ctx - > gzip_level ) ; <nl> + } <nl> + else <nl> + { <nl> + ctx - > gzip_enable = 0 ; <nl> + } <nl> + } <nl> + # endif <nl> + <nl> ret = http2_build_header ( ctx , ( uchar * ) header_buffer , body - > length TSRMLS_CC ) ; <nl> swString_clear ( swoole_http_buffer ) ; <nl> <nl> int swoole_http2_do_response ( http_context * ctx , swString * body ) <nl> goto _end ; <nl> } <nl> <nl> - char * p = body - > str ; <nl> - size_t l = body - > length ; <nl> + char * p ; <nl> + size_t l ; <nl> size_t send_n ; <nl> <nl> + # ifdef SW_HAVE_ZLIB <nl> + if ( ctx - > gzip_enable ) <nl> + { <nl> + p = swoole_zlib_buffer - > str ; <nl> + l = swoole_zlib_buffer - > length ; <nl> + } <nl> + else <nl> + # endif <nl> + { <nl> + p = body - > str ; <nl> + l = body - > length ; <nl> + } <nl> + <nl> while ( l > 0 ) <nl> { <nl> int _send_flag ; <nl> mmm a / tests / include / config . php <nl> ppp b / tests / include / config . php <nl> <nl> <nl> define ( ' TEST_LOG_FILE ' , ' / tmp / swoole . log ' ) ; <nl> <nl> - define ( ' IS_MAC_OS ' , stripos ( PHP_OS , ' Darwin ' ) ! = = false ) ; <nl> \ No newline at end of file <nl> + define ( ' IS_MAC_OS ' , stripos ( PHP_OS , ' Darwin ' ) ! = = false ) ; <nl> + <nl> + define ( ' SSL_FILE_DIR ' , __DIR__ . ' / api / swoole_http_server / localhost - ssl ' ) ; <nl> new file mode 100644 <nl> index 0000000000 . . bbc1619472 <nl> mmm / dev / null <nl> ppp b / tests / swoole_http_server / gzip_http2 . phpt <nl> <nl> + - - TEST - - <nl> + swoole_http_server : gzip with http2 <nl> + - - SKIPIF - - <nl> + < ? php require __DIR__ . ' / . . / include / skipif . inc ' ; ? > <nl> + - - FILE - - <nl> + < ? php <nl> + require_once __DIR__ . ' / . . / include / bootstrap . php ' ; <nl> + require_once __DIR__ . ' / . . / include / swoole . inc ' ; <nl> + <nl> + $ pm = new ProcessManager ; <nl> + $ pm - > parentFunc = function ( $ pid ) use ( $ pm ) <nl> + { <nl> + go ( function ( ) use ( $ pm ) { <nl> + $ domain = ' 127 . 0 . 0 . 1 ' ; <nl> + $ cli = new Swoole \ Coroutine \ Http2 \ Client ( $ domain , 9501 , true ) ; <nl> + $ cli - > set ( [ <nl> + ' timeout ' = > - 1 , <nl> + ] ) ; <nl> + $ cli - > connect ( ) ; <nl> + <nl> + $ req = new swoole_http2_request ; <nl> + $ req - > path = ' / ' ; <nl> + $ req - > headers = [ <nl> + ' Host ' = > $ domain , <nl> + " User - Agent " = > ' Chrome / 49 . 0 . 2587 . 3 ' , <nl> + ' Accept ' = > ' text / html , application / xhtml + xml , application / xml ' , <nl> + ' Accept - encoding ' = > ' gzip ' <nl> + ] ; <nl> + <nl> + assert ( $ cli - > send ( $ req ) ) ; <nl> + $ response = $ cli - > recv ( ) ; <nl> + assert ( $ response - > statusCode = = = 200 ) ; <nl> + $ pm - > kill ( ) ; <nl> + } ) ; <nl> + swoole_event : : wait ( ) ; <nl> + } ; <nl> + <nl> + $ pm - > childFunc = function ( ) use ( $ pm ) <nl> + { <nl> + $ http = new swoole_http_server ( " 127 . 0 . 0 . 1 " , 9501 , SWOOLE_BASE , SWOOLE_SOCK_TCP | SWOOLE_SSL ) ; <nl> + <nl> + $ http - > set ( [ <nl> + / / ' log_file ' = > ' / dev / null ' , <nl> + ' open_http2_protocol ' = > true , <nl> + ' ssl_cert_file ' = > SSL_FILE_DIR . ' / server . crt ' , <nl> + ' ssl_key_file ' = > SSL_FILE_DIR . ' / server . key ' , <nl> + ] ) ; <nl> + <nl> + $ http - > on ( " WorkerStart " , function ( $ serv , $ wid ) { <nl> + global $ pm ; <nl> + $ pm - > wakeup ( ) ; <nl> + } ) ; <nl> + <nl> + $ http - > on ( " request " , function ( $ request , swoole_http_response $ response ) { <nl> + $ response - > gzip ( 9 ) ; <nl> + $ response - > end ( " < h1 > hello world < / h1 > < p > " . str_repeat ( ' A ' , 1024 ) . " < / p > " ) ; <nl> + } ) ; <nl> + <nl> + $ http - > start ( ) ; <nl> + } ; <nl> + <nl> + $ pm - > childFirst ( ) ; <nl> + $ pm - > run ( ) ; <nl> + ? > <nl> + - - EXPECT - - <nl>

fixed

swoole/swoole-src

7160e795b34ac94375a3cb3976344b5ecaaa4159

2018-07-24T10:04:29Z

mmm a / lib / Sema / TypeCheckDecl . cpp <nl> ppp b / lib / Sema / TypeCheckDecl . cpp <nl> static void finalizeType ( TypeChecker & TC , NominalTypeDecl * nominal ) { <nl> <nl> TC . validateDecl ( VD ) ; <nl> <nl> + TC . requestMemberLayout ( VD ) ; <nl> + <nl> / / The only thing left to do is synthesize storage for lazy variables . <nl> auto * prop = dyn_cast < VarDecl > ( D ) ; <nl> if ( ! prop ) <nl>

[ Type checker ] Request member layout for a member of a finalized type .

apple/swift

e8454ab8ab87afa92b999ef004477000ee60da41

2018-07-18T21:50:40Z

mmm a / include / gmock / gmock - matchers . h <nl> ppp b / include / gmock / gmock - matchers . h <nl> class ElementsAreArrayMatcher { <nl> GTEST_DISALLOW_ASSIGN_ ( ElementsAreArrayMatcher ) ; <nl> } ; <nl> <nl> + / / Given a 2 - tuple matcher tm of type Tuple2Matcher and a value second <nl> + / / of type Second , BoundSecondMatcher < Tuple2Matcher , Second > ( tm , <nl> + / / second ) is a polymorphic matcher that matches a value x iff tm <nl> + / / matches tuple ( x , second ) . Useful for implementing <nl> + / / UnorderedPointwise ( ) in terms of UnorderedElementsAreArray ( ) . <nl> + / / <nl> + / / BoundSecondMatcher is copyable and assignable , as we need to put <nl> + / / instances of this class in a vector when implementing <nl> + / / UnorderedPointwise ( ) . <nl> + template < typename Tuple2Matcher , typename Second > <nl> + class BoundSecondMatcher { <nl> + public : <nl> + BoundSecondMatcher ( const Tuple2Matcher & tm , const Second & second ) <nl> + : tuple2_matcher_ ( tm ) , second_value_ ( second ) { } <nl> + <nl> + template < typename T > <nl> + operator Matcher < T > ( ) const { <nl> + return MakeMatcher ( new Impl < T > ( tuple2_matcher_ , second_value_ ) ) ; <nl> + } <nl> + <nl> + / / We have to define this for UnorderedPointwise ( ) to compile in <nl> + / / C + + 98 mode , as it puts BoundSecondMatcher instances in a vector , <nl> + / / which requires the elements to be assignable in C + + 98 . The <nl> + / / compiler cannot generate the operator = for us , as Tuple2Matcher <nl> + / / and Second may not be assignable . <nl> + / / <nl> + / / However , this should never be called , so the implementation just <nl> + / / need to assert . <nl> + void operator = ( const BoundSecondMatcher & / * rhs * / ) { <nl> + GTEST_LOG_ ( FATAL ) < < " BoundSecondMatcher should never be assigned . " ; <nl> + } <nl> + <nl> + private : <nl> + template < typename T > <nl> + class Impl : public MatcherInterface < T > { <nl> + public : <nl> + typedef : : testing : : tuple < T , Second > ArgTuple ; <nl> + <nl> + Impl ( const Tuple2Matcher & tm , const Second & second ) <nl> + : mono_tuple2_matcher_ ( SafeMatcherCast < const ArgTuple & > ( tm ) ) , <nl> + second_value_ ( second ) { } <nl> + <nl> + virtual void DescribeTo ( : : std : : ostream * os ) const { <nl> + * os < < " and " ; <nl> + UniversalPrint ( second_value_ , os ) ; <nl> + * os < < " " ; <nl> + mono_tuple2_matcher_ . DescribeTo ( os ) ; <nl> + } <nl> + <nl> + virtual bool MatchAndExplain ( T x , MatchResultListener * listener ) const { <nl> + return mono_tuple2_matcher_ . MatchAndExplain ( ArgTuple ( x , second_value_ ) , <nl> + listener ) ; <nl> + } <nl> + <nl> + private : <nl> + const Matcher < const ArgTuple & > mono_tuple2_matcher_ ; <nl> + const Second second_value_ ; <nl> + <nl> + GTEST_DISALLOW_ASSIGN_ ( Impl ) ; <nl> + } ; <nl> + <nl> + const Tuple2Matcher tuple2_matcher_ ; <nl> + const Second second_value_ ; <nl> + } ; <nl> + <nl> + / / Given a 2 - tuple matcher tm and a value second , <nl> + / / MatcherBindSecond ( tm , second ) returns a matcher that matches a <nl> + / / value x iff tm matches tuple ( x , second ) . Useful for implementing <nl> + / / UnorderedPointwise ( ) in terms of UnorderedElementsAreArray ( ) . <nl> + template < typename Tuple2Matcher , typename Second > <nl> + BoundSecondMatcher < Tuple2Matcher , Second > MatcherBindSecond ( <nl> + const Tuple2Matcher & tm , const Second & second ) { <nl> + return BoundSecondMatcher < Tuple2Matcher , Second > ( tm , second ) ; <nl> + } <nl> + <nl> / / Returns the description for a matcher defined using the MATCHER * ( ) <nl> / / macro where the user - supplied description string is " " , if <nl> / / ' negation ' is false ; otherwise returns the description of the <nl> inline internal : : PointwiseMatcher < TupleMatcher , <nl> GTEST_REMOVE_CONST_ ( Container ) > <nl> Pointwise ( const TupleMatcher & tuple_matcher , const Container & rhs ) { <nl> / / This following line is for working around a bug in MSVC 8 . 0 , <nl> - / / which causes Container to be a const type sometimes . <nl> + / / which causes Container to be a const type sometimes ( e . g . when <nl> + / / rhs is a const int [ ] ) . . <nl> typedef GTEST_REMOVE_CONST_ ( Container ) RawContainer ; <nl> return internal : : PointwiseMatcher < TupleMatcher , RawContainer > ( <nl> tuple_matcher , rhs ) ; <nl> } <nl> <nl> + # if GTEST_HAS_STD_INITIALIZER_LIST_ <nl> + <nl> + / / Supports the Pointwise ( m , { a , b , c } ) syntax . <nl> + template < typename TupleMatcher , typename T > <nl> + inline internal : : PointwiseMatcher < TupleMatcher , std : : vector < T > > Pointwise ( <nl> + const TupleMatcher & tuple_matcher , std : : initializer_list < T > rhs ) { <nl> + return Pointwise ( tuple_matcher , std : : vector < T > ( rhs ) ) ; <nl> + } <nl> + <nl> + # endif / / GTEST_HAS_STD_INITIALIZER_LIST_ <nl> + <nl> + / / UnorderedPointwise ( pair_matcher , rhs ) matches an STL - style <nl> + / / container or a native array that contains the same number of <nl> + / / elements as in rhs , where in some permutation of the container , its <nl> + / / i - th element and rhs ' s i - th element ( as a pair ) satisfy the given <nl> + / / pair matcher , for all i . Tuple2Matcher must be able to be safely <nl> + / / cast to Matcher < tuple < const T1 & , const T2 & > > , where T1 and T2 are <nl> + / / the types of elements in the LHS container and the RHS container <nl> + / / respectively . <nl> + / / <nl> + / / This is like Pointwise ( pair_matcher , rhs ) , except that the element <nl> + / / order doesn ' t matter . <nl> + template < typename Tuple2Matcher , typename RhsContainer > <nl> + inline internal : : UnorderedElementsAreArrayMatcher < <nl> + typename internal : : BoundSecondMatcher < <nl> + Tuple2Matcher , typename internal : : StlContainerView < GTEST_REMOVE_CONST_ ( <nl> + RhsContainer ) > : : type : : value_type > > <nl> + UnorderedPointwise ( const Tuple2Matcher & tuple2_matcher , <nl> + const RhsContainer & rhs_container ) { <nl> + / / This following line is for working around a bug in MSVC 8 . 0 , <nl> + / / which causes RhsContainer to be a const type sometimes ( e . g . when <nl> + / / rhs_container is a const int [ ] ) . <nl> + typedef GTEST_REMOVE_CONST_ ( RhsContainer ) RawRhsContainer ; <nl> + <nl> + / / RhsView allows the same code to handle RhsContainer being a <nl> + / / STL - style container and it being a native C - style array . <nl> + typedef typename internal : : StlContainerView < RawRhsContainer > RhsView ; <nl> + typedef typename RhsView : : type RhsStlContainer ; <nl> + typedef typename RhsStlContainer : : value_type Second ; <nl> + const RhsStlContainer & rhs_stl_container = <nl> + RhsView : : ConstReference ( rhs_container ) ; <nl> + <nl> + / / Create a matcher for each element in rhs_container . <nl> + : : std : : vector < internal : : BoundSecondMatcher < Tuple2Matcher , Second > > matchers ; <nl> + for ( typename RhsStlContainer : : const_iterator it = rhs_stl_container . begin ( ) ; <nl> + it ! = rhs_stl_container . end ( ) ; + + it ) { <nl> + matchers . push_back ( <nl> + internal : : MatcherBindSecond ( tuple2_matcher , * it ) ) ; <nl> + } <nl> + <nl> + / / Delegate the work to UnorderedElementsAreArray ( ) . <nl> + return UnorderedElementsAreArray ( matchers ) ; <nl> + } <nl> + <nl> + # if GTEST_HAS_STD_INITIALIZER_LIST_ <nl> + <nl> + / / Supports the UnorderedPointwise ( m , { a , b , c } ) syntax . <nl> + template < typename Tuple2Matcher , typename T > <nl> + inline internal : : UnorderedElementsAreArrayMatcher < <nl> + typename internal : : BoundSecondMatcher < Tuple2Matcher , T > > <nl> + UnorderedPointwise ( const Tuple2Matcher & tuple2_matcher , <nl> + std : : initializer_list < T > rhs ) { <nl> + return UnorderedPointwise ( tuple2_matcher , std : : vector < T > ( rhs ) ) ; <nl> + } <nl> + <nl> + # endif / / GTEST_HAS_STD_INITIALIZER_LIST_ <nl> + <nl> / / Matches an STL - style container or a native array that contains at <nl> / / least one element matching the given value or matcher . <nl> / / <nl> mmm a / test / gmock - matchers_test . cc <nl> ppp b / test / gmock - matchers_test . cc <nl> using std : : ostream ; <nl> using std : : pair ; <nl> using std : : set ; <nl> using std : : stringstream ; <nl> - using testing : : get ; <nl> - using testing : : make_tuple ; <nl> - using testing : : tuple ; <nl> using std : : vector ; <nl> using testing : : A ; <nl> using testing : : AllArgs ; <nl> using testing : : Ref ; <nl> using testing : : ResultOf ; <nl> using testing : : SizeIs ; <nl> using testing : : StartsWith ; <nl> - using testing : : StringMatchResultListener ; <nl> using testing : : StrCaseEq ; <nl> using testing : : StrCaseNe ; <nl> using testing : : StrEq ; <nl> using testing : : StrNe ; <nl> + using testing : : StringMatchResultListener ; <nl> using testing : : Truly ; <nl> using testing : : TypedEq ; <nl> + using testing : : UnorderedPointwise ; <nl> using testing : : Value ; <nl> using testing : : WhenSorted ; <nl> using testing : : WhenSortedBy ; <nl> using testing : : _ ; <nl> + using testing : : get ; <nl> using testing : : internal : : DummyMatchResultListener ; <nl> using testing : : internal : : ElementMatcherPair ; <nl> using testing : : internal : : ElementMatcherPairs ; <nl> using testing : : internal : : Strings ; <nl> using testing : : internal : : linked_ptr ; <nl> using testing : : internal : : scoped_ptr ; <nl> using testing : : internal : : string ; <nl> + using testing : : make_tuple ; <nl> + using testing : : tuple ; <nl> <nl> / / For testing ExplainMatchResultTo ( ) . <nl> class GreaterThanMatcher : public MatcherInterface < int > { <nl> TEST ( ContainerEqExtraTest , WorksForMaps ) { <nl> } <nl> <nl> TEST ( ContainerEqExtraTest , WorksForNativeArray ) { <nl> - int a1 [ ] = { 1 , 2 , 3 } ; <nl> - int a2 [ ] = { 1 , 2 , 3 } ; <nl> - int b [ ] = { 1 , 2 , 4 } ; <nl> + int a1 [ ] = { 1 , 2 , 3 } ; <nl> + int a2 [ ] = { 1 , 2 , 3 } ; <nl> + int b [ ] = { 1 , 2 , 4 } ; <nl> <nl> EXPECT_THAT ( a1 , ContainerEq ( a2 ) ) ; <nl> EXPECT_THAT ( a1 , Not ( ContainerEq ( b ) ) ) ; <nl> } <nl> <nl> TEST ( ContainerEqExtraTest , WorksForTwoDimensionalNativeArray ) { <nl> - const char a1 [ ] [ 3 ] = { " hi " , " lo " } ; <nl> - const char a2 [ ] [ 3 ] = { " hi " , " lo " } ; <nl> - const char b [ ] [ 3 ] = { " lo " , " hi " } ; <nl> + const char a1 [ ] [ 3 ] = { " hi " , " lo " } ; <nl> + const char a2 [ ] [ 3 ] = { " hi " , " lo " } ; <nl> + const char b [ ] [ 3 ] = { " lo " , " hi " } ; <nl> <nl> / / Tests using ContainerEq ( ) in the first dimension . <nl> EXPECT_THAT ( a1 , ContainerEq ( a2 ) ) ; <nl> TEST ( ContainerEqExtraTest , WorksForTwoDimensionalNativeArray ) { <nl> } <nl> <nl> TEST ( ContainerEqExtraTest , WorksForNativeArrayAsTuple ) { <nl> - const int a1 [ ] = { 1 , 2 , 3 } ; <nl> - const int a2 [ ] = { 1 , 2 , 3 } ; <nl> - const int b [ ] = { 1 , 2 , 3 , 4 } ; <nl> + const int a1 [ ] = { 1 , 2 , 3 } ; <nl> + const int a2 [ ] = { 1 , 2 , 3 } ; <nl> + const int b [ ] = { 1 , 2 , 3 , 4 } ; <nl> <nl> const int * const p1 = a1 ; <nl> EXPECT_THAT ( make_tuple ( p1 , 3 ) , ContainerEq ( a2 ) ) ; <nl> EXPECT_THAT ( make_tuple ( p1 , 3 ) , Not ( ContainerEq ( b ) ) ) ; <nl> <nl> - const int c [ ] = { 1 , 3 , 2 } ; <nl> + const int c [ ] = { 1 , 3 , 2 } ; <nl> EXPECT_THAT ( make_tuple ( p1 , 3 ) , Not ( ContainerEq ( c ) ) ) ; <nl> } <nl> <nl> TEST ( ContainerEqExtraTest , CopiesNativeArrayParameter ) { <nl> std : : string a1 [ ] [ 3 ] = { <nl> - { " hi " , " hello " , " ciao " } , <nl> - { " bye " , " see you " , " ciao " } <nl> + { " hi " , " hello " , " ciao " } , <nl> + { " bye " , " see you " , " ciao " } <nl> } ; <nl> <nl> std : : string a2 [ ] [ 3 ] = { <nl> - { " hi " , " hello " , " ciao " } , <nl> - { " bye " , " see you " , " ciao " } <nl> + { " hi " , " hello " , " ciao " } , <nl> + { " bye " , " see you " , " ciao " } <nl> } ; <nl> <nl> const Matcher < const std : : string ( & ) [ 2 ] [ 3 ] > m = ContainerEq ( a2 ) ; <nl> TEST ( WhenSortedByTest , WorksForNonVectorContainer ) { <nl> } <nl> <nl> TEST ( WhenSortedByTest , WorksForNativeArray ) { <nl> - const int numbers [ ] = { 1 , 3 , 2 , 4 } ; <nl> - const int sorted_numbers [ ] = { 1 , 2 , 3 , 4 } ; <nl> + const int numbers [ ] = { 1 , 3 , 2 , 4 } ; <nl> + const int sorted_numbers [ ] = { 1 , 2 , 3 , 4 } ; <nl> EXPECT_THAT ( numbers , WhenSortedBy ( less < int > ( ) , ElementsAre ( 1 , 2 , 3 , 4 ) ) ) ; <nl> EXPECT_THAT ( numbers , WhenSortedBy ( less < int > ( ) , <nl> ElementsAreArray ( sorted_numbers ) ) ) ; <nl> TEST ( WhenSortedByTest , CanDescribeSelf ) { <nl> } <nl> <nl> TEST ( WhenSortedByTest , ExplainsMatchResult ) { <nl> - const int a [ ] = { 2 , 1 } ; <nl> + const int a [ ] = { 2 , 1 } ; <nl> EXPECT_EQ ( " which is { 1 , 2 } when sorted , whose element # 0 doesn ' t match " , <nl> Explain ( WhenSortedBy ( less < int > ( ) , ElementsAre ( 2 , 3 ) ) , a ) ) ; <nl> EXPECT_EQ ( " which is { 1 , 2 } when sorted " , <nl> class Streamlike { <nl> } ; <nl> <nl> TEST ( StreamlikeTest , Iteration ) { <nl> - const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> + const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> Streamlike < int > s ( a , a + 5 ) ; <nl> Streamlike < int > : : const_iterator it = s . begin ( ) ; <nl> const int * ip = a ; <nl> TEST ( BeginEndDistanceIsTest , WorksWithForwardList ) { <nl> # endif / / GTEST_LANG_CXX11 <nl> <nl> TEST ( BeginEndDistanceIsTest , WorksWithNonStdList ) { <nl> - const int a [ 5 ] = { 1 , 2 , 3 , 4 , 5 } ; <nl> + const int a [ 5 ] = { 1 , 2 , 3 , 4 , 5 } ; <nl> Streamlike < int > s ( a , a + 5 ) ; <nl> EXPECT_THAT ( s , BeginEndDistanceIs ( 5 ) ) ; <nl> } <nl> TEST ( BeginEndDistanceIsTest , ExplainsResult ) { <nl> TEST ( WhenSortedTest , WorksForStreamlike ) { <nl> / / Streamlike ' container ' provides only minimal iterator support . <nl> / / Its iterators are tagged with input_iterator_tag . <nl> - const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> + const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> Streamlike < int > s ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> EXPECT_THAT ( s , WhenSorted ( ElementsAre ( 1 , 2 , 3 , 4 , 5 ) ) ) ; <nl> EXPECT_THAT ( s , Not ( WhenSorted ( ElementsAre ( 2 , 1 , 4 , 5 , 3 ) ) ) ) ; <nl> } <nl> <nl> TEST ( WhenSortedTest , WorksForVectorConstRefMatcherOnStreamlike ) { <nl> - const int a [ ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> + const int a [ ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> Streamlike < int > s ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> Matcher < const std : : vector < int > & > vector_match = ElementsAre ( 1 , 2 , 3 , 4 , 5 ) ; <nl> EXPECT_THAT ( s , WhenSorted ( vector_match ) ) ; <nl> TEST ( WhenSortedTest , WorksForVectorConstRefMatcherOnStreamlike ) { <nl> / / " containers " . <nl> <nl> TEST ( ElemensAreStreamTest , WorksForStreamlike ) { <nl> - const int a [ 5 ] = { 1 , 2 , 3 , 4 , 5 } ; <nl> + const int a [ 5 ] = { 1 , 2 , 3 , 4 , 5 } ; <nl> Streamlike < int > s ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> EXPECT_THAT ( s , ElementsAre ( 1 , 2 , 3 , 4 , 5 ) ) ; <nl> EXPECT_THAT ( s , Not ( ElementsAre ( 2 , 1 , 4 , 5 , 3 ) ) ) ; <nl> } <nl> <nl> TEST ( ElemensAreArrayStreamTest , WorksForStreamlike ) { <nl> - const int a [ 5 ] = { 1 , 2 , 3 , 4 , 5 } ; <nl> + const int a [ 5 ] = { 1 , 2 , 3 , 4 , 5 } ; <nl> Streamlike < int > s ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> <nl> vector < int > expected ; <nl> TEST ( ElementsAreTest , TakesStlContainer ) { <nl> / / Tests for UnorderedElementsAreArray ( ) <nl> <nl> TEST ( UnorderedElementsAreArrayTest , SucceedsWhenExpected ) { <nl> - const int a [ ] = { 0 , 1 , 2 , 3 , 4 } ; <nl> + const int a [ ] = { 0 , 1 , 2 , 3 , 4 } ; <nl> std : : vector < int > s ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> do { <nl> StringMatchResultListener listener ; <nl> TEST ( UnorderedElementsAreArrayTest , SucceedsWhenExpected ) { <nl> } <nl> <nl> TEST ( UnorderedElementsAreArrayTest , VectorBool ) { <nl> - const bool a [ ] = { 0 , 1 , 0 , 1 , 1 } ; <nl> - const bool b [ ] = { 1 , 0 , 1 , 1 , 0 } ; <nl> + const bool a [ ] = { 0 , 1 , 0 , 1 , 1 } ; <nl> + const bool b [ ] = { 1 , 0 , 1 , 1 , 0 } ; <nl> std : : vector < bool > expected ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> std : : vector < bool > actual ( b , b + GTEST_ARRAY_SIZE_ ( b ) ) ; <nl> StringMatchResultListener listener ; <nl> TEST ( UnorderedElementsAreArrayTest , WorksForStreamlike ) { <nl> / / Streamlike ' container ' provides only minimal iterator support . <nl> / / Its iterators are tagged with input_iterator_tag , and it has no <nl> / / size ( ) or empty ( ) methods . <nl> - const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> + const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> Streamlike < int > s ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> <nl> : : std : : vector < int > expected ; <nl> TEST ( UnorderedElementsAreArrayTest , TakesStlContainer ) { <nl> # if GTEST_HAS_STD_INITIALIZER_LIST_ <nl> <nl> TEST ( UnorderedElementsAreArrayTest , TakesInitializerList ) { <nl> - const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> - EXPECT_THAT ( a , UnorderedElementsAreArray ( { 1 , 2 , 3 , 4 , 5 } ) ) ; <nl> - EXPECT_THAT ( a , Not ( UnorderedElementsAreArray ( { 1 , 2 , 3 , 4 , 6 } ) ) ) ; <nl> + const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> + EXPECT_THAT ( a , UnorderedElementsAreArray ( { 1 , 2 , 3 , 4 , 5 } ) ) ; <nl> + EXPECT_THAT ( a , Not ( UnorderedElementsAreArray ( { 1 , 2 , 3 , 4 , 6 } ) ) ) ; <nl> } <nl> <nl> TEST ( UnorderedElementsAreArrayTest , TakesInitializerListOfCStrings ) { <nl> - const string a [ 5 ] = { " a " , " b " , " c " , " d " , " e " } ; <nl> - EXPECT_THAT ( a , UnorderedElementsAreArray ( { " a " , " b " , " c " , " d " , " e " } ) ) ; <nl> - EXPECT_THAT ( a , Not ( UnorderedElementsAreArray ( { " a " , " b " , " c " , " d " , " ef " } ) ) ) ; <nl> + const string a [ 5 ] = { " a " , " b " , " c " , " d " , " e " } ; <nl> + EXPECT_THAT ( a , UnorderedElementsAreArray ( { " a " , " b " , " c " , " d " , " e " } ) ) ; <nl> + EXPECT_THAT ( a , Not ( UnorderedElementsAreArray ( { " a " , " b " , " c " , " d " , " ef " } ) ) ) ; <nl> } <nl> <nl> TEST ( UnorderedElementsAreArrayTest , TakesInitializerListOfSameTypedMatchers ) { <nl> - const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> + const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> EXPECT_THAT ( a , UnorderedElementsAreArray ( <nl> - { Eq ( 1 ) , Eq ( 2 ) , Eq ( 3 ) , Eq ( 4 ) , Eq ( 5 ) } ) ) ; <nl> + { Eq ( 1 ) , Eq ( 2 ) , Eq ( 3 ) , Eq ( 4 ) , Eq ( 5 ) } ) ) ; <nl> EXPECT_THAT ( a , Not ( UnorderedElementsAreArray ( <nl> - { Eq ( 1 ) , Eq ( 2 ) , Eq ( 3 ) , Eq ( 4 ) , Eq ( 6 ) } ) ) ) ; <nl> + { Eq ( 1 ) , Eq ( 2 ) , Eq ( 3 ) , Eq ( 4 ) , Eq ( 6 ) } ) ) ) ; <nl> } <nl> <nl> TEST ( UnorderedElementsAreArrayTest , <nl> TakesInitializerListOfDifferentTypedMatchers ) { <nl> - const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> + const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> / / The compiler cannot infer the type of the initializer list if its <nl> / / elements have different types . We must explicitly specify the <nl> / / unified element type in this case . <nl> EXPECT_THAT ( a , UnorderedElementsAreArray < Matcher < int > > ( <nl> - { Eq ( 1 ) , Ne ( - 2 ) , Ge ( 3 ) , Le ( 4 ) , Eq ( 5 ) } ) ) ; <nl> + { Eq ( 1 ) , Ne ( - 2 ) , Ge ( 3 ) , Le ( 4 ) , Eq ( 5 ) } ) ) ; <nl> EXPECT_THAT ( a , Not ( UnorderedElementsAreArray < Matcher < int > > ( <nl> - { Eq ( 1 ) , Ne ( - 2 ) , Ge ( 3 ) , Le ( 4 ) , Eq ( 6 ) } ) ) ) ; <nl> + { Eq ( 1 ) , Ne ( - 2 ) , Ge ( 3 ) , Le ( 4 ) , Eq ( 6 ) } ) ) ) ; <nl> } <nl> <nl> # endif / / GTEST_HAS_STD_INITIALIZER_LIST_ <nl> TEST_F ( UnorderedElementsAreTest , WorksWithUncopyable ) { <nl> } <nl> <nl> TEST_F ( UnorderedElementsAreTest , SucceedsWhenExpected ) { <nl> - const int a [ ] = { 1 , 2 , 3 } ; <nl> + const int a [ ] = { 1 , 2 , 3 } ; <nl> std : : vector < int > s ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> do { <nl> StringMatchResultListener listener ; <nl> TEST_F ( UnorderedElementsAreTest , SucceedsWhenExpected ) { <nl> } <nl> <nl> TEST_F ( UnorderedElementsAreTest , FailsWhenAnElementMatchesNoMatcher ) { <nl> - const int a [ ] = { 1 , 2 , 3 } ; <nl> + const int a [ ] = { 1 , 2 , 3 } ; <nl> std : : vector < int > s ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> std : : vector < Matcher < int > > mv ; <nl> mv . push_back ( 1 ) ; <nl> TEST_F ( UnorderedElementsAreTest , WorksForStreamlike ) { <nl> / / Streamlike ' container ' provides only minimal iterator support . <nl> / / Its iterators are tagged with input_iterator_tag , and it has no <nl> / / size ( ) or empty ( ) methods . <nl> - const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> + const int a [ 5 ] = { 2 , 1 , 4 , 5 , 3 } ; <nl> Streamlike < int > s ( a , a + GTEST_ARRAY_SIZE_ ( a ) ) ; <nl> <nl> EXPECT_THAT ( s , UnorderedElementsAre ( 1 , 2 , 3 , 4 , 5 ) ) ; <nl> TEST_F ( BipartiteNonSquareTest , SimpleBacktracking ) { <nl> / / : . . . . . . . : <nl> / / 0 1 2 <nl> MatchMatrix g ( 4 , 3 ) ; <nl> - static const int kEdges [ ] [ 2 ] = { { 0 , 2 } , { 1 , 1 } , { 2 , 1 } , { 3 , 0 } } ; <nl> + static const int kEdges [ ] [ 2 ] = { { 0 , 2 } , { 1 , 1 } , { 2 , 1 } , { 3 , 0 } } ; <nl> for ( size_t i = 0 ; i < GTEST_ARRAY_SIZE_ ( kEdges ) ; + + i ) { <nl> g . SetEdge ( kEdges [ i ] [ 0 ] , kEdges [ i ] [ 1 ] , true ) ; <nl> } <nl> TEST ( JoinAsTupleTest , JoinsEmptyTuple ) { <nl> } <nl> <nl> TEST ( JoinAsTupleTest , JoinsOneTuple ) { <nl> - const char * fields [ ] = { " 1 " } ; <nl> + const char * fields [ ] = { " 1 " } ; <nl> EXPECT_EQ ( " 1 " , JoinAsTuple ( Strings ( fields , fields + 1 ) ) ) ; <nl> } <nl> <nl> TEST ( JoinAsTupleTest , JoinsTwoTuple ) { <nl> - const char * fields [ ] = { " 1 " , " a " } ; <nl> + const char * fields [ ] = { " 1 " , " a " } ; <nl> EXPECT_EQ ( " ( 1 , a ) " , JoinAsTuple ( Strings ( fields , fields + 2 ) ) ) ; <nl> } <nl> <nl> TEST ( JoinAsTupleTest , JoinsTenTuple ) { <nl> - const char * fields [ ] = { " 1 " , " 2 " , " 3 " , " 4 " , " 5 " , " 6 " , " 7 " , " 8 " , " 9 " , " 10 " } ; <nl> + const char * fields [ ] = { " 1 " , " 2 " , " 3 " , " 4 " , " 5 " , " 6 " , " 7 " , " 8 " , " 9 " , " 10 " } ; <nl> EXPECT_EQ ( " ( 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 ) " , <nl> JoinAsTuple ( Strings ( fields , fields + 10 ) ) ) ; <nl> } <nl> TEST ( FormatMatcherDescriptionTest , WorksForEmptyDescription ) { <nl> EXPECT_EQ ( " not ( is even ) " , <nl> FormatMatcherDescription ( true , " IsEven " , Strings ( ) ) ) ; <nl> <nl> - const char * params [ ] = { " 5 " } ; <nl> + const char * params [ ] = { " 5 " } ; <nl> EXPECT_EQ ( " equals 5 " , <nl> FormatMatcherDescription ( false , " Equals " , <nl> Strings ( params , params + 1 ) ) ) ; <nl> <nl> - const char * params2 [ ] = { " 5 " , " 8 " } ; <nl> + const char * params2 [ ] = { " 5 " , " 8 " } ; <nl> EXPECT_EQ ( " is in range ( 5 , 8 ) " , <nl> FormatMatcherDescription ( false , " IsInRange " , <nl> Strings ( params2 , params2 + 2 ) ) ) ; <nl> TEST ( EachTest , ExplainsMatchResultCorrectly ) { <nl> <nl> Matcher < const int ( & ) [ 1 ] > n = Each ( 1 ) ; / / NOLINT <nl> <nl> - const int b [ 1 ] = { 1 } ; <nl> + const int b [ 1 ] = { 1 } ; <nl> EXPECT_EQ ( " " , Explain ( n , b ) ) ; <nl> <nl> n = Each ( 3 ) ; <nl> TEST ( EachTest , MatchesMapWhenAllElementsMatch ) { <nl> } <nl> <nl> TEST ( EachTest , AcceptsMatcher ) { <nl> - const int a [ ] = { 1 , 2 , 3 } ; <nl> + const int a [ ] = { 1 , 2 , 3 } ; <nl> EXPECT_THAT ( a , Each ( Gt ( 0 ) ) ) ; <nl> EXPECT_THAT ( a , Not ( Each ( Gt ( 1 ) ) ) ) ; <nl> } <nl> <nl> TEST ( EachTest , WorksForNativeArrayAsTuple ) { <nl> - const int a [ ] = { 1 , 2 } ; <nl> + const int a [ ] = { 1 , 2 } ; <nl> const int * const pointer = a ; <nl> EXPECT_THAT ( make_tuple ( pointer , 2 ) , Each ( Gt ( 0 ) ) ) ; <nl> EXPECT_THAT ( make_tuple ( pointer , 2 ) , Not ( Each ( Gt ( 1 ) ) ) ) ; <nl> TEST ( PointwiseTest , MakesCopyOfRhs ) { <nl> rhs . push_back ( 2 ) ; <nl> rhs . push_back ( 4 ) ; <nl> <nl> - int lhs [ ] = { 1 , 2 } ; <nl> + int lhs [ ] = { 1 , 2 } ; <nl> const Matcher < const int ( & ) [ 2 ] > m = Pointwise ( IsHalfOf ( ) , rhs ) ; <nl> EXPECT_THAT ( lhs , m ) ; <nl> <nl> TEST ( PointwiseTest , MakesCopyOfRhs ) { <nl> } <nl> <nl> TEST ( PointwiseTest , WorksForLhsNativeArray ) { <nl> - const int lhs [ ] = { 1 , 2 , 3 } ; <nl> + const int lhs [ ] = { 1 , 2 , 3 } ; <nl> vector < int > rhs ; <nl> rhs . push_back ( 2 ) ; <nl> rhs . push_back ( 4 ) ; <nl> TEST ( PointwiseTest , WorksForLhsNativeArray ) { <nl> } <nl> <nl> TEST ( PointwiseTest , WorksForRhsNativeArray ) { <nl> - const int rhs [ ] = { 1 , 2 , 3 } ; <nl> + const int rhs [ ] = { 1 , 2 , 3 } ; <nl> vector < int > lhs ; <nl> lhs . push_back ( 2 ) ; <nl> lhs . push_back ( 4 ) ; <nl> TEST ( PointwiseTest , WorksForRhsNativeArray ) { <nl> EXPECT_THAT ( lhs , Not ( Pointwise ( Lt ( ) , rhs ) ) ) ; <nl> } <nl> <nl> + # if GTEST_HAS_STD_INITIALIZER_LIST_ <nl> + <nl> + TEST ( PointwiseTest , WorksForRhsInitializerList ) { <nl> + const vector < int > lhs { 2 , 4 , 6 } ; <nl> + EXPECT_THAT ( lhs , Pointwise ( Gt ( ) , { 1 , 2 , 3 } ) ) ; <nl> + EXPECT_THAT ( lhs , Not ( Pointwise ( Lt ( ) , { 3 , 3 , 7 } ) ) ) ; <nl> + } <nl> + <nl> + # endif / / GTEST_HAS_STD_INITIALIZER_LIST_ <nl> + <nl> TEST ( PointwiseTest , RejectsWrongSize ) { <nl> - const double lhs [ 2 ] = { 1 , 2 } ; <nl> - const int rhs [ 1 ] = { 0 } ; <nl> + const double lhs [ 2 ] = { 1 , 2 } ; <nl> + const int rhs [ 1 ] = { 0 } ; <nl> EXPECT_THAT ( lhs , Not ( Pointwise ( Gt ( ) , rhs ) ) ) ; <nl> EXPECT_EQ ( " which contains 2 values " , <nl> Explain ( Pointwise ( Gt ( ) , rhs ) , lhs ) ) ; <nl> <nl> - const int rhs2 [ 3 ] = { 0 , 1 , 2 } ; <nl> + const int rhs2 [ 3 ] = { 0 , 1 , 2 } ; <nl> EXPECT_THAT ( lhs , Not ( Pointwise ( Gt ( ) , rhs2 ) ) ) ; <nl> } <nl> <nl> TEST ( PointwiseTest , RejectsWrongContent ) { <nl> - const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> - const int rhs [ 3 ] = { 2 , 6 , 4 } ; <nl> + const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> + const int rhs [ 3 ] = { 2 , 6 , 4 } ; <nl> EXPECT_THAT ( lhs , Not ( Pointwise ( IsHalfOf ( ) , rhs ) ) ) ; <nl> EXPECT_EQ ( " where the value pair ( 2 , 6 ) at index # 1 don ' t match , " <nl> " where the second / 2 is 3 " , <nl> TEST ( PointwiseTest , RejectsWrongContent ) { <nl> } <nl> <nl> TEST ( PointwiseTest , AcceptsCorrectContent ) { <nl> - const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> - const int rhs [ 3 ] = { 2 , 4 , 6 } ; <nl> + const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> + const int rhs [ 3 ] = { 2 , 4 , 6 } ; <nl> EXPECT_THAT ( lhs , Pointwise ( IsHalfOf ( ) , rhs ) ) ; <nl> EXPECT_EQ ( " " , Explain ( Pointwise ( IsHalfOf ( ) , rhs ) , lhs ) ) ; <nl> } <nl> <nl> TEST ( PointwiseTest , AllowsMonomorphicInnerMatcher ) { <nl> - const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> - const int rhs [ 3 ] = { 2 , 4 , 6 } ; <nl> + const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> + const int rhs [ 3 ] = { 2 , 4 , 6 } ; <nl> const Matcher < tuple < const double & , const int & > > m1 = IsHalfOf ( ) ; <nl> EXPECT_THAT ( lhs , Pointwise ( m1 , rhs ) ) ; <nl> EXPECT_EQ ( " " , Explain ( Pointwise ( m1 , rhs ) , lhs ) ) ; <nl> TEST ( PointwiseTest , AllowsMonomorphicInnerMatcher ) { <nl> EXPECT_EQ ( " " , Explain ( Pointwise ( m2 , rhs ) , lhs ) ) ; <nl> } <nl> <nl> + TEST ( UnorderedPointwiseTest , DescribesSelf ) { <nl> + vector < int > rhs ; <nl> + rhs . push_back ( 1 ) ; <nl> + rhs . push_back ( 2 ) ; <nl> + rhs . push_back ( 3 ) ; <nl> + const Matcher < const vector < int > & > m = UnorderedPointwise ( IsHalfOf ( ) , rhs ) ; <nl> + EXPECT_EQ ( <nl> + " has 3 elements and there exists some permutation of elements such " <nl> + " that : \ n " <nl> + " - element # 0 and 1 are a pair where the first is half of the second , " <nl> + " and \ n " <nl> + " - element # 1 and 2 are a pair where the first is half of the second , " <nl> + " and \ n " <nl> + " - element # 2 and 3 are a pair where the first is half of the second " , <nl> + Describe ( m ) ) ; <nl> + EXPECT_EQ ( <nl> + " doesn ' t have 3 elements , or there exists no permutation of elements " <nl> + " such that : \ n " <nl> + " - element # 0 and 1 are a pair where the first is half of the second , " <nl> + " and \ n " <nl> + " - element # 1 and 2 are a pair where the first is half of the second , " <nl> + " and \ n " <nl> + " - element # 2 and 3 are a pair where the first is half of the second " , <nl> + DescribeNegation ( m ) ) ; <nl> + } <nl> + <nl> + TEST ( UnorderedPointwiseTest , MakesCopyOfRhs ) { <nl> + list < signed char > rhs ; <nl> + rhs . push_back ( 2 ) ; <nl> + rhs . push_back ( 4 ) ; <nl> + <nl> + int lhs [ ] = { 2 , 1 } ; <nl> + const Matcher < const int ( & ) [ 2 ] > m = UnorderedPointwise ( IsHalfOf ( ) , rhs ) ; <nl> + EXPECT_THAT ( lhs , m ) ; <nl> + <nl> + / / Changing rhs now shouldn ' t affect m , which made a copy of rhs . <nl> + rhs . push_back ( 6 ) ; <nl> + EXPECT_THAT ( lhs , m ) ; <nl> + } <nl> + <nl> + TEST ( UnorderedPointwiseTest , WorksForLhsNativeArray ) { <nl> + const int lhs [ ] = { 1 , 2 , 3 } ; <nl> + vector < int > rhs ; <nl> + rhs . push_back ( 4 ) ; <nl> + rhs . push_back ( 6 ) ; <nl> + rhs . push_back ( 2 ) ; <nl> + EXPECT_THAT ( lhs , UnorderedPointwise ( Lt ( ) , rhs ) ) ; <nl> + EXPECT_THAT ( lhs , Not ( UnorderedPointwise ( Gt ( ) , rhs ) ) ) ; <nl> + } <nl> + <nl> + TEST ( UnorderedPointwiseTest , WorksForRhsNativeArray ) { <nl> + const int rhs [ ] = { 1 , 2 , 3 } ; <nl> + vector < int > lhs ; <nl> + lhs . push_back ( 4 ) ; <nl> + lhs . push_back ( 2 ) ; <nl> + lhs . push_back ( 6 ) ; <nl> + EXPECT_THAT ( lhs , UnorderedPointwise ( Gt ( ) , rhs ) ) ; <nl> + EXPECT_THAT ( lhs , Not ( UnorderedPointwise ( Lt ( ) , rhs ) ) ) ; <nl> + } <nl> + <nl> + # if GTEST_HAS_STD_INITIALIZER_LIST_ <nl> + <nl> + TEST ( UnorderedPointwiseTest , WorksForRhsInitializerList ) { <nl> + const vector < int > lhs { 2 , 4 , 6 } ; <nl> + EXPECT_THAT ( lhs , UnorderedPointwise ( Gt ( ) , { 5 , 1 , 3 } ) ) ; <nl> + EXPECT_THAT ( lhs , Not ( UnorderedPointwise ( Lt ( ) , { 1 , 1 , 7 } ) ) ) ; <nl> + } <nl> + <nl> + # endif / / GTEST_HAS_STD_INITIALIZER_LIST_ <nl> + <nl> + TEST ( UnorderedPointwiseTest , RejectsWrongSize ) { <nl> + const double lhs [ 2 ] = { 1 , 2 } ; <nl> + const int rhs [ 1 ] = { 0 } ; <nl> + EXPECT_THAT ( lhs , Not ( UnorderedPointwise ( Gt ( ) , rhs ) ) ) ; <nl> + EXPECT_EQ ( " which has 2 elements " , <nl> + Explain ( UnorderedPointwise ( Gt ( ) , rhs ) , lhs ) ) ; <nl> + <nl> + const int rhs2 [ 3 ] = { 0 , 1 , 2 } ; <nl> + EXPECT_THAT ( lhs , Not ( UnorderedPointwise ( Gt ( ) , rhs2 ) ) ) ; <nl> + } <nl> + <nl> + TEST ( UnorderedPointwiseTest , RejectsWrongContent ) { <nl> + const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> + const int rhs [ 3 ] = { 2 , 6 , 6 } ; <nl> + EXPECT_THAT ( lhs , Not ( UnorderedPointwise ( IsHalfOf ( ) , rhs ) ) ) ; <nl> + EXPECT_EQ ( " where the following elements don ' t match any matchers : \ n " <nl> + " element # 1 : 2 " , <nl> + Explain ( UnorderedPointwise ( IsHalfOf ( ) , rhs ) , lhs ) ) ; <nl> + } <nl> + <nl> + TEST ( UnorderedPointwiseTest , AcceptsCorrectContentInSameOrder ) { <nl> + const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> + const int rhs [ 3 ] = { 2 , 4 , 6 } ; <nl> + EXPECT_THAT ( lhs , UnorderedPointwise ( IsHalfOf ( ) , rhs ) ) ; <nl> + } <nl> + <nl> + TEST ( UnorderedPointwiseTest , AcceptsCorrectContentInDifferentOrder ) { <nl> + const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> + const int rhs [ 3 ] = { 6 , 4 , 2 } ; <nl> + EXPECT_THAT ( lhs , UnorderedPointwise ( IsHalfOf ( ) , rhs ) ) ; <nl> + } <nl> + <nl> + TEST ( UnorderedPointwiseTest , AllowsMonomorphicInnerMatcher ) { <nl> + const double lhs [ 3 ] = { 1 , 2 , 3 } ; <nl> + const int rhs [ 3 ] = { 4 , 6 , 2 } ; <nl> + const Matcher < tuple < const double & , const int & > > m1 = IsHalfOf ( ) ; <nl> + EXPECT_THAT ( lhs , UnorderedPointwise ( m1 , rhs ) ) ; <nl> + <nl> + / / This type works as a tuple < const double & , const int & > can be <nl> + / / implicitly cast to tuple < double , int > . <nl> + const Matcher < tuple < double , int > > m2 = IsHalfOf ( ) ; <nl> + EXPECT_THAT ( lhs , UnorderedPointwise ( m2 , rhs ) ) ; <nl> + } <nl> + <nl> } / / namespace gmock_matchers_test <nl> } / / namespace testing <nl>

Defines the UnorderedPointwise ( m , container ) matcher , which is like Pointwise ( m , container ) but ignores the order of the elements .

google/googletest

2336e9c171b5894bac98f828289f537e29691896

2014-07-28T22:57:30Z

mmm a / stdlib / objc / SpriteKit / CMakeLists . txt <nl> ppp b / stdlib / objc / SpriteKit / CMakeLists . txt <nl> add_swift_library ( swiftSpriteKit INSTALL <nl> SpriteKitMirrors . swift . gyb <nl> DEPENDS $ { SWIFTSPRITEKIT_UI } <nl> FRAMEWORK_DEPENDS SpriteKit ) <nl> - add_swift_library ( swiftSpriteKit INSTALL TARGET_LIBRARY <nl> - SpriteKit . swift <nl> - SpriteKitMirrors . swift . gyb <nl> - TARGET_SDKS IOS IOS_SIMULATOR <nl> - DEPENDS swiftUIKit <nl> - FRAMEWORK_DEPENDS SpriteKit ) <nl> + if ( SWIFT_SDKS ) <nl> + add_swift_library ( swiftSpriteKit INSTALL TARGET_LIBRARY <nl> + SpriteKit . swift <nl> + SpriteKitMirrors . swift . gyb <nl> + TARGET_SDKS IOS IOS_SIMULATOR <nl> + DEPENDS swiftUIKit <nl> + FRAMEWORK_DEPENDS SpriteKit ) <nl> + endif ( ) <nl>

[ CMake ] Fix SpriteKit single - platform build .

apple/swift

2826391407f506cbcad0bba49c16f55664330907

2014-07-08T01:14:15Z

mmm a / torch / csrc / autograd / variable . cpp <nl> ppp b / torch / csrc / autograd / variable . cpp <nl> PyObject * THPVariable_new ( PyTypeObject * type , PyObject * args , PyObject * kwargs ) <nl> THPVariable * self ; <nl> if ( ( PyObject * ) type ! = THPVariableClass | | num_cached = = 0 ) { <nl> self = ( THPVariable * ) type - > tp_alloc ( type , 0 ) ; <nl> + if ( ! self ) return NULL ; <nl> self - > version_counter = new THPVariableVersion ( ) ; <nl> } else { <nl> self = pop_cache ( NULL , NULL , 0 ) ; <nl> int THPVariable_init ( THPVariable * self , PyObject * args , PyObject * kwargs ) <nl> if ( self - > creator = = Py_None ) <nl> self - > creator = NULL ; <nl> Py_XINCREF ( self - > creator ) ; <nl> - if ( ( self - > creator & & ! THPFunction_Check ( self - > creator ) ) | | ! THPModule_isTensor ( self - > data ) ) <nl> - return - 1 ; <nl> + THPUtils_assertRet ( - 1 , ! self - > creator | | THPFunction_Check ( self - > creator ) , <nl> + " Variable creator has to be a Function object or None , but got % s " , <nl> + THPUtils_typename ( self - > creator ) ) ; <nl> + THPUtils_assertRet ( - 1 , THPModule_isTensor ( self - > data ) , " Variable data has to " <nl> + " be a tensor , but got % s " , THPUtils_typename ( self - > data ) ) ; <nl> return 0 ; <nl> } <nl> <nl>

Fix bug when Variable constructor didn ' t set the error properly

pytorch/pytorch

a49b7b0f58ee4d483774977f8bd33ded6fc15b26

2016-11-24T23:40:36Z

mmm a / xbmc / input / InertialScrollingHandler . cpp <nl> ppp b / xbmc / input / InertialScrollingHandler . cpp <nl> bool CInertialScrollingHandler : : CheckForInertialScrolling ( const CAction * action ) <nl> } <nl> else if ( action - > GetID ( ) = = ACTION_GESTURE_END & & ! m_panPoints . empty ( ) ) / / do we need to animate inertial scrolling ? <nl> { <nl> - PanPoint lastPanPoint = m_panPoints . front ( ) ; <nl> - <nl> / / Calculate velocity in the last MAXIMUM_DELAY_FOR_INERTIA milliseconds . <nl> / / Do not use the velocity given by the ACTION_GESTURE_END data - it is calculated <nl> / / for the whole duration of the touch and thus useless for inertia . The user <nl>

input / InertialScrollingHandler : remove unused variable lastPanPoint

xbmc/xbmc

01887d4be6ff0eb13b7fdac36f01588fcbaf50d9

2018-05-29T10:36:35Z

mmm a / src / ast / ast - value - factory . cc <nl> ppp b / src / ast / ast - value - factory . cc <nl> void AstString : : Internalize ( Isolate * isolate ) { <nl> } <nl> <nl> void AstRawString : : Internalize ( Isolate * isolate ) { <nl> + / / Skip over already internalized strings . <nl> + if ( ! string_ . is_null ( ) ) return ; <nl> if ( literal_bytes_ . length ( ) = = 0 ) { <nl> string_ = isolate - > factory ( ) - > empty_string ( ) ; <nl> } else { <nl> const AstConsString * AstValueFactory : : NewConsString ( <nl> / / the AstRawString will not be moved ) . <nl> AstConsString * new_string = new ( zone_ ) AstConsString ( left , right ) ; <nl> CHECK ( new_string ! = nullptr ) ; <nl> - AddString ( new_string ) ; <nl> + AddConsString ( new_string ) ; <nl> return new_string ; <nl> } <nl> <nl> const AstRawString * AstValueFactory : : ConcatStrings ( const AstRawString * left , <nl> <nl> void AstValueFactory : : Internalize ( Isolate * isolate ) { <nl> / / Strings need to be internalized before values , because values refer to <nl> - / / strings . <nl> - for ( AstString * current = strings_ ; current ! = nullptr ; ) { <nl> - AstString * next = current - > next ( ) ; <nl> + / / strings . Internalize flat strings before cons strings since cons strings <nl> + / / may point to flat strings . <nl> + for ( base : : CustomMatcherHashMap : : Entry * entry = string_table_ . Start ( ) ; <nl> + entry ! = nullptr ; entry = string_table_ . Next ( entry ) ) { <nl> + reinterpret_cast < AstRawString * > ( entry - > key ) - > Internalize ( isolate ) ; <nl> + } <nl> + <nl> + for ( AstConsString * current = cons_strings_ ; current ! = nullptr ; ) { <nl> + AstConsString * next = current - > next ( ) ; <nl> current - > Internalize ( isolate ) ; <nl> current = next ; <nl> } <nl> + <nl> for ( AstValue * current = values_ ; current ! = nullptr ; ) { <nl> AstValue * next = current - > next ( ) ; <nl> current - > Internalize ( isolate ) ; <nl> current = next ; <nl> } <nl> - ResetStrings ( ) ; <nl> + ResetConsStrings ( ) ; <nl> values_ = nullptr ; <nl> } <nl> <nl> AstRawString * AstValueFactory : : GetString ( uint32_t hash , bool is_one_byte , <nl> is_one_byte , Vector < const byte > ( new_literal_bytes , length ) , hash ) ; <nl> CHECK ( new_string ! = nullptr ) ; <nl> entry - > key = new_string ; <nl> - AddString ( new_string ) ; <nl> entry - > value = reinterpret_cast < void * > ( 1 ) ; <nl> } <nl> return reinterpret_cast < AstRawString * > ( entry - > key ) ; <nl> mmm a / src / ast / ast - value - factory . h <nl> ppp b / src / ast / ast - value - factory . h <nl> namespace internal { <nl> class AstString : public ZoneObject { <nl> public : <nl> explicit AstString ( bool is_raw ) <nl> - : next_ ( nullptr ) , bit_field_ ( IsRawStringBits : : encode ( is_raw ) ) { } <nl> + : bit_field_ ( IsRawStringBits : : encode ( is_raw ) ) { } <nl> <nl> int length ( ) const ; <nl> bool IsEmpty ( ) const { return length ( ) = = 0 ; } <nl> class AstString : public ZoneObject { <nl> return string_ ; <nl> } <nl> <nl> - AstString * * next_location ( ) { return & next_ ; } <nl> - AstString * next ( ) const { return next_ ; } <nl> - <nl> protected : <nl> / / Handle < String > : : null ( ) until internalized . <nl> Handle < String > string_ ; <nl> - AstString * next_ ; <nl> / / Poor - man ' s virtual dispatch to AstRawString / AstConsString . Takes less <nl> / / memory . <nl> class IsRawStringBits : public BitField < bool , 0 , 1 > { } ; <nl> class AstConsString final : public AstString { <nl> : AstString ( false ) , <nl> length_ ( left - > length ( ) + right - > length ( ) ) , <nl> left_ ( left ) , <nl> - right_ ( right ) { } <nl> + right_ ( right ) , <nl> + next_ ( nullptr ) { } <nl> <nl> int length ( ) const { return length_ ; } <nl> <nl> void Internalize ( Isolate * isolate ) ; <nl> <nl> + AstConsString * next ( ) { return next_ ; } <nl> + AstConsString * * next_location ( ) { return & next_ ; } <nl> + <nl> private : <nl> const int length_ ; <nl> const AstString * left_ ; <nl> const AstString * right_ ; <nl> + AstConsString * next_ ; <nl> } ; <nl> <nl> <nl> class AstValue : public ZoneObject { <nl> double number_ ; <nl> int smi_ ; <nl> bool bool_ ; <nl> - const AstRawString * strings_ ; <nl> const char * symbol_name_ ; <nl> } ; <nl> <nl> class AstValueFactory { <nl> AstValueFactory ( Zone * zone , uint32_t hash_seed ) <nl> : string_table_ ( AstRawStringCompare ) , <nl> values_ ( nullptr ) , <nl> - strings_end_ ( & strings_ ) , <nl> + cons_strings_ ( nullptr ) , <nl> + cons_strings_end_ ( & cons_strings_ ) , <nl> zone_ ( zone ) , <nl> hash_seed_ ( hash_seed ) { <nl> - ResetStrings ( ) ; <nl> # define F ( name , str ) name # # _string_ = NULL ; <nl> STRING_CONSTANTS ( F ) <nl> # undef F <nl> class AstValueFactory { <nl> values_ = value ; <nl> return value ; <nl> } <nl> - AstString * AddString ( AstString * string ) { <nl> - * strings_end_ = string ; <nl> - strings_end_ = string - > next_location ( ) ; <nl> + AstConsString * AddConsString ( AstConsString * string ) { <nl> + * cons_strings_end_ = string ; <nl> + cons_strings_end_ = string - > next_location ( ) ; <nl> return string ; <nl> } <nl> - void ResetStrings ( ) { <nl> - strings_ = nullptr ; <nl> - strings_end_ = & strings_ ; <nl> + void ResetConsStrings ( ) { <nl> + cons_strings_ = nullptr ; <nl> + cons_strings_end_ = & cons_strings_ ; <nl> } <nl> V8_EXPORT_PRIVATE AstRawString * GetOneByteStringInternal ( <nl> Vector < const uint8_t > literal ) ; <nl> class AstValueFactory { <nl> / / For keeping track of all AstValues and AstRawStrings we ' ve created ( so that <nl> / / they can be internalized later ) . <nl> AstValue * values_ ; <nl> - / / We need to keep track of strings_ in order , since cons strings require <nl> - / / their members to be internalized first . <nl> - AstString * strings_ ; <nl> - AstString * * strings_end_ ; <nl> + / / We need to keep track of cons_strings_ in order since they require their <nl> + / / members to be internalized first . <nl> + AstConsString * cons_strings_ ; <nl> + AstConsString * * cons_strings_end_ ; <nl> Zone * zone_ ; <nl> <nl> uint32_t hash_seed_ ; <nl>

Internalize AstRawStrings by walking the string_table_ instead of adding them to a list

v8/v8

9d5b307fa1d0219fcf0d6989dc16046a03321b71

2016-10-25T12:32:28Z

mmm a / include / swift / Option / FrontendOptions . td <nl> ppp b / include / swift / Option / FrontendOptions . td <nl> def sil_unroll_threshold : Separate < [ " - " ] , " sil - unroll - threshold " > , <nl> MetaVarName < " < 250 > " > , <nl> HelpText < " Controls the aggressiveness of loop unrolling " > ; <nl> <nl> - / / FIXME : This option is now redundant and should eventually be removed . <nl> - def sil_merge_partial_modules : Flag < [ " - " ] , " sil - merge - partial - modules " > , <nl> - Alias < merge_modules > ; <nl> - <nl> def sil_verify_all : Flag < [ " - " ] , " sil - verify - all " > , <nl> HelpText < " Verify SIL after each transform " > ; <nl> <nl> mmm a / lib / Driver / ToolChains . cpp <nl> ppp b / lib / Driver / ToolChains . cpp <nl> ToolChain : : constructInvocation ( const MergeModuleJobAction & job , <nl> / / serialized ASTs . <nl> Arguments . push_back ( " - parse - as - library " ) ; <nl> <nl> - / / Merge serialized SIL from partial modules . <nl> - Arguments . push_back ( " - sil - merge - partial - modules " ) ; <nl> - <nl> / / Disable SIL optimization passes ; we ' ve already optimized the code in each <nl> / / partial mode . <nl> Arguments . push_back ( " - disable - diagnostic - passes " ) ; <nl>

Merge pull request from hamishknight / out - of - the - link

apple/swift

f8ee94dc99af1ce2107155d79e8a010449db9b04

2020-07-09T22:06:52Z

mmm a / Documentation / UserManual / Foxx . md <nl> ppp b / Documentation / UserManual / Foxx . md <nl> So given you want to build an application that sends a plain - text response " Work <nl> <nl> First , create a directory ` my_app ` and save a file called ` app . js ` in this directory . Write the following content to this file : <nl> <nl> - Foxx = require ( " org / arangodb / foxx " ) ; <nl> + var Foxx = require ( " org / arangodb / foxx " ) ; <nl> <nl> - app = new Foxx . Application ( ) ; <nl> + var app = new Foxx . Application ( ) ; <nl> <nl> app . get ( " / wiese " , function ( req , res ) { <nl> res . set ( " Content - Type " , " text / plain " ) ; <nl> First , create a directory ` my_app ` and save a file called ` app . js ` in this direc <nl> This is your application . Now we need to mount it to the path ` / my ` . In order to achieve that , we create a file called ` manifest . json ` in our ` my_app ` directory with the following content : <nl> <nl> { <nl> + " name " : " my_app " , <nl> + " version " : " 0 . 0 . 1 " , <nl> " apps " : { <nl> - " / my " : " app . js " <nl> + " / " : " app . js " <nl> } <nl> } <nl> <nl> + You * * must * * specify a name and a version number for your application , otherwise it won ' t be loaded into ArangoDB . <nl> + <nl> Now your application is done . Start ArangoDB as follows : <nl> <nl> arangod - - javascript . dev - app - path my_app / tmp / fancy_db <nl> <nl> - Now point your browser to ` / my / wiese ` and you should see " Worked ! " . After this short overview , let ' s get into the details . <nl> + To include it to the list of apps running on your ArangoDB instance , start the ArangoDB shell and add your new application : <nl> + <nl> + $ . / bin / arango <nl> + arangosh > aal = require ( ' org / arangodb / aal ' ) ; <nl> + arangosh > aal . installDevApp ( ' my_app ' , ' / my ' ) ; <nl> + <nl> + Now point your browser to ` http : / / localhost : 8529 / my / wiese ` and you should see " Worked ! " . After this short overview , let ' s get into the details . <nl> <nl> # # Details on Foxx . Application <nl> <nl>

Merge pull request from fhemberger / devel

arangodb/arangodb

8a7099f0cc673d20154f388fc574bc3aa299762c

2013-04-30T20:47:16Z

mmm a / tensorflow / compiler / mlir / lite / tests / flatbuffer2mlir / BUILD <nl> ppp b / tensorflow / compiler / mlir / lite / tests / flatbuffer2mlir / BUILD <nl> filegroup ( <nl> data = [ <nl> " : importer_test_legacy_reshape " , <nl> " : importer_test_min_max " , <nl> - " : schema . fbs " , <nl> + " : test_schema . fbs " , <nl> " / / tensorflow / compiler / mlir / lite : flatbuffer_to_string " , <nl> " / / tensorflow / compiler / mlir / lite : flatbuffer_translate " , <nl> " / / tensorflow / compiler / mlir / lite : json_to_flatbuffer " , <nl> mmm a / tensorflow / compiler / mlir / lite / tests / flatbuffer2mlir / import_json . json <nl> ppp b / tensorflow / compiler / mlir / lite / tests / flatbuffer2mlir / import_json . json <nl> <nl> - / / RUN : json_to_flatbuffer % p / schema . fbs % s | flatbuffer_translate - - tflite - flatbuffer - to - mlir - o - | FileCheck - - dump - input - on - failure % s <nl> + / / RUN : json_to_flatbuffer % p / test_schema . fbs % s | flatbuffer_translate - - tflite - flatbuffer - to - mlir - o - | FileCheck - - dump - input - on - failure % s <nl> <nl> / / CHECK : % cst = constant unit <nl> / / CHECK : % [ [ RES0 : . * ] ] = " tfl . conv_2d " ( % arg0 , % arg1 , % cst ) { dilation_h_factor = 1 : i32 , dilation_w_factor = 1 : i32 , fused_activation_function = " NONE " , padding = " SAME " , stride_h = 0 : i32 , stride_w = 0 : i32 } : ( tensor < 256x32x32x3xf32 > , tensor < 16x3x3x3xf32 > , none ) - > tensor < 256x32x32x16xf32 > <nl> mmm a / tensorflow / compiler / mlir / lite / tests / flatbuffer2mlir / optional_input . json <nl> ppp b / tensorflow / compiler / mlir / lite / tests / flatbuffer2mlir / optional_input . json <nl> <nl> - / / RUN : json_to_flatbuffer % p / schema . fbs % s | flatbuffer_translate - - tflite - flatbuffer - to - mlir - o - | FileCheck - - dump - input - on - failure % s <nl> + / / RUN : json_to_flatbuffer % p / test_schema . fbs % s | flatbuffer_translate - - tflite - flatbuffer - to - mlir - o - | FileCheck - - dump - input - on - failure % s <nl> <nl> / / This test is to test that if the flatbuffer omits the last optional input ` bias ` of tfl . conv_2d op , the flatbuffer_importer will automatically adds ` none ` value to tfl . conv_2d . <nl> <nl> similarity index 100 % <nl> rename from tensorflow / compiler / mlir / lite / tests / flatbuffer2mlir / schema . fbs <nl> rename to tensorflow / compiler / mlir / lite / tests / flatbuffer2mlir / test_schema . fbs <nl>

Rename schema file in the test folder .

tensorflow/tensorflow

4b2cb67756009dda843c6b56a8b320c8a54373e0

2020-04-14T23:49:42Z

mmm a / src / builtins / builtins - string . cc <nl> ppp b / src / builtins / builtins - string . cc <nl> void Builtins : : Generate_StringPrototypeValueOf ( CodeStubAssembler * assembler ) { <nl> } <nl> <nl> void Builtins : : Generate_StringPrototypeIterator ( CodeStubAssembler * assembler ) { <nl> - typedef CodeStubAssembler : : Label Label ; <nl> typedef compiler : : Node Node ; <nl> - typedef CodeStubAssembler : : Variable Variable ; <nl> - <nl> - Variable var_string ( assembler , MachineRepresentation : : kTagged ) ; <nl> - Variable var_index ( assembler , MachineRepresentation : : kTagged ) ; <nl> - <nl> - Variable * loop_inputs [ ] = { & var_string , & var_index } ; <nl> - Label loop ( assembler , 2 , loop_inputs ) ; <nl> - Label allocate_iterator ( assembler ) ; <nl> <nl> Node * receiver = assembler - > Parameter ( 0 ) ; <nl> Node * context = assembler - > Parameter ( 3 ) ; <nl> <nl> - var_string . Bind ( assembler - > ToThisString ( context , receiver , <nl> - " String . prototype [ Symbol . iterator ] " ) ) ; <nl> - var_index . Bind ( assembler - > SmiConstant ( Smi : : FromInt ( 0 ) ) ) ; <nl> - <nl> - assembler - > Goto ( & loop ) ; <nl> - assembler - > Bind ( & loop ) ; <nl> - { <nl> - Node * string = var_string . value ( ) ; <nl> - / / Load the instance type of the { string } . <nl> - Node * string_instance_type = assembler - > LoadInstanceType ( string ) ; <nl> - <nl> - / / Check if the { string } is a SeqString . <nl> - Label if_stringisnotsequential ( assembler ) ; <nl> - assembler - > Branch ( assembler - > Word32Equal ( <nl> - assembler - > Word32And ( string_instance_type , <nl> - assembler - > Int32Constant ( <nl> - kStringRepresentationMask ) ) , <nl> - assembler - > Int32Constant ( kSeqStringTag ) ) , <nl> - & allocate_iterator , & if_stringisnotsequential ) ; <nl> - <nl> - assembler - > Bind ( & if_stringisnotsequential ) ; <nl> - { <nl> - / / Check if the { string } is a ConsString . <nl> - Label if_stringiscons ( assembler ) , if_stringisnotcons ( assembler ) ; <nl> - assembler - > Branch ( <nl> - assembler - > Word32Equal ( <nl> - assembler - > Word32And ( <nl> - string_instance_type , <nl> - assembler - > Int32Constant ( kStringRepresentationMask ) ) , <nl> - assembler - > Int32Constant ( kConsStringTag ) ) , <nl> - & if_stringiscons , & if_stringisnotcons ) ; <nl> - <nl> - assembler - > Bind ( & if_stringiscons ) ; <nl> - { <nl> - / / Flatten cons - string and finish . <nl> - var_string . Bind ( assembler - > CallRuntime ( <nl> - Runtime : : kFlattenString , assembler - > NoContextConstant ( ) , string ) ) ; <nl> - assembler - > Goto ( & allocate_iterator ) ; <nl> - } <nl> - <nl> - assembler - > Bind ( & if_stringisnotcons ) ; <nl> - { <nl> - / / Check if the { string } is an ExternalString . <nl> - Label if_stringisnotexternal ( assembler ) ; <nl> - assembler - > Branch ( <nl> - assembler - > Word32Equal ( <nl> - assembler - > Word32And ( <nl> - string_instance_type , <nl> - assembler - > Int32Constant ( kStringRepresentationMask ) ) , <nl> - assembler - > Int32Constant ( kExternalStringTag ) ) , <nl> - & allocate_iterator , & if_stringisnotexternal ) ; <nl> - <nl> - assembler - > Bind ( & if_stringisnotexternal ) ; <nl> - { <nl> - / / The { string } is a SlicedString , continue with its parent . <nl> - Node * index = var_index . value ( ) ; <nl> - Node * string_offset = <nl> - assembler - > LoadObjectField ( string , SlicedString : : kOffsetOffset ) ; <nl> - Node * string_parent = <nl> - assembler - > LoadObjectField ( string , SlicedString : : kParentOffset ) ; <nl> - var_index . Bind ( assembler - > SmiAdd ( index , string_offset ) ) ; <nl> - var_string . Bind ( string_parent ) ; <nl> - assembler - > Goto ( & loop ) ; <nl> - } <nl> - } <nl> - } <nl> - } <nl> - <nl> - assembler - > Bind ( & allocate_iterator ) ; <nl> - { <nl> - Node * native_context = assembler - > LoadNativeContext ( context ) ; <nl> - Node * map = assembler - > LoadFixedArrayElement ( <nl> - native_context , <nl> - assembler - > IntPtrConstant ( Context : : STRING_ITERATOR_MAP_INDEX ) , 0 , <nl> - CodeStubAssembler : : INTPTR_PARAMETERS ) ; <nl> - Node * iterator = assembler - > Allocate ( JSStringIterator : : kSize ) ; <nl> - assembler - > StoreMapNoWriteBarrier ( iterator , map ) ; <nl> - assembler - > StoreObjectFieldRoot ( iterator , JSValue : : kPropertiesOffset , <nl> - Heap : : kEmptyFixedArrayRootIndex ) ; <nl> - assembler - > StoreObjectFieldRoot ( iterator , JSObject : : kElementsOffset , <nl> - Heap : : kEmptyFixedArrayRootIndex ) ; <nl> - assembler - > StoreObjectFieldNoWriteBarrier ( <nl> - iterator , JSStringIterator : : kStringOffset , var_string . value ( ) ) ; <nl> - <nl> - assembler - > StoreObjectFieldNoWriteBarrier ( <nl> - iterator , JSStringIterator : : kNextIndexOffset , var_index . value ( ) ) ; <nl> - assembler - > Return ( iterator ) ; <nl> - } <nl> + Node * string = assembler - > ToThisString ( context , receiver , <nl> + " String . prototype [ Symbol . iterator ] " ) ; <nl> + <nl> + Node * native_context = assembler - > LoadNativeContext ( context ) ; <nl> + Node * map = assembler - > LoadFixedArrayElement ( <nl> + native_context , <nl> + assembler - > IntPtrConstant ( Context : : STRING_ITERATOR_MAP_INDEX ) , 0 , <nl> + CodeStubAssembler : : INTPTR_PARAMETERS ) ; <nl> + Node * iterator = assembler - > Allocate ( JSStringIterator : : kSize ) ; <nl> + assembler - > StoreMapNoWriteBarrier ( iterator , map ) ; <nl> + assembler - > StoreObjectFieldRoot ( iterator , JSValue : : kPropertiesOffset , <nl> + Heap : : kEmptyFixedArrayRootIndex ) ; <nl> + assembler - > StoreObjectFieldRoot ( iterator , JSObject : : kElementsOffset , <nl> + Heap : : kEmptyFixedArrayRootIndex ) ; <nl> + assembler - > StoreObjectFieldNoWriteBarrier ( <nl> + iterator , JSStringIterator : : kStringOffset , string ) ; <nl> + Node * index = assembler - > SmiConstant ( Smi : : FromInt ( 0 ) ) ; <nl> + assembler - > StoreObjectFieldNoWriteBarrier ( <nl> + iterator , JSStringIterator : : kNextIndexOffset , index ) ; <nl> + assembler - > Return ( iterator ) ; <nl> } <nl> <nl> namespace { <nl> compiler : : Node * LoadSurrogatePairInternal ( CodeStubAssembler * assembler , <nl> Label handle_surrogate_pair ( assembler ) , return_result ( assembler ) ; <nl> Variable var_result ( assembler , MachineRepresentation : : kWord32 ) ; <nl> Variable var_trail ( assembler , MachineRepresentation : : kWord16 ) ; <nl> - var_result . Bind ( assembler - > Int32Constant ( 0 ) ) ; <nl> + var_result . Bind ( assembler - > StringCharCodeAt ( string , index ) ) ; <nl> var_trail . Bind ( assembler - > Int32Constant ( 0 ) ) ; <nl> <nl> - Node * string_instance_type = assembler - > LoadInstanceType ( string ) ; <nl> - <nl> - Label if_stringissequential ( assembler ) , if_stringisexternal ( assembler ) ; <nl> - assembler - > Branch ( assembler - > Word32Equal ( <nl> - assembler - > Word32And ( string_instance_type , <nl> - assembler - > Int32Constant ( <nl> - kStringRepresentationMask ) ) , <nl> - assembler - > Int32Constant ( kSeqStringTag ) ) , <nl> - & if_stringissequential , & if_stringisexternal ) ; <nl> - <nl> - assembler - > Bind ( & if_stringissequential ) ; <nl> - { <nl> - Label if_stringisonebyte ( assembler ) , if_stringistwobyte ( assembler ) ; <nl> - assembler - > Branch ( <nl> - assembler - > Word32Equal ( <nl> - assembler - > Word32And ( string_instance_type , <nl> - assembler - > Int32Constant ( kStringEncodingMask ) ) , <nl> - assembler - > Int32Constant ( kOneByteStringTag ) ) , <nl> - & if_stringisonebyte , & if_stringistwobyte ) ; <nl> - <nl> - assembler - > Bind ( & if_stringisonebyte ) ; <nl> - { <nl> - var_result . Bind ( assembler - > Load ( <nl> - MachineType : : Uint8 ( ) , string , <nl> - assembler - > IntPtrAdd ( <nl> - index , assembler - > IntPtrConstant ( SeqOneByteString : : kHeaderSize - <nl> - kHeapObjectTag ) ) ) ) ; <nl> - assembler - > Goto ( & return_result ) ; <nl> - } <nl> - <nl> - assembler - > Bind ( & if_stringistwobyte ) ; <nl> - { <nl> - Node * lead = assembler - > Load ( <nl> - MachineType : : Uint16 ( ) , string , <nl> - assembler - > IntPtrAdd ( <nl> - assembler - > WordShl ( index , assembler - > IntPtrConstant ( 1 ) ) , <nl> - assembler - > IntPtrConstant ( SeqTwoByteString : : kHeaderSize - <nl> - kHeapObjectTag ) ) ) ; <nl> - var_result . Bind ( lead ) ; <nl> - Node * next_pos = assembler - > Int32Add ( index , assembler - > Int32Constant ( 1 ) ) ; <nl> - <nl> - Label if_isdoublecodeunit ( assembler ) ; <nl> - assembler - > GotoIf ( assembler - > Int32GreaterThanOrEqual ( next_pos , length ) , <nl> - & return_result ) ; <nl> - assembler - > GotoIf ( <nl> - assembler - > Uint32LessThan ( lead , assembler - > Int32Constant ( 0xD800 ) ) , <nl> - & return_result ) ; <nl> - assembler - > Branch ( <nl> - assembler - > Uint32LessThan ( lead , assembler - > Int32Constant ( 0xDC00 ) ) , <nl> - & if_isdoublecodeunit , & return_result ) ; <nl> - <nl> - assembler - > Bind ( & if_isdoublecodeunit ) ; <nl> - { <nl> - Node * trail = assembler - > Load ( <nl> - MachineType : : Uint16 ( ) , string , <nl> - assembler - > IntPtrAdd ( <nl> - assembler - > WordShl ( next_pos , assembler - > IntPtrConstant ( 1 ) ) , <nl> - assembler - > IntPtrConstant ( SeqTwoByteString : : kHeaderSize - <nl> - kHeapObjectTag ) ) ) ; <nl> - assembler - > GotoIf ( <nl> - assembler - > Uint32LessThan ( trail , assembler - > Int32Constant ( 0xDC00 ) ) , <nl> - & return_result ) ; <nl> - assembler - > GotoIf ( assembler - > Uint32GreaterThanOrEqual ( <nl> - trail , assembler - > Int32Constant ( 0xE000 ) ) , <nl> - & return_result ) ; <nl> - <nl> - var_trail . Bind ( trail ) ; <nl> - assembler - > Goto ( & handle_surrogate_pair ) ; <nl> - } <nl> - } <nl> - } <nl> - <nl> - assembler - > Bind ( & if_stringisexternal ) ; <nl> - { <nl> - assembler - > Assert ( assembler - > Word32Equal ( <nl> - assembler - > Word32And ( <nl> - string_instance_type , <nl> - assembler - > Int32Constant ( kStringRepresentationMask ) ) , <nl> - assembler - > Int32Constant ( kExternalStringTag ) ) ) ; <nl> - Label if_stringisshort ( assembler ) , if_stringisnotshort ( assembler ) ; <nl> - <nl> - assembler - > Branch ( assembler - > Word32Equal ( <nl> - assembler - > Word32And ( string_instance_type , <nl> - assembler - > Int32Constant ( <nl> - kShortExternalStringMask ) ) , <nl> - assembler - > Int32Constant ( 0 ) ) , <nl> - & if_stringisshort , & if_stringisnotshort ) ; <nl> - <nl> - assembler - > Bind ( & if_stringisshort ) ; <nl> - { <nl> - / / Load the actual resource data from the { string } . <nl> - Node * string_resource_data = assembler - > LoadObjectField ( <nl> - string , ExternalString : : kResourceDataOffset , MachineType : : Pointer ( ) ) ; <nl> - <nl> - Label if_stringistwobyte ( assembler ) , if_stringisonebyte ( assembler ) ; <nl> - assembler - > Branch ( assembler - > Word32Equal ( <nl> - assembler - > Word32And ( <nl> - string_instance_type , <nl> - assembler - > Int32Constant ( kStringEncodingMask ) ) , <nl> - assembler - > Int32Constant ( kTwoByteStringTag ) ) , <nl> - & if_stringistwobyte , & if_stringisonebyte ) ; <nl> - <nl> - assembler - > Bind ( & if_stringisonebyte ) ; <nl> - { <nl> - var_result . Bind ( <nl> - assembler - > Load ( MachineType : : Uint8 ( ) , string_resource_data , index ) ) ; <nl> - assembler - > Goto ( & return_result ) ; <nl> - } <nl> - <nl> - assembler - > Bind ( & if_stringistwobyte ) ; <nl> - { <nl> - Label if_isdoublecodeunit ( assembler ) ; <nl> - Node * lead = assembler - > Load ( <nl> - MachineType : : Uint16 ( ) , string_resource_data , <nl> - assembler - > WordShl ( index , assembler - > IntPtrConstant ( 1 ) ) ) ; <nl> - var_result . Bind ( lead ) ; <nl> - Node * next_pos = <nl> - assembler - > Int32Add ( index , assembler - > Int32Constant ( 1 ) ) ; <nl> - <nl> - assembler - > GotoIf ( assembler - > Int32GreaterThanOrEqual ( next_pos , length ) , <nl> - & return_result ) ; <nl> - assembler - > GotoIf ( <nl> - assembler - > Uint32LessThan ( lead , assembler - > Int32Constant ( 0xD800 ) ) , <nl> - & return_result ) ; <nl> - assembler - > Branch ( <nl> - assembler - > Uint32LessThan ( lead , assembler - > Int32Constant ( 0xDC00 ) ) , <nl> - & if_isdoublecodeunit , & return_result ) ; <nl> - <nl> - assembler - > Bind ( & if_isdoublecodeunit ) ; <nl> - { <nl> - Node * trail = assembler - > Load ( <nl> - MachineType : : Uint16 ( ) , string , <nl> - assembler - > IntPtrAdd ( <nl> - assembler - > WordShl ( next_pos , assembler - > IntPtrConstant ( 1 ) ) , <nl> - assembler - > IntPtrConstant ( SeqTwoByteString : : kHeaderSize - <nl> - kHeapObjectTag ) ) ) ; <nl> - assembler - > GotoIf ( assembler - > Uint32LessThan ( <nl> - trail , assembler - > Int32Constant ( 0xDC00 ) ) , <nl> - & return_result ) ; <nl> - assembler - > GotoIf ( assembler - > Uint32GreaterThanOrEqual ( <nl> - trail , assembler - > Int32Constant ( 0xE000 ) ) , <nl> - & return_result ) ; <nl> - <nl> - var_trail . Bind ( trail ) ; <nl> - assembler - > Goto ( & handle_surrogate_pair ) ; <nl> - } <nl> - } <nl> - } <nl> + assembler - > GotoIf ( assembler - > Word32NotEqual ( <nl> + assembler - > Word32And ( var_result . value ( ) , <nl> + assembler - > Int32Constant ( 0xFC00 ) ) , <nl> + assembler - > Int32Constant ( 0xD800 ) ) , <nl> + & return_result ) ; <nl> + Node * next_index = <nl> + assembler - > SmiAdd ( index , assembler - > SmiConstant ( Smi : : FromInt ( 1 ) ) ) ; <nl> <nl> - assembler - > Bind ( & if_stringisnotshort ) ; <nl> - { <nl> - Label if_isdoublecodeunit ( assembler ) ; <nl> - Node * lead = assembler - > SmiToWord32 ( assembler - > CallRuntime ( <nl> - Runtime : : kExternalStringGetChar , assembler - > NoContextConstant ( ) , <nl> - string , assembler - > SmiTag ( index ) ) ) ; <nl> - var_result . Bind ( lead ) ; <nl> - Node * next_pos = assembler - > Int32Add ( index , assembler - > Int32Constant ( 1 ) ) ; <nl> - <nl> - assembler - > GotoIf ( assembler - > Int32GreaterThanOrEqual ( next_pos , length ) , <nl> + assembler - > GotoUnless ( assembler - > SmiLessThan ( next_index , length ) , <nl> & return_result ) ; <nl> - assembler - > GotoIf ( <nl> - assembler - > Uint32LessThan ( lead , assembler - > Int32Constant ( 0xD800 ) ) , <nl> - & return_result ) ; <nl> - assembler - > Branch ( assembler - > Uint32GreaterThanOrEqual ( <nl> - lead , assembler - > Int32Constant ( 0xDC00 ) ) , <nl> - & return_result , & if_isdoublecodeunit ) ; <nl> - <nl> - assembler - > Bind ( & if_isdoublecodeunit ) ; <nl> - { <nl> - Node * trail = assembler - > SmiToWord32 ( assembler - > CallRuntime ( <nl> - Runtime : : kExternalStringGetChar , assembler - > NoContextConstant ( ) , <nl> - string , assembler - > SmiTag ( next_pos ) ) ) ; <nl> - assembler - > GotoIf ( <nl> - assembler - > Uint32LessThan ( trail , assembler - > Int32Constant ( 0xDC00 ) ) , <nl> - & return_result ) ; <nl> - assembler - > GotoIf ( assembler - > Uint32GreaterThanOrEqual ( <nl> - trail , assembler - > Int32Constant ( 0xE000 ) ) , <nl> - & return_result ) ; <nl> - var_trail . Bind ( trail ) ; <nl> - assembler - > Goto ( & handle_surrogate_pair ) ; <nl> - } <nl> - } <nl> - } <nl> + var_trail . Bind ( assembler - > StringCharCodeAt ( string , next_index ) ) ; <nl> + assembler - > Branch ( assembler - > Word32Equal ( <nl> + assembler - > Word32And ( var_trail . value ( ) , <nl> + assembler - > Int32Constant ( 0xFC00 ) ) , <nl> + assembler - > Int32Constant ( 0xDC00 ) ) , <nl> + & handle_surrogate_pair , & return_result ) ; <nl> <nl> assembler - > Bind ( & handle_surrogate_pair ) ; <nl> { <nl> void Builtins : : Generate_StringIteratorPrototypeNext ( <nl> <nl> assembler - > Bind ( & next_codepoint ) ; <nl> { <nl> - Node * ch = <nl> - LoadSurrogatePairAt ( assembler , string , assembler - > SmiUntag ( length ) , <nl> - assembler - > SmiUntag ( position ) ) ; <nl> + Node * ch = LoadSurrogatePairAt ( assembler , string , length , position ) ; <nl> Node * value = assembler - > StringFromCodePoint ( ch , UnicodeEncoding : : UTF16 ) ; <nl> var_value . Bind ( value ) ; <nl> Node * length = assembler - > LoadObjectField ( value , String : : kLengthOffset ) ; <nl> mmm a / src / objects - debug . cc <nl> ppp b / src / objects - debug . cc <nl> void JSWeakMap : : JSWeakMapVerify ( ) { <nl> void JSStringIterator : : JSStringIteratorVerify ( ) { <nl> CHECK ( IsJSStringIterator ( ) ) ; <nl> JSObjectVerify ( ) ; <nl> - CHECK ( string ( ) - > IsSeqString ( ) | | string ( ) - > IsExternalString ( ) ) ; <nl> + CHECK ( string ( ) - > IsString ( ) ) ; <nl> <nl> CHECK_GE ( index ( ) , 0 ) ; <nl> CHECK_LE ( index ( ) , String : : kMaxLength ) ; <nl>

[ builtins ] don ' t pre - flatten strings for JSStringIterator

v8/v8

772ea9058827d11b7d947e04d98ea4cfb7b950d5

2016-09-30T09:20:11Z

mmm a / aten / src / TH / THMath . h <nl> ppp b / aten / src / TH / THMath . h <nl> static inline double TH_sigmoid ( double value ) { <nl> return 1 . 0 / ( 1 . 0 + exp ( - value ) ) ; <nl> } <nl> <nl> - static inline double TH_rsqrt ( double x ) { <nl> - return 1 . 0 / sqrt ( x ) ; <nl> - } <nl> - <nl> static inline float TH_sigmoidf ( float value ) { <nl> return 1 . 0f / ( 1 . 0f + expf ( - value ) ) ; <nl> } <nl> <nl> - static inline float TH_rsqrtf ( float x ) { <nl> - return 1 . 0f / sqrtf ( x ) ; <nl> - } <nl> - <nl> # endif / / _THMATH_H <nl>

Remove two unused TH definitions of rsqrt .

pytorch/pytorch

ce7058337c16590280523c6db80fe017db225ee2

2019-11-14T22:28:17Z

mmm a / lib / renderer / chrome - api . js <nl> ppp b / lib / renderer / chrome - api . js <nl> exports . injectTo = function ( extensionId , isBackgroundPage , context ) { <nl> onMessage : chrome . runtime . onMessage <nl> } <nl> <nl> - chrome . storage = require ( ' . / extensions / storage . js ' ) <nl> + chrome . storage = require ( ' . / extensions / storage ' ) <nl> <nl> chrome . pageAction = { <nl> show ( ) { } , <nl> exports . injectTo = function ( extensionId , isBackgroundPage , context ) { <nl> getPopup ( ) { } <nl> } <nl> <nl> - chrome . i18n = require ( ' . / extensions / i18n . js ' ) . setup ( extensionId ) <nl> - chrome . webNavigation = require ( ' . / extensions / web - navigation . js ' ) <nl> + chrome . i18n = require ( ' . / extensions / i18n ' ) . setup ( extensionId ) <nl> + chrome . webNavigation = require ( ' . / extensions / web - navigation ' ) <nl> } <nl>

Drop unneeded . js extensions

electron/electron

567622c1260a997a6b89d22ef52c9e7e602e6f82

2016-06-16T16:52:14Z

mmm a / scripts / cmake / vcpkg_download_distfile . cmake <nl> ppp b / scripts / cmake / vcpkg_download_distfile . cmake <nl> <nl> # # <nl> # # If this doesn ' t match the downloaded version , the build will be terminated with a message describing the mismatch . <nl> # # <nl> + # # # # # SKIP_SHA512 <nl> + # # Skip SHA512 hash check for file . <nl> + # # <nl> # # # # Notes <nl> # # The command [ ` vcpkg_from_github ` ] ( vcpkg_from_github . md ) should be used instead of this for downloading the main archive for GitHub projects . <nl> # # <nl> <nl> # # * [ fontconfig ] ( https : / / github . com / Microsoft / vcpkg / blob / master / ports / fontconfig / portfile . cmake ) <nl> # # * [ openssl ] ( https : / / github . com / Microsoft / vcpkg / blob / master / ports / openssl / portfile . cmake ) <nl> function ( vcpkg_download_distfile VAR ) <nl> + set ( options SKIP_SHA512 ) <nl> set ( oneValueArgs FILENAME SHA512 ) <nl> set ( multipleValuesArgs URLS ) <nl> - cmake_parse_arguments ( vcpkg_download_distfile " " " $ { oneValueArgs } " " $ { multipleValuesArgs } " $ { ARGN } ) <nl> + cmake_parse_arguments ( vcpkg_download_distfile " $ { options } " " $ { oneValueArgs } " " $ { multipleValuesArgs } " $ { ARGN } ) <nl> <nl> if ( NOT DEFINED vcpkg_download_distfile_URLS ) <nl> message ( FATAL_ERROR " vcpkg_download_distfile requires a URLS argument . " ) <nl> function ( vcpkg_download_distfile VAR ) <nl> if ( NOT DEFINED vcpkg_download_distfile_FILENAME ) <nl> message ( FATAL_ERROR " vcpkg_download_distfile requires a FILENAME argument . " ) <nl> endif ( ) <nl> - if ( NOT _VCPKG_INTERNAL_NO_HASH_CHECK AND NOT DEFINED vcpkg_download_distfile_SHA512 ) <nl> + if ( NOT DEFINED vcpkg_download_distfile_SKIP_SHA512 AND NOT _VCPKG_INTERNAL_NO_HASH_CHECK AND NOT DEFINED vcpkg_download_distfile_SHA512 ) <nl> message ( FATAL_ERROR " vcpkg_download_distfile requires a SHA512 argument . " ) <nl> endif ( ) <nl> <nl> function ( vcpkg_download_distfile VAR ) <nl> <nl> if ( EXISTS $ { downloaded_file_path } ) <nl> message ( STATUS " Using cached $ { downloaded_file_path } " ) <nl> - test_hash ( " cached file " " Please delete the file and retry if this file should be downloaded again . " ) <nl> + if ( NOT DEFINED vcpkg_download_distfile_SKIP_SHA512 ) <nl> + test_hash ( " cached file " " Please delete the file and retry if this file should be downloaded again . " ) <nl> + endif ( ) <nl> else ( ) <nl> if ( _VCPKG_NO_DOWNLOADS ) <nl> message ( FATAL_ERROR " Downloads are disabled , but ' $ { downloaded_file_path } ' does not exist . " ) <nl> function ( vcpkg_download_distfile VAR ) <nl> " Failed to download file . \ n " <nl> " Add mirrors or submit an issue at https : / / github . com / Microsoft / vcpkg / issues \ n " ) <nl> else ( ) <nl> - test_hash ( " downloaded file " " The file may be corrupted . " ) <nl> + if ( NOT DEFINED vcpkg_download_distfile_SKIP_SHA512 ) <nl> + test_hash ( " downloaded file " " The file may be corrupted . " ) <nl> + endif ( ) <nl> endif ( ) <nl> endif ( ) <nl> set ( $ { VAR } $ { downloaded_file_path } PARENT_SCOPE ) <nl> mmm a / scripts / cmake / vcpkg_from_github . cmake <nl> ppp b / scripts / cmake / vcpkg_from_github . cmake <nl> function ( vcpkg_from_github ) <nl> vcpkg_download_distfile ( ARCHIVE_VERSION <nl> URLS " https : / / api . github . com / repos / $ { ORG_NAME } / $ { REPO_NAME } / git / refs / heads / $ { _vdud_HEAD_REF } " <nl> FILENAME $ { downloaded_file_name } . version <nl> + SKIP_SHA512 <nl> ) <nl> <nl> vcpkg_download_distfile ( ARCHIVE <nl> URLS $ { URL } <nl> FILENAME $ { downloaded_file_name } <nl> + SKIP_SHA512 <nl> ) <nl> set ( _VCPKG_INTERNAL_NO_HASH_CHECK " FALSE " ) <nl> endif ( ) <nl>

[ vcpkg ] fix - - head flag for github - based ports

microsoft/vcpkg

42c0cfc8705c71c3c9dcc4df4804ab342dc89988

2018-01-05T23:47:17Z

mmm a / templates / lua - template - runtime / cocos - project - template . json <nl> ppp b / templates / lua - template - runtime / cocos - project - template . json <nl> <nl> " * . dll " <nl> ] <nl> } , <nl> + { <nl> + " from " : " external / sqlite3 / libraries / win32 " , <nl> + " to " : " runtime / win32 " , <nl> + " include " : [ <nl> + " * . dll " <nl> + ] <nl> + } , <nl> { <nl> " from " : " external / tiff / prebuilt / win32 " , <nl> " to " : " runtime / win32 " , <nl> mmm a / templates / lua - template - runtime / src / main . lua <nl> ppp b / templates / lua - template - runtime / src / main . lua <nl> local function main ( ) <nl> - - set FPS . the default value is 1 . 0 / 60 if you don ' t call this <nl> director : setAnimationInterval ( 1 . 0 / 60 ) <nl> <nl> - cc . FileUtils : getInstance ( ) : addSearchPath ( " src " ) <nl> - cc . FileUtils : getInstance ( ) : addSearchPath ( " res " ) <nl> cc . Director : getInstance ( ) : getOpenGLView ( ) : setDesignResolutionSize ( 480 , 320 , 0 ) <nl> <nl> - - create scene <nl>

delete unused code

cocos2d/cocos2d-x

f6b5ebb53b457a0cf1c25ffd0c010f410fe49812

2014-10-17T09:36:45Z

mmm a / src / common / CMakeLists . txt <nl> ppp b / src / common / CMakeLists . txt <nl> set ( HEADERS <nl> <nl> if ( ARCHITECTURE_x86_64 ) <nl> set ( SRCS $ { SRCS } <nl> - x64 / abi . cpp <nl> x64 / cpu_detect . cpp <nl> - x64 / emitter . cpp ) <nl> + ) <nl> <nl> set ( HEADERS $ { HEADERS } <nl> - x64 / abi . h <nl> x64 / cpu_detect . h <nl> - x64 / emitter . h <nl> x64 / xbyak_abi . h <nl> x64 / xbyak_util . h <nl> ) <nl> deleted file mode 100644 <nl> index 504b9c94093 . . 00000000000 <nl> mmm a / src / common / x64 / abi . cpp <nl> ppp / dev / null <nl> <nl> - / / Copyright ( C ) 2003 Dolphin Project . <nl> - <nl> - / / This program is free software : you can redistribute it and / or modify <nl> - / / it under the terms of the GNU General Public License as published by <nl> - / / the Free Software Foundation , version 2 . 0 or later versions . <nl> - <nl> - / / This program is distributed in the hope that it will be useful , <nl> - / / but WITHOUT ANY WARRANTY ; without even the implied warranty of <nl> - / / MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the <nl> - / / GNU General Public License 2 . 0 for more details . <nl> - <nl> - / / A copy of the GPL 2 . 0 should have been included with the program . <nl> - / / If not , see http : / / www . gnu . org / licenses / <nl> - <nl> - / / Official SVN repository and contact information can be found at <nl> - / / http : / / code . google . com / p / dolphin - emu / <nl> - <nl> - # include " abi . h " <nl> - # include " emitter . h " <nl> - <nl> - using namespace Gen ; <nl> - <nl> - / / Shared code between Win64 and Unix64 <nl> - <nl> - void XEmitter : : ABI_CalculateFrameSize ( BitSet32 mask , size_t rsp_alignment , size_t needed_frame_size , <nl> - size_t * shadowp , size_t * subtractionp , size_t * xmm_offsetp ) { <nl> - size_t shadow = 0 ; <nl> - # if defined ( _WIN32 ) <nl> - shadow = 0x20 ; <nl> - # endif <nl> - <nl> - int count = ( mask & ABI_ALL_GPRS ) . Count ( ) ; <nl> - rsp_alignment - = count * 8 ; <nl> - size_t subtraction = 0 ; <nl> - int fpr_count = ( mask & ABI_ALL_FPRS ) . Count ( ) ; <nl> - if ( fpr_count ) { <nl> - / / If we have any XMMs to save , we must align the stack here . <nl> - subtraction = rsp_alignment & 0xf ; <nl> - } <nl> - subtraction + = 16 * fpr_count ; <nl> - size_t xmm_base_subtraction = subtraction ; <nl> - subtraction + = needed_frame_size ; <nl> - subtraction + = shadow ; <nl> - / / Final alignment . <nl> - rsp_alignment - = subtraction ; <nl> - subtraction + = rsp_alignment & 0xf ; <nl> - <nl> - * shadowp = shadow ; <nl> - * subtractionp = subtraction ; <nl> - * xmm_offsetp = subtraction - xmm_base_subtraction ; <nl> - } <nl> - <nl> - size_t XEmitter : : ABI_PushRegistersAndAdjustStack ( BitSet32 mask , size_t rsp_alignment , <nl> - size_t needed_frame_size ) { <nl> - size_t shadow , subtraction , xmm_offset ; <nl> - ABI_CalculateFrameSize ( mask , rsp_alignment , needed_frame_size , & shadow , & subtraction , <nl> - & xmm_offset ) ; <nl> - <nl> - for ( int r : mask & ABI_ALL_GPRS ) <nl> - PUSH ( ( X64Reg ) r ) ; <nl> - <nl> - if ( subtraction ) <nl> - SUB ( 64 , R ( RSP ) , subtraction > = 0x80 ? Imm32 ( ( u32 ) subtraction ) : Imm8 ( ( u8 ) subtraction ) ) ; <nl> - <nl> - for ( int x : mask & ABI_ALL_FPRS ) { <nl> - MOVAPD ( MDisp ( RSP , ( int ) xmm_offset ) , ( X64Reg ) ( x - 16 ) ) ; <nl> - xmm_offset + = 16 ; <nl> - } <nl> - <nl> - return shadow ; <nl> - } <nl> - <nl> - void XEmitter : : ABI_PopRegistersAndAdjustStack ( BitSet32 mask , size_t rsp_alignment , <nl> - size_t needed_frame_size ) { <nl> - size_t shadow , subtraction , xmm_offset ; <nl> - ABI_CalculateFrameSize ( mask , rsp_alignment , needed_frame_size , & shadow , & subtraction , <nl> - & xmm_offset ) ; <nl> - <nl> - for ( int x : mask & ABI_ALL_FPRS ) { <nl> - MOVAPD ( ( X64Reg ) ( x - 16 ) , MDisp ( RSP , ( int ) xmm_offset ) ) ; <nl> - xmm_offset + = 16 ; <nl> - } <nl> - <nl> - if ( subtraction ) <nl> - ADD ( 64 , R ( RSP ) , subtraction > = 0x80 ? Imm32 ( ( u32 ) subtraction ) : Imm8 ( ( u8 ) subtraction ) ) ; <nl> - <nl> - for ( int r = 15 ; r > = 0 ; r - - ) { <nl> - if ( mask [ r ] ) <nl> - POP ( ( X64Reg ) r ) ; <nl> - } <nl> - } <nl> - <nl> - / / Common functions <nl> - void XEmitter : : ABI_CallFunction ( const void * func ) { <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionC16 ( const void * func , u16 param1 ) { <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , Imm32 ( ( u32 ) param1 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionCC16 ( const void * func , u32 param1 , u16 param2 ) { <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , Imm32 ( param1 ) ) ; <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , Imm32 ( ( u32 ) param2 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionC ( const void * func , u32 param1 ) { <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , Imm32 ( param1 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionCC ( const void * func , u32 param1 , u32 param2 ) { <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , Imm32 ( param1 ) ) ; <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , Imm32 ( param2 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionCCC ( const void * func , u32 param1 , u32 param2 , u32 param3 ) { <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , Imm32 ( param1 ) ) ; <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , Imm32 ( param2 ) ) ; <nl> - MOV ( 32 , R ( ABI_PARAM3 ) , Imm32 ( param3 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionCCP ( const void * func , u32 param1 , u32 param2 , void * param3 ) { <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , Imm32 ( param1 ) ) ; <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , Imm32 ( param2 ) ) ; <nl> - MOV ( 64 , R ( ABI_PARAM3 ) , ImmPtr ( param3 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionCCCP ( const void * func , u32 param1 , u32 param2 , u32 param3 , <nl> - void * param4 ) { <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , Imm32 ( param1 ) ) ; <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , Imm32 ( param2 ) ) ; <nl> - MOV ( 32 , R ( ABI_PARAM3 ) , Imm32 ( param3 ) ) ; <nl> - MOV ( 64 , R ( ABI_PARAM4 ) , ImmPtr ( param4 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionP ( const void * func , void * param1 ) { <nl> - MOV ( 64 , R ( ABI_PARAM1 ) , ImmPtr ( param1 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionPA ( const void * func , void * param1 , const Gen : : OpArg & arg2 ) { <nl> - MOV ( 64 , R ( ABI_PARAM1 ) , ImmPtr ( param1 ) ) ; <nl> - if ( ! arg2 . IsSimpleReg ( ABI_PARAM2 ) ) <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , arg2 ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionPAA ( const void * func , void * param1 , const Gen : : OpArg & arg2 , <nl> - const Gen : : OpArg & arg3 ) { <nl> - MOV ( 64 , R ( ABI_PARAM1 ) , ImmPtr ( param1 ) ) ; <nl> - if ( ! arg2 . IsSimpleReg ( ABI_PARAM2 ) ) <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , arg2 ) ; <nl> - if ( ! arg3 . IsSimpleReg ( ABI_PARAM3 ) ) <nl> - MOV ( 32 , R ( ABI_PARAM3 ) , arg3 ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionPPC ( const void * func , void * param1 , void * param2 , u32 param3 ) { <nl> - MOV ( 64 , R ( ABI_PARAM1 ) , ImmPtr ( param1 ) ) ; <nl> - MOV ( 64 , R ( ABI_PARAM2 ) , ImmPtr ( param2 ) ) ; <nl> - MOV ( 32 , R ( ABI_PARAM3 ) , Imm32 ( param3 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - / / Pass a register as a parameter . <nl> - void XEmitter : : ABI_CallFunctionR ( const void * func , X64Reg reg1 ) { <nl> - if ( reg1 ! = ABI_PARAM1 ) <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , R ( reg1 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - / / Pass two registers as parameters . <nl> - void XEmitter : : ABI_CallFunctionRR ( const void * func , X64Reg reg1 , X64Reg reg2 ) { <nl> - if ( reg2 ! = ABI_PARAM1 ) { <nl> - if ( reg1 ! = ABI_PARAM1 ) <nl> - MOV ( 64 , R ( ABI_PARAM1 ) , R ( reg1 ) ) ; <nl> - if ( reg2 ! = ABI_PARAM2 ) <nl> - MOV ( 64 , R ( ABI_PARAM2 ) , R ( reg2 ) ) ; <nl> - } else { <nl> - if ( reg2 ! = ABI_PARAM2 ) <nl> - MOV ( 64 , R ( ABI_PARAM2 ) , R ( reg2 ) ) ; <nl> - if ( reg1 ! = ABI_PARAM1 ) <nl> - MOV ( 64 , R ( ABI_PARAM1 ) , R ( reg1 ) ) ; <nl> - } <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionAC ( const void * func , const Gen : : OpArg & arg1 , u32 param2 ) { <nl> - if ( ! arg1 . IsSimpleReg ( ABI_PARAM1 ) ) <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , arg1 ) ; <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , Imm32 ( param2 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionACC ( const void * func , const Gen : : OpArg & arg1 , u32 param2 , <nl> - u32 param3 ) { <nl> - if ( ! arg1 . IsSimpleReg ( ABI_PARAM1 ) ) <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , arg1 ) ; <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , Imm32 ( param2 ) ) ; <nl> - MOV ( 64 , R ( ABI_PARAM3 ) , Imm64 ( param3 ) ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionA ( const void * func , const Gen : : OpArg & arg1 ) { <nl> - if ( ! arg1 . IsSimpleReg ( ABI_PARAM1 ) ) <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , arg1 ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ABI_CallFunctionAA ( const void * func , const Gen : : OpArg & arg1 , <nl> - const Gen : : OpArg & arg2 ) { <nl> - if ( ! arg1 . IsSimpleReg ( ABI_PARAM1 ) ) <nl> - MOV ( 32 , R ( ABI_PARAM1 ) , arg1 ) ; <nl> - if ( ! arg2 . IsSimpleReg ( ABI_PARAM2 ) ) <nl> - MOV ( 32 , R ( ABI_PARAM2 ) , arg2 ) ; <nl> - u64 distance = u64 ( func ) - ( u64 ( code ) + 5 ) ; <nl> - if ( distance > = 0x0000000080000000ULL & & distance < 0xFFFFFFFF80000000ULL ) { <nl> - / / Far call <nl> - MOV ( 64 , R ( RAX ) , ImmPtr ( func ) ) ; <nl> - CALLptr ( R ( RAX ) ) ; <nl> - } else { <nl> - CALL ( func ) ; <nl> - } <nl> - } <nl> \ No newline at end of file <nl> deleted file mode 100644 <nl> index eaaf81d89f9 . . 00000000000 <nl> mmm a / src / common / x64 / abi . h <nl> ppp / dev / null <nl> <nl> - / / Copyright 2008 Dolphin Emulator Project <nl> - / / Licensed under GPLv2 + <nl> - / / Refer to the license . txt file included . <nl> - <nl> - # pragma once <nl> - <nl> - # include " common / bit_set . h " <nl> - # include " emitter . h " <nl> - <nl> - / / x64 ABI : s , and helpers to help follow them when JIT - ing code . <nl> - / / All convensions return values in EAX ( + possibly EDX ) . <nl> - <nl> - / / Windows 64 - bit <nl> - / / * 4 - reg " fastcall " variant , very new - skool stack handling <nl> - / / * Callee moves stack pointer , to make room for shadow regs for the biggest function _it itself <nl> - / / calls_ <nl> - / / * Parameters passed in RCX , RDX , . . . further parameters are MOVed into the allocated stack space . <nl> - / / Scratch : RAX RCX RDX R8 R9 R10 R11 <nl> - / / Callee - save : RBX RSI RDI RBP R12 R13 R14 R15 <nl> - / / Parameters : RCX RDX R8 R9 , further MOV - ed <nl> - <nl> - / / Linux 64 - bit <nl> - / / * 6 - reg " fastcall " variant , old skool stack handling ( parameters are pushed ) <nl> - / / Scratch : RAX RCX RDX RSI RDI R8 R9 R10 R11 <nl> - / / Callee - save : RBX RBP R12 R13 R14 R15 <nl> - / / Parameters : RDI RSI RDX RCX R8 R9 <nl> - <nl> - # define ABI_ALL_FPRS BitSet32 ( 0xffff0000 ) <nl> - # define ABI_ALL_GPRS BitSet32 ( 0x0000ffff ) <nl> - <nl> - # ifdef _WIN32 / / 64 - bit Windows - the really exotic calling convention <nl> - <nl> - # define ABI_PARAM1 RCX <nl> - # define ABI_PARAM2 RDX <nl> - # define ABI_PARAM3 R8 <nl> - # define ABI_PARAM4 R9 <nl> - <nl> - / / xmm0 - xmm15 use the upper 16 bits in the functions that push / pop registers . <nl> - # define ABI_ALL_CALLER_SAVED \ <nl> - ( BitSet32 { RAX , RCX , RDX , R8 , R9 , R10 , R11 , XMM0 + 16 , XMM1 + 16 , XMM2 + 16 , XMM3 + 16 , \ <nl> - XMM4 + 16 , XMM5 + 16 } ) <nl> - # else / / 64 - bit Unix / OS X <nl> - <nl> - # define ABI_PARAM1 RDI <nl> - # define ABI_PARAM2 RSI <nl> - # define ABI_PARAM3 RDX <nl> - # define ABI_PARAM4 RCX <nl> - # define ABI_PARAM5 R8 <nl> - # define ABI_PARAM6 R9 <nl> - <nl> - / / TODO : Avoid pushing all 16 XMM registers when possible . Most functions we call probably <nl> - / / don ' t actually clobber them . <nl> - # define ABI_ALL_CALLER_SAVED ( BitSet32 { RAX , RCX , RDX , RDI , RSI , R8 , R9 , R10 , R11 } | ABI_ALL_FPRS ) <nl> - # endif / / WIN32 <nl> - <nl> - # define ABI_ALL_CALLEE_SAVED ( ~ ABI_ALL_CALLER_SAVED ) <nl> - <nl> - # define ABI_RETURN RAX <nl> deleted file mode 100644 <nl> index f5930abece1 . . 00000000000 <nl> mmm a / src / common / x64 / emitter . cpp <nl> ppp / dev / null <nl> <nl> - / / Copyright ( C ) 2003 Dolphin Project . <nl> - <nl> - / / This program is free software : you can redistribute it and / or modify <nl> - / / it under the terms of the GNU General Public License as published by <nl> - / / the Free Software Foundation , version 2 . 0 or later versions . <nl> - <nl> - / / This program is distributed in the hope that it will be useful , <nl> - / / but WITHOUT ANY WARRANTY ; without even the implied warranty of <nl> - / / MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the <nl> - / / GNU General Public License 2 . 0 for more details . <nl> - <nl> - / / A copy of the GPL 2 . 0 should have been included with the program . <nl> - / / If not , see http : / / www . gnu . org / licenses / <nl> - <nl> - / / Official SVN repository and contact information can be found at <nl> - / / http : / / code . google . com / p / dolphin - emu / <nl> - <nl> - # include < cinttypes > <nl> - # include < cstring > <nl> - # include " abi . h " <nl> - # include " common / assert . h " <nl> - # include " common / logging / log . h " <nl> - # include " common / memory_util . h " <nl> - # include " cpu_detect . h " <nl> - # include " emitter . h " <nl> - <nl> - namespace Gen { <nl> - <nl> - struct NormalOpDef { <nl> - u8 toRm8 , toRm32 , fromRm8 , fromRm32 , imm8 , imm32 , simm8 , eaximm8 , eaximm32 , ext ; <nl> - } ; <nl> - <nl> - / / 0xCC is code for invalid combination of immediates <nl> - static const NormalOpDef normalops [ 11 ] = { <nl> - { 0x00 , 0x01 , 0x02 , 0x03 , 0x80 , 0x81 , 0x83 , 0x04 , 0x05 , 0 } , / / ADD <nl> - { 0x10 , 0x11 , 0x12 , 0x13 , 0x80 , 0x81 , 0x83 , 0x14 , 0x15 , 2 } , / / ADC <nl> - <nl> - { 0x28 , 0x29 , 0x2A , 0x2B , 0x80 , 0x81 , 0x83 , 0x2C , 0x2D , 5 } , / / SUB <nl> - { 0x18 , 0x19 , 0x1A , 0x1B , 0x80 , 0x81 , 0x83 , 0x1C , 0x1D , 3 } , / / SBB <nl> - <nl> - { 0x20 , 0x21 , 0x22 , 0x23 , 0x80 , 0x81 , 0x83 , 0x24 , 0x25 , 4 } , / / AND <nl> - { 0x08 , 0x09 , 0x0A , 0x0B , 0x80 , 0x81 , 0x83 , 0x0C , 0x0D , 1 } , / / OR <nl> - <nl> - { 0x30 , 0x31 , 0x32 , 0x33 , 0x80 , 0x81 , 0x83 , 0x34 , 0x35 , 6 } , / / XOR <nl> - { 0x88 , 0x89 , 0x8A , 0x8B , 0xC6 , 0xC7 , 0xCC , 0xCC , 0xCC , 0 } , / / MOV <nl> - <nl> - { 0x84 , 0x85 , 0x84 , 0x85 , 0xF6 , 0xF7 , 0xCC , 0xA8 , 0xA9 , 0 } , / / TEST ( to = = from ) <nl> - { 0x38 , 0x39 , 0x3A , 0x3B , 0x80 , 0x81 , 0x83 , 0x3C , 0x3D , 7 } , / / CMP <nl> - <nl> - { 0x86 , 0x87 , 0x86 , 0x87 , 0xCC , 0xCC , 0xCC , 0xCC , 0xCC , 7 } , / / XCHG <nl> - } ; <nl> - <nl> - enum NormalSSEOps { <nl> - sseCMP = 0xC2 , <nl> - sseADD = 0x58 , / / ADD <nl> - sseSUB = 0x5C , / / SUB <nl> - sseAND = 0x54 , / / AND <nl> - sseANDN = 0x55 , / / ANDN <nl> - sseOR = 0x56 , <nl> - sseXOR = 0x57 , <nl> - sseMUL = 0x59 , / / MUL <nl> - sseDIV = 0x5E , / / DIV <nl> - sseMIN = 0x5D , / / MIN <nl> - sseMAX = 0x5F , / / MAX <nl> - sseCOMIS = 0x2F , / / COMIS <nl> - sseUCOMIS = 0x2E , / / UCOMIS <nl> - sseSQRT = 0x51 , / / SQRT <nl> - sseRSQRT = 0x52 , / / RSQRT ( NO DOUBLE PRECISION ! ! ! ) <nl> - sseRCP = 0x53 , / / RCP <nl> - sseMOVAPfromRM = 0x28 , / / MOVAP from RM <nl> - sseMOVAPtoRM = 0x29 , / / MOVAP to RM <nl> - sseMOVUPfromRM = 0x10 , / / MOVUP from RM <nl> - sseMOVUPtoRM = 0x11 , / / MOVUP to RM <nl> - sseMOVLPfromRM = 0x12 , <nl> - sseMOVLPtoRM = 0x13 , <nl> - sseMOVHPfromRM = 0x16 , <nl> - sseMOVHPtoRM = 0x17 , <nl> - sseMOVHLPS = 0x12 , <nl> - sseMOVLHPS = 0x16 , <nl> - sseMOVDQfromRM = 0x6F , <nl> - sseMOVDQtoRM = 0x7F , <nl> - sseMASKMOVDQU = 0xF7 , <nl> - sseLDDQU = 0xF0 , <nl> - sseSHUF = 0xC6 , <nl> - sseMOVNTDQ = 0xE7 , <nl> - sseMOVNTP = 0x2B , <nl> - sseHADD = 0x7C , <nl> - } ; <nl> - <nl> - void XEmitter : : SetCodePtr ( u8 * ptr ) { <nl> - code = ptr ; <nl> - } <nl> - <nl> - const u8 * XEmitter : : GetCodePtr ( ) const { <nl> - return code ; <nl> - } <nl> - <nl> - u8 * XEmitter : : GetWritableCodePtr ( ) { <nl> - return code ; <nl> - } <nl> - <nl> - void XEmitter : : Write8 ( u8 value ) { <nl> - * code + + = value ; <nl> - } <nl> - <nl> - void XEmitter : : Write16 ( u16 value ) { <nl> - std : : memcpy ( code , & value , sizeof ( u16 ) ) ; <nl> - code + = sizeof ( u16 ) ; <nl> - } <nl> - <nl> - void XEmitter : : Write32 ( u32 value ) { <nl> - std : : memcpy ( code , & value , sizeof ( u32 ) ) ; <nl> - code + = sizeof ( u32 ) ; <nl> - } <nl> - <nl> - void XEmitter : : Write64 ( u64 value ) { <nl> - std : : memcpy ( code , & value , sizeof ( u64 ) ) ; <nl> - code + = sizeof ( u64 ) ; <nl> - } <nl> - <nl> - void XEmitter : : ReserveCodeSpace ( int bytes ) { <nl> - for ( int i = 0 ; i < bytes ; i + + ) <nl> - * code + + = 0xCC ; <nl> - } <nl> - <nl> - const u8 * XEmitter : : AlignCode4 ( ) { <nl> - int c = int ( ( u64 ) code & 3 ) ; <nl> - if ( c ) <nl> - ReserveCodeSpace ( 4 - c ) ; <nl> - return code ; <nl> - } <nl> - <nl> - const u8 * XEmitter : : AlignCode16 ( ) { <nl> - int c = int ( ( u64 ) code & 15 ) ; <nl> - if ( c ) <nl> - ReserveCodeSpace ( 16 - c ) ; <nl> - return code ; <nl> - } <nl> - <nl> - const u8 * XEmitter : : AlignCodePage ( ) { <nl> - int c = int ( ( u64 ) code & 4095 ) ; <nl> - if ( c ) <nl> - ReserveCodeSpace ( 4096 - c ) ; <nl> - return code ; <nl> - } <nl> - <nl> - / / This operation modifies flags ; check to see the flags are locked . <nl> - / / If the flags are locked , we should immediately and loudly fail before <nl> - / / causing a subtle JIT bug . <nl> - void XEmitter : : CheckFlags ( ) { <nl> - ASSERT_MSG ( ! flags_locked , " Attempt to modify flags while flags locked ! " ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteModRM ( int mod , int reg , int rm ) { <nl> - Write8 ( ( u8 ) ( ( mod < < 6 ) | ( ( reg & 7 ) < < 3 ) | ( rm & 7 ) ) ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteSIB ( int scale , int index , int base ) { <nl> - Write8 ( ( u8 ) ( ( scale < < 6 ) | ( ( index & 7 ) < < 3 ) | ( base & 7 ) ) ) ; <nl> - } <nl> - <nl> - void OpArg : : WriteRex ( XEmitter * emit , int opBits , int bits , int customOp ) const { <nl> - if ( customOp = = - 1 ) <nl> - customOp = operandReg ; <nl> - # ifdef ARCHITECTURE_x86_64 <nl> - u8 op = 0x40 ; <nl> - / / REX . W ( whether operation is a 64 - bit operation ) <nl> - if ( opBits = = 64 ) <nl> - op | = 8 ; <nl> - / / REX . R ( whether ModR / M reg field refers to R8 - R15 . <nl> - if ( customOp & 8 ) <nl> - op | = 4 ; <nl> - / / REX . X ( whether ModR / M SIB index field refers to R8 - R15 ) <nl> - if ( indexReg & 8 ) <nl> - op | = 2 ; <nl> - / / REX . B ( whether ModR / M rm or SIB base or opcode reg field refers to R8 - R15 ) <nl> - if ( offsetOrBaseReg & 8 ) <nl> - op | = 1 ; <nl> - / / Write REX if wr have REX bits to write , or if the operation accesses <nl> - / / SIL , DIL , BPL , or SPL . <nl> - if ( op ! = 0x40 | | ( scale = = SCALE_NONE & & bits = = 8 & & ( offsetOrBaseReg & 0x10c ) = = 4 ) | | <nl> - ( opBits = = 8 & & ( customOp & 0x10c ) = = 4 ) ) { <nl> - emit - > Write8 ( op ) ; <nl> - / / Check the operation doesn ' t access AH , BH , CH , or DH . <nl> - DEBUG_ASSERT ( ( offsetOrBaseReg & 0x100 ) = = 0 ) ; <nl> - DEBUG_ASSERT ( ( customOp & 0x100 ) = = 0 ) ; <nl> - } <nl> - # else <nl> - DEBUG_ASSERT ( opBits ! = 64 ) ; <nl> - DEBUG_ASSERT ( ( customOp & 8 ) = = 0 | | customOp = = - 1 ) ; <nl> - DEBUG_ASSERT ( ( indexReg & 8 ) = = 0 ) ; <nl> - DEBUG_ASSERT ( ( offsetOrBaseReg & 8 ) = = 0 ) ; <nl> - DEBUG_ASSERT ( opBits ! = 8 | | ( customOp & 0x10c ) ! = 4 | | customOp = = - 1 ) ; <nl> - DEBUG_ASSERT ( scale = = SCALE_ATREG | | bits ! = 8 | | ( offsetOrBaseReg & 0x10c ) ! = 4 ) ; <nl> - # endif <nl> - } <nl> - <nl> - void OpArg : : WriteVex ( XEmitter * emit , X64Reg regOp1 , X64Reg regOp2 , int L , int pp , int mmmmm , <nl> - int W ) const { <nl> - int R = ! ( regOp1 & 8 ) ; <nl> - int X = ! ( indexReg & 8 ) ; <nl> - int B = ! ( offsetOrBaseReg & 8 ) ; <nl> - <nl> - int vvvv = ( regOp2 = = X64Reg : : INVALID_REG ) ? 0xf : ( regOp2 ^ 0xf ) ; <nl> - <nl> - / / do we need any VEX fields that only appear in the three - byte form ? <nl> - if ( X = = 1 & & B = = 1 & & W = = 0 & & mmmmm = = 1 ) { <nl> - u8 RvvvvLpp = ( R < < 7 ) | ( vvvv < < 3 ) | ( L < < 2 ) | pp ; <nl> - emit - > Write8 ( 0xC5 ) ; <nl> - emit - > Write8 ( RvvvvLpp ) ; <nl> - } else { <nl> - u8 RXBmmmmm = ( R < < 7 ) | ( X < < 6 ) | ( B < < 5 ) | mmmmm ; <nl> - u8 WvvvvLpp = ( W < < 7 ) | ( vvvv < < 3 ) | ( L < < 2 ) | pp ; <nl> - emit - > Write8 ( 0xC4 ) ; <nl> - emit - > Write8 ( RXBmmmmm ) ; <nl> - emit - > Write8 ( WvvvvLpp ) ; <nl> - } <nl> - } <nl> - <nl> - void OpArg : : WriteRest ( XEmitter * emit , int extraBytes , X64Reg _operandReg , <nl> - bool warn_64bit_offset ) const { <nl> - if ( _operandReg = = INVALID_REG ) <nl> - _operandReg = ( X64Reg ) this - > operandReg ; <nl> - int mod = 0 ; <nl> - int ireg = indexReg ; <nl> - bool SIB = false ; <nl> - int _offsetOrBaseReg = this - > offsetOrBaseReg ; <nl> - <nl> - if ( scale = = SCALE_RIP ) / / Also , on 32 - bit , just an immediate address <nl> - { <nl> - / / Oh , RIP addressing . <nl> - _offsetOrBaseReg = 5 ; <nl> - emit - > WriteModRM ( 0 , _operandReg , _offsetOrBaseReg ) ; <nl> - / / TODO : add some checks <nl> - # ifdef ARCHITECTURE_x86_64 <nl> - u64 ripAddr = ( u64 ) emit - > GetCodePtr ( ) + 4 + extraBytes ; <nl> - s64 distance = ( s64 ) offset - ( s64 ) ripAddr ; <nl> - ASSERT_MSG ( ( distance < 0x80000000LL & & distance > = - 0x80000000LL ) | | ! warn_64bit_offset , <nl> - " WriteRest : op out of range ( 0x % " PRIx64 " uses 0x % " PRIx64 " ) " , ripAddr , <nl> - offset ) ; <nl> - s32 offs = ( s32 ) distance ; <nl> - emit - > Write32 ( ( u32 ) offs ) ; <nl> - # else <nl> - emit - > Write32 ( ( u32 ) offset ) ; <nl> - # endif <nl> - return ; <nl> - } <nl> - <nl> - if ( scale = = 0 ) { <nl> - / / Oh , no memory , Just a reg . <nl> - mod = 3 ; / / 11 <nl> - } else if ( scale > = 1 ) { <nl> - / / Ah good , no scaling . <nl> - if ( scale = = SCALE_ATREG & & ! ( ( _offsetOrBaseReg & 7 ) = = 4 | | ( _offsetOrBaseReg & 7 ) = = 5 ) ) { <nl> - / / Okay , we ' re good . No SIB necessary . <nl> - int ioff = ( int ) offset ; <nl> - if ( ioff = = 0 ) { <nl> - mod = 0 ; <nl> - } else if ( ioff < - 128 | | ioff > 127 ) { <nl> - mod = 2 ; / / 32 - bit displacement <nl> - } else { <nl> - mod = 1 ; / / 8 - bit displacement <nl> - } <nl> - } else if ( scale > = SCALE_NOBASE_2 & & scale < = SCALE_NOBASE_8 ) { <nl> - SIB = true ; <nl> - mod = 0 ; <nl> - _offsetOrBaseReg = 5 ; <nl> - } else / / if ( scale ! = SCALE_ATREG ) <nl> - { <nl> - if ( ( _offsetOrBaseReg & 7 ) = = 4 ) / / this would occupy the SIB encoding : ( <nl> - { <nl> - / / So we have to fake it with SIB encoding : ( <nl> - SIB = true ; <nl> - } <nl> - <nl> - if ( scale > = SCALE_1 & & scale < SCALE_ATREG ) { <nl> - SIB = true ; <nl> - } <nl> - <nl> - if ( scale = = SCALE_ATREG & & ( ( _offsetOrBaseReg & 7 ) = = 4 ) ) { <nl> - SIB = true ; <nl> - ireg = _offsetOrBaseReg ; <nl> - } <nl> - <nl> - / / Okay , we ' re fine . Just disp encoding . <nl> - / / We need displacement . Which size ? <nl> - int ioff = ( int ) ( s64 ) offset ; <nl> - if ( ioff < - 128 | | ioff > 127 ) { <nl> - mod = 2 ; / / 32 - bit displacement <nl> - } else { <nl> - mod = 1 ; / / 8 - bit displacement <nl> - } <nl> - } <nl> - } <nl> - <nl> - / / Okay . Time to do the actual writing <nl> - / / ModRM byte : <nl> - int oreg = _offsetOrBaseReg ; <nl> - if ( SIB ) <nl> - oreg = 4 ; <nl> - <nl> - / / TODO ( ector ) : WTF is this if about ? I don ' t remember writing it : - ) <nl> - / / if ( RIP ) <nl> - / / oreg = 5 ; <nl> - <nl> - emit - > WriteModRM ( mod , _operandReg & 7 , oreg & 7 ) ; <nl> - <nl> - if ( SIB ) { <nl> - / / SIB byte <nl> - int ss ; <nl> - switch ( scale ) { <nl> - case SCALE_NONE : <nl> - _offsetOrBaseReg = 4 ; <nl> - ss = 0 ; <nl> - break ; / / RSP <nl> - case SCALE_1 : <nl> - ss = 0 ; <nl> - break ; <nl> - case SCALE_2 : <nl> - ss = 1 ; <nl> - break ; <nl> - case SCALE_4 : <nl> - ss = 2 ; <nl> - break ; <nl> - case SCALE_8 : <nl> - ss = 3 ; <nl> - break ; <nl> - case SCALE_NOBASE_2 : <nl> - ss = 1 ; <nl> - break ; <nl> - case SCALE_NOBASE_4 : <nl> - ss = 2 ; <nl> - break ; <nl> - case SCALE_NOBASE_8 : <nl> - ss = 3 ; <nl> - break ; <nl> - case SCALE_ATREG : <nl> - ss = 0 ; <nl> - break ; <nl> - default : <nl> - ASSERT_MSG ( 0 , " Invalid scale for SIB byte " ) ; <nl> - ss = 0 ; <nl> - break ; <nl> - } <nl> - emit - > Write8 ( ( u8 ) ( ( ss < < 6 ) | ( ( ireg & 7 ) < < 3 ) | ( _offsetOrBaseReg & 7 ) ) ) ; <nl> - } <nl> - <nl> - if ( mod = = 1 ) / / 8 - bit disp <nl> - { <nl> - emit - > Write8 ( ( u8 ) ( s8 ) ( s32 ) offset ) ; <nl> - } else if ( mod = = 2 | | ( scale > = SCALE_NOBASE_2 & & scale < = SCALE_NOBASE_8 ) ) / / 32 - bit disp <nl> - { <nl> - emit - > Write32 ( ( u32 ) offset ) ; <nl> - } <nl> - } <nl> - <nl> - / / W = operand extended width ( 1 if 64 - bit ) <nl> - / / R = register # upper bit <nl> - / / X = scale amnt upper bit <nl> - / / B = base register # upper bit <nl> - void XEmitter : : Rex ( int w , int r , int x , int b ) { <nl> - w = w ? 1 : 0 ; <nl> - r = r ? 1 : 0 ; <nl> - x = x ? 1 : 0 ; <nl> - b = b ? 1 : 0 ; <nl> - u8 rx = ( u8 ) ( 0x40 | ( w < < 3 ) | ( r < < 2 ) | ( x < < 1 ) | ( b ) ) ; <nl> - if ( rx ! = 0x40 ) <nl> - Write8 ( rx ) ; <nl> - } <nl> - <nl> - void XEmitter : : JMP ( const u8 * addr , bool force5Bytes ) { <nl> - u64 fn = ( u64 ) addr ; <nl> - if ( ! force5Bytes ) { <nl> - s64 distance = ( s64 ) ( fn - ( ( u64 ) code + 2 ) ) ; <nl> - ASSERT_MSG ( distance > = - 0x80 & & distance < 0x80 , <nl> - " Jump target too far away , needs force5Bytes = true " ) ; <nl> - / / 8 bits will do <nl> - Write8 ( 0xEB ) ; <nl> - Write8 ( ( u8 ) ( s8 ) distance ) ; <nl> - } else { <nl> - s64 distance = ( s64 ) ( fn - ( ( u64 ) code + 5 ) ) ; <nl> - <nl> - ASSERT_MSG ( distance > = - 0x80000000LL & & distance < 0x80000000LL , <nl> - " Jump target too far away , needs indirect register " ) ; <nl> - Write8 ( 0xE9 ) ; <nl> - Write32 ( ( u32 ) ( s32 ) distance ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : JMPptr ( const OpArg & arg2 ) { <nl> - OpArg arg = arg2 ; <nl> - if ( arg . IsImm ( ) ) <nl> - ASSERT_MSG ( 0 , " JMPptr - Imm argument " ) ; <nl> - arg . operandReg = 4 ; <nl> - arg . WriteRex ( this , 0 , 0 ) ; <nl> - Write8 ( 0xFF ) ; <nl> - arg . WriteRest ( this ) ; <nl> - } <nl> - <nl> - / / Can be used to trap other processors , before overwriting their code <nl> - / / not used in dolphin <nl> - void XEmitter : : JMPself ( ) { <nl> - Write8 ( 0xEB ) ; <nl> - Write8 ( 0xFE ) ; <nl> - } <nl> - <nl> - void XEmitter : : CALLptr ( OpArg arg ) { <nl> - if ( arg . IsImm ( ) ) <nl> - ASSERT_MSG ( 0 , " CALLptr - Imm argument " ) ; <nl> - arg . operandReg = 2 ; <nl> - arg . WriteRex ( this , 0 , 0 ) ; <nl> - Write8 ( 0xFF ) ; <nl> - arg . WriteRest ( this ) ; <nl> - } <nl> - <nl> - void XEmitter : : CALL ( const void * fnptr ) { <nl> - u64 distance = u64 ( fnptr ) - ( u64 ( code ) + 5 ) ; <nl> - ASSERT_MSG ( distance < 0x0000000080000000ULL | | distance > = 0xFFFFFFFF80000000ULL , <nl> - " CALL out of range ( % p calls % p ) " , code , fnptr ) ; <nl> - Write8 ( 0xE8 ) ; <nl> - Write32 ( u32 ( distance ) ) ; <nl> - } <nl> - <nl> - FixupBranch XEmitter : : CALL ( ) { <nl> - FixupBranch branch ; <nl> - branch . type = 1 ; <nl> - branch . ptr = code + 5 ; <nl> - <nl> - Write8 ( 0xE8 ) ; <nl> - Write32 ( 0 ) ; <nl> - <nl> - return branch ; <nl> - } <nl> - <nl> - FixupBranch XEmitter : : J ( bool force5bytes ) { <nl> - FixupBranch branch ; <nl> - branch . type = force5bytes ? 1 : 0 ; <nl> - branch . ptr = code + ( force5bytes ? 5 : 2 ) ; <nl> - if ( ! force5bytes ) { <nl> - / / 8 bits will do <nl> - Write8 ( 0xEB ) ; <nl> - Write8 ( 0 ) ; <nl> - } else { <nl> - Write8 ( 0xE9 ) ; <nl> - Write32 ( 0 ) ; <nl> - } <nl> - return branch ; <nl> - } <nl> - <nl> - FixupBranch XEmitter : : J_CC ( CCFlags conditionCode , bool force5bytes ) { <nl> - FixupBranch branch ; <nl> - branch . type = force5bytes ? 1 : 0 ; <nl> - branch . ptr = code + ( force5bytes ? 6 : 2 ) ; <nl> - if ( ! force5bytes ) { <nl> - / / 8 bits will do <nl> - Write8 ( 0x70 + conditionCode ) ; <nl> - Write8 ( 0 ) ; <nl> - } else { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x80 + conditionCode ) ; <nl> - Write32 ( 0 ) ; <nl> - } <nl> - return branch ; <nl> - } <nl> - <nl> - void XEmitter : : J_CC ( CCFlags conditionCode , const u8 * addr , bool force5bytes ) { <nl> - u64 fn = ( u64 ) addr ; <nl> - s64 distance = ( s64 ) ( fn - ( ( u64 ) code + 2 ) ) ; <nl> - if ( distance < - 0x80 | | distance > = 0x80 | | force5bytes ) { <nl> - distance = ( s64 ) ( fn - ( ( u64 ) code + 6 ) ) ; <nl> - ASSERT_MSG ( distance > = - 0x80000000LL & & distance < 0x80000000LL , <nl> - " Jump target too far away , needs indirect register " ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x80 + conditionCode ) ; <nl> - Write32 ( ( u32 ) ( s32 ) distance ) ; <nl> - } else { <nl> - Write8 ( 0x70 + conditionCode ) ; <nl> - Write8 ( ( u8 ) ( s8 ) distance ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : SetJumpTarget ( const FixupBranch & branch ) { <nl> - if ( branch . type = = 0 ) { <nl> - s64 distance = ( s64 ) ( code - branch . ptr ) ; <nl> - ASSERT_MSG ( distance > = - 0x80 & & distance < 0x80 , <nl> - " Jump target too far away , needs force5Bytes = true " ) ; <nl> - branch . ptr [ - 1 ] = ( u8 ) ( s8 ) distance ; <nl> - } else if ( branch . type = = 1 ) { <nl> - s64 distance = ( s64 ) ( code - branch . ptr ) ; <nl> - ASSERT_MSG ( distance > = - 0x80000000LL & & distance < 0x80000000LL , <nl> - " Jump target too far away , needs indirect register " ) ; <nl> - ( ( s32 * ) branch . ptr ) [ - 1 ] = ( s32 ) distance ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : SetJumpTarget ( const FixupBranch & branch , const u8 * target ) { <nl> - if ( branch . type = = 0 ) { <nl> - s64 distance = ( s64 ) ( target - branch . ptr ) ; <nl> - ASSERT_MSG ( distance > = - 0x80 & & distance < 0x80 , <nl> - " Jump target too far away , needs force5Bytes = true " ) ; <nl> - branch . ptr [ - 1 ] = ( u8 ) ( s8 ) distance ; <nl> - } else if ( branch . type = = 1 ) { <nl> - s64 distance = ( s64 ) ( target - branch . ptr ) ; <nl> - ASSERT_MSG ( distance > = - 0x80000000LL & & distance < 0x80000000LL , <nl> - " Jump target too far away , needs indirect register " ) ; <nl> - ( ( s32 * ) branch . ptr ) [ - 1 ] = ( s32 ) distance ; <nl> - } <nl> - } <nl> - <nl> - / / Single byte opcodes <nl> - / / There is no PUSHAD / POPAD in 64 - bit mode . <nl> - void XEmitter : : INT3 ( ) { <nl> - Write8 ( 0xCC ) ; <nl> - } <nl> - void XEmitter : : RET ( ) { <nl> - Write8 ( 0xC3 ) ; <nl> - } <nl> - void XEmitter : : RET_FAST ( ) { <nl> - Write8 ( 0xF3 ) ; <nl> - Write8 ( 0xC3 ) ; <nl> - } / / two - byte return ( rep ret ) - recommended by AMD optimization manual for the case of jumping to a <nl> - / / ret <nl> - <nl> - / / The first sign of decadence : optimized NOPs . <nl> - void XEmitter : : NOP ( size_t size ) { <nl> - DEBUG_ASSERT ( ( int ) size > 0 ) ; <nl> - while ( true ) { <nl> - switch ( size ) { <nl> - case 0 : <nl> - return ; <nl> - case 1 : <nl> - Write8 ( 0x90 ) ; <nl> - return ; <nl> - case 2 : <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x90 ) ; <nl> - return ; <nl> - case 3 : <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x1F ) ; <nl> - Write8 ( 0x00 ) ; <nl> - return ; <nl> - case 4 : <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x1F ) ; <nl> - Write8 ( 0x40 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - return ; <nl> - case 5 : <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x1F ) ; <nl> - Write8 ( 0x44 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - return ; <nl> - case 6 : <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x1F ) ; <nl> - Write8 ( 0x44 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - return ; <nl> - case 7 : <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x1F ) ; <nl> - Write8 ( 0x80 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - return ; <nl> - case 8 : <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x1F ) ; <nl> - Write8 ( 0x84 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - return ; <nl> - case 9 : <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x1F ) ; <nl> - Write8 ( 0x84 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - return ; <nl> - case 10 : <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x1F ) ; <nl> - Write8 ( 0x84 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - return ; <nl> - default : <nl> - / / Even though x86 instructions are allowed to be up to 15 bytes long , <nl> - / / AMD advises against using NOPs longer than 11 bytes because they <nl> - / / carry a performance penalty on CPUs older than AMD family 16h . <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x1F ) ; <nl> - Write8 ( 0x84 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - Write8 ( 0x00 ) ; <nl> - size - = 11 ; <nl> - continue ; <nl> - } <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : PAUSE ( ) { <nl> - Write8 ( 0xF3 ) ; <nl> - NOP ( ) ; <nl> - } / / use in tight spinloops for energy saving on some cpu <nl> - void XEmitter : : CLC ( ) { <nl> - CheckFlags ( ) ; <nl> - Write8 ( 0xF8 ) ; <nl> - } / / clear carry <nl> - void XEmitter : : CMC ( ) { <nl> - CheckFlags ( ) ; <nl> - Write8 ( 0xF5 ) ; <nl> - } / / flip carry <nl> - void XEmitter : : STC ( ) { <nl> - CheckFlags ( ) ; <nl> - Write8 ( 0xF9 ) ; <nl> - } / / set carry <nl> - <nl> - / / TODO : xchg ah , al ? ? ? <nl> - void XEmitter : : XCHG_AHAL ( ) { <nl> - Write8 ( 0x86 ) ; <nl> - Write8 ( 0xe0 ) ; <nl> - / / alt . 86 c4 <nl> - } <nl> - <nl> - / / These two can not be executed on early Intel 64 - bit CPU : s , only on AMD ! <nl> - void XEmitter : : LAHF ( ) { <nl> - Write8 ( 0x9F ) ; <nl> - } <nl> - void XEmitter : : SAHF ( ) { <nl> - CheckFlags ( ) ; <nl> - Write8 ( 0x9E ) ; <nl> - } <nl> - <nl> - void XEmitter : : PUSHF ( ) { <nl> - Write8 ( 0x9C ) ; <nl> - } <nl> - void XEmitter : : POPF ( ) { <nl> - CheckFlags ( ) ; <nl> - Write8 ( 0x9D ) ; <nl> - } <nl> - <nl> - void XEmitter : : LFENCE ( ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xAE ) ; <nl> - Write8 ( 0xE8 ) ; <nl> - } <nl> - void XEmitter : : MFENCE ( ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xAE ) ; <nl> - Write8 ( 0xF0 ) ; <nl> - } <nl> - void XEmitter : : SFENCE ( ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xAE ) ; <nl> - Write8 ( 0xF8 ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteSimple1Byte ( int bits , u8 byte , X64Reg reg ) { <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - Rex ( bits = = 64 , 0 , 0 , ( int ) reg > > 3 ) ; <nl> - Write8 ( byte + ( ( int ) reg & 7 ) ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteSimple2Byte ( int bits , u8 byte1 , u8 byte2 , X64Reg reg ) { <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - Rex ( bits = = 64 , 0 , 0 , ( int ) reg > > 3 ) ; <nl> - Write8 ( byte1 ) ; <nl> - Write8 ( byte2 + ( ( int ) reg & 7 ) ) ; <nl> - } <nl> - <nl> - void XEmitter : : CWD ( int bits ) { <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - Rex ( bits = = 64 , 0 , 0 , 0 ) ; <nl> - Write8 ( 0x99 ) ; <nl> - } <nl> - <nl> - void XEmitter : : CBW ( int bits ) { <nl> - if ( bits = = 8 ) <nl> - Write8 ( 0x66 ) ; <nl> - Rex ( bits = = 32 , 0 , 0 , 0 ) ; <nl> - Write8 ( 0x98 ) ; <nl> - } <nl> - <nl> - / / Simple opcodes <nl> - <nl> - / / push / pop do not need wide to be 64 - bit <nl> - void XEmitter : : PUSH ( X64Reg reg ) { <nl> - WriteSimple1Byte ( 32 , 0x50 , reg ) ; <nl> - } <nl> - void XEmitter : : POP ( X64Reg reg ) { <nl> - WriteSimple1Byte ( 32 , 0x58 , reg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PUSH ( int bits , const OpArg & reg ) { <nl> - if ( reg . IsSimpleReg ( ) ) <nl> - PUSH ( reg . GetSimpleReg ( ) ) ; <nl> - else if ( reg . IsImm ( ) ) { <nl> - switch ( reg . GetImmBits ( ) ) { <nl> - case 8 : <nl> - Write8 ( 0x6A ) ; <nl> - Write8 ( ( u8 ) ( s8 ) reg . offset ) ; <nl> - break ; <nl> - case 16 : <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x68 ) ; <nl> - Write16 ( ( u16 ) ( s16 ) ( s32 ) reg . offset ) ; <nl> - break ; <nl> - case 32 : <nl> - Write8 ( 0x68 ) ; <nl> - Write32 ( ( u32 ) reg . offset ) ; <nl> - break ; <nl> - default : <nl> - ASSERT_MSG ( 0 , " PUSH - Bad imm bits " ) ; <nl> - break ; <nl> - } <nl> - } else { <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - reg . WriteRex ( this , bits , bits ) ; <nl> - Write8 ( 0xFF ) ; <nl> - reg . WriteRest ( this , 0 , ( X64Reg ) 6 ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : POP ( int / * bits * / , const OpArg & reg ) { <nl> - if ( reg . IsSimpleReg ( ) ) <nl> - POP ( reg . GetSimpleReg ( ) ) ; <nl> - else <nl> - ASSERT_MSG ( 0 , " POP - Unsupported encoding " ) ; <nl> - } <nl> - <nl> - void XEmitter : : BSWAP ( int bits , X64Reg reg ) { <nl> - if ( bits > = 32 ) { <nl> - WriteSimple2Byte ( bits , 0x0F , 0xC8 , reg ) ; <nl> - } else if ( bits = = 16 ) { <nl> - ROL ( 16 , R ( reg ) , Imm8 ( 8 ) ) ; <nl> - } else if ( bits = = 8 ) { <nl> - / / Do nothing - can ' t bswap a single byte . . . <nl> - } else { <nl> - ASSERT_MSG ( 0 , " BSWAP - Wrong number of bits " ) ; <nl> - } <nl> - } <nl> - <nl> - / / Undefined opcode - reserved <nl> - / / If we ever need a way to always cause a non - breakpoint hard exception . . . <nl> - void XEmitter : : UD2 ( ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x0B ) ; <nl> - } <nl> - <nl> - void XEmitter : : PREFETCH ( PrefetchLevel level , OpArg arg ) { <nl> - ASSERT_MSG ( ! arg . IsImm ( ) , " PREFETCH - Imm argument " ) ; <nl> - arg . operandReg = ( u8 ) level ; <nl> - arg . WriteRex ( this , 0 , 0 ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x18 ) ; <nl> - arg . WriteRest ( this ) ; <nl> - } <nl> - <nl> - void XEmitter : : SETcc ( CCFlags flag , OpArg dest ) { <nl> - ASSERT_MSG ( ! dest . IsImm ( ) , " SETcc - Imm argument " ) ; <nl> - dest . operandReg = 0 ; <nl> - dest . WriteRex ( this , 0 , 8 ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x90 + ( u8 ) flag ) ; <nl> - dest . WriteRest ( this ) ; <nl> - } <nl> - <nl> - void XEmitter : : CMOVcc ( int bits , X64Reg dest , OpArg src , CCFlags flag ) { <nl> - ASSERT_MSG ( ! src . IsImm ( ) , " CMOVcc - Imm argument " ) ; <nl> - ASSERT_MSG ( bits ! = 8 , " CMOVcc - 8 bits unsupported " ) ; <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - src . operandReg = dest ; <nl> - src . WriteRex ( this , bits , bits ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x40 + ( u8 ) flag ) ; <nl> - src . WriteRest ( this ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteMulDivType ( int bits , OpArg src , int ext ) { <nl> - ASSERT_MSG ( ! src . IsImm ( ) , " WriteMulDivType - Imm argument " ) ; <nl> - CheckFlags ( ) ; <nl> - src . operandReg = ext ; <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - src . WriteRex ( this , bits , bits , 0 ) ; <nl> - if ( bits = = 8 ) { <nl> - Write8 ( 0xF6 ) ; <nl> - } else { <nl> - Write8 ( 0xF7 ) ; <nl> - } <nl> - src . WriteRest ( this ) ; <nl> - } <nl> - <nl> - void XEmitter : : MUL ( int bits , const OpArg & src ) { <nl> - WriteMulDivType ( bits , src , 4 ) ; <nl> - } <nl> - void XEmitter : : DIV ( int bits , const OpArg & src ) { <nl> - WriteMulDivType ( bits , src , 6 ) ; <nl> - } <nl> - void XEmitter : : IMUL ( int bits , const OpArg & src ) { <nl> - WriteMulDivType ( bits , src , 5 ) ; <nl> - } <nl> - void XEmitter : : IDIV ( int bits , const OpArg & src ) { <nl> - WriteMulDivType ( bits , src , 7 ) ; <nl> - } <nl> - void XEmitter : : NEG ( int bits , const OpArg & src ) { <nl> - WriteMulDivType ( bits , src , 3 ) ; <nl> - } <nl> - void XEmitter : : NOT ( int bits , const OpArg & src ) { <nl> - WriteMulDivType ( bits , src , 2 ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteBitSearchType ( int bits , X64Reg dest , OpArg src , u8 byte2 , bool rep ) { <nl> - ASSERT_MSG ( ! src . IsImm ( ) , " WriteBitSearchType - Imm argument " ) ; <nl> - CheckFlags ( ) ; <nl> - src . operandReg = ( u8 ) dest ; <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - if ( rep ) <nl> - Write8 ( 0xF3 ) ; <nl> - src . WriteRex ( this , bits , bits ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( byte2 ) ; <nl> - src . WriteRest ( this ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVNTI ( int bits , const OpArg & dest , X64Reg src ) { <nl> - if ( bits < = 16 ) <nl> - ASSERT_MSG ( 0 , " MOVNTI - bits < = 16 " ) ; <nl> - WriteBitSearchType ( bits , src , dest , 0xC3 ) ; <nl> - } <nl> - <nl> - void XEmitter : : BSF ( int bits , X64Reg dest , const OpArg & src ) { <nl> - WriteBitSearchType ( bits , dest , src , 0xBC ) ; <nl> - } / / Bottom bit to top bit <nl> - void XEmitter : : BSR ( int bits , X64Reg dest , const OpArg & src ) { <nl> - WriteBitSearchType ( bits , dest , src , 0xBD ) ; <nl> - } / / Top bit to bottom bit <nl> - <nl> - void XEmitter : : TZCNT ( int bits , X64Reg dest , const OpArg & src ) { <nl> - CheckFlags ( ) ; <nl> - if ( ! Common : : GetCPUCaps ( ) . bmi1 ) <nl> - ASSERT_MSG ( 0 , " Trying to use BMI1 on a system that doesn ' t support it . Bad programmer . " ) ; <nl> - WriteBitSearchType ( bits , dest , src , 0xBC , true ) ; <nl> - } <nl> - void XEmitter : : LZCNT ( int bits , X64Reg dest , const OpArg & src ) { <nl> - CheckFlags ( ) ; <nl> - if ( ! Common : : GetCPUCaps ( ) . lzcnt ) <nl> - ASSERT_MSG ( 0 , " Trying to use LZCNT on a system that doesn ' t support it . Bad programmer . " ) ; <nl> - WriteBitSearchType ( bits , dest , src , 0xBD , true ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVSX ( int dbits , int sbits , X64Reg dest , OpArg src ) { <nl> - ASSERT_MSG ( ! src . IsImm ( ) , " MOVSX - Imm argument " ) ; <nl> - if ( dbits = = sbits ) { <nl> - MOV ( dbits , R ( dest ) , src ) ; <nl> - return ; <nl> - } <nl> - src . operandReg = ( u8 ) dest ; <nl> - if ( dbits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - src . WriteRex ( this , dbits , sbits ) ; <nl> - if ( sbits = = 8 ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xBE ) ; <nl> - } else if ( sbits = = 16 ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xBF ) ; <nl> - } else if ( sbits = = 32 & & dbits = = 64 ) { <nl> - Write8 ( 0x63 ) ; <nl> - } else { <nl> - Crash ( ) ; <nl> - } <nl> - src . WriteRest ( this ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVZX ( int dbits , int sbits , X64Reg dest , OpArg src ) { <nl> - ASSERT_MSG ( ! src . IsImm ( ) , " MOVZX - Imm argument " ) ; <nl> - if ( dbits = = sbits ) { <nl> - MOV ( dbits , R ( dest ) , src ) ; <nl> - return ; <nl> - } <nl> - src . operandReg = ( u8 ) dest ; <nl> - if ( dbits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - / / the 32bit result is automatically zero extended to 64bit <nl> - src . WriteRex ( this , dbits = = 64 ? 32 : dbits , sbits ) ; <nl> - if ( sbits = = 8 ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xB6 ) ; <nl> - } else if ( sbits = = 16 ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xB7 ) ; <nl> - } else if ( sbits = = 32 & & dbits = = 64 ) { <nl> - Write8 ( 0x8B ) ; <nl> - } else { <nl> - ASSERT_MSG ( 0 , " MOVZX - Invalid size " ) ; <nl> - } <nl> - src . WriteRest ( this ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVBE ( int bits , const OpArg & dest , const OpArg & src ) { <nl> - ASSERT_MSG ( Common : : GetCPUCaps ( ) . movbe , <nl> - " Generating MOVBE on a system that does not support it . " ) ; <nl> - if ( bits = = 8 ) { <nl> - MOV ( bits , dest , src ) ; <nl> - return ; <nl> - } <nl> - <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - <nl> - if ( dest . IsSimpleReg ( ) ) { <nl> - ASSERT_MSG ( ! src . IsSimpleReg ( ) & & ! src . IsImm ( ) , " MOVBE : Loading from ! mem " ) ; <nl> - src . WriteRex ( this , bits , bits , dest . GetSimpleReg ( ) ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x38 ) ; <nl> - Write8 ( 0xF0 ) ; <nl> - src . WriteRest ( this , 0 , dest . GetSimpleReg ( ) ) ; <nl> - } else if ( src . IsSimpleReg ( ) ) { <nl> - ASSERT_MSG ( ! dest . IsSimpleReg ( ) & & ! dest . IsImm ( ) , " MOVBE : Storing to ! mem " ) ; <nl> - dest . WriteRex ( this , bits , bits , src . GetSimpleReg ( ) ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x38 ) ; <nl> - Write8 ( 0xF1 ) ; <nl> - dest . WriteRest ( this , 0 , src . GetSimpleReg ( ) ) ; <nl> - } else { <nl> - ASSERT_MSG ( 0 , " MOVBE : Not loading or storing to mem " ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : LEA ( int bits , X64Reg dest , OpArg src ) { <nl> - ASSERT_MSG ( ! src . IsImm ( ) , " LEA - Imm argument " ) ; <nl> - src . operandReg = ( u8 ) dest ; <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; / / TODO : performance warning <nl> - src . WriteRex ( this , bits , bits ) ; <nl> - Write8 ( 0x8D ) ; <nl> - src . WriteRest ( this , 0 , INVALID_REG , bits = = 64 ) ; <nl> - } <nl> - <nl> - / / shift can be either imm8 or cl <nl> - void XEmitter : : WriteShift ( int bits , OpArg dest , const OpArg & shift , int ext ) { <nl> - CheckFlags ( ) ; <nl> - bool writeImm = false ; <nl> - if ( dest . IsImm ( ) ) { <nl> - ASSERT_MSG ( 0 , " WriteShift - can ' t shift imms " ) ; <nl> - } <nl> - if ( ( shift . IsSimpleReg ( ) & & shift . GetSimpleReg ( ) ! = ECX ) | | <nl> - ( shift . IsImm ( ) & & shift . GetImmBits ( ) ! = 8 ) ) { <nl> - ASSERT_MSG ( 0 , " WriteShift - illegal argument " ) ; <nl> - } <nl> - dest . operandReg = ext ; <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - dest . WriteRex ( this , bits , bits , 0 ) ; <nl> - if ( shift . GetImmBits ( ) = = 8 ) { <nl> - / / ok an imm <nl> - u8 imm = ( u8 ) shift . offset ; <nl> - if ( imm = = 1 ) { <nl> - Write8 ( bits = = 8 ? 0xD0 : 0xD1 ) ; <nl> - } else { <nl> - writeImm = true ; <nl> - Write8 ( bits = = 8 ? 0xC0 : 0xC1 ) ; <nl> - } <nl> - } else { <nl> - Write8 ( bits = = 8 ? 0xD2 : 0xD3 ) ; <nl> - } <nl> - dest . WriteRest ( this , writeImm ? 1 : 0 ) ; <nl> - if ( writeImm ) <nl> - Write8 ( ( u8 ) shift . offset ) ; <nl> - } <nl> - <nl> - / / large rotates and shift are slower on intel than amd <nl> - / / intel likes to rotate by 1 , and the op is smaller too <nl> - void XEmitter : : ROL ( int bits , const OpArg & dest , const OpArg & shift ) { <nl> - WriteShift ( bits , dest , shift , 0 ) ; <nl> - } <nl> - void XEmitter : : ROR ( int bits , const OpArg & dest , const OpArg & shift ) { <nl> - WriteShift ( bits , dest , shift , 1 ) ; <nl> - } <nl> - void XEmitter : : RCL ( int bits , const OpArg & dest , const OpArg & shift ) { <nl> - WriteShift ( bits , dest , shift , 2 ) ; <nl> - } <nl> - void XEmitter : : RCR ( int bits , const OpArg & dest , const OpArg & shift ) { <nl> - WriteShift ( bits , dest , shift , 3 ) ; <nl> - } <nl> - void XEmitter : : SHL ( int bits , const OpArg & dest , const OpArg & shift ) { <nl> - WriteShift ( bits , dest , shift , 4 ) ; <nl> - } <nl> - void XEmitter : : SHR ( int bits , const OpArg & dest , const OpArg & shift ) { <nl> - WriteShift ( bits , dest , shift , 5 ) ; <nl> - } <nl> - void XEmitter : : SAR ( int bits , const OpArg & dest , const OpArg & shift ) { <nl> - WriteShift ( bits , dest , shift , 7 ) ; <nl> - } <nl> - <nl> - / / index can be either imm8 or register , don ' t use memory destination because it ' s slow <nl> - void XEmitter : : WriteBitTest ( int bits , const OpArg & dest , const OpArg & index , int ext ) { <nl> - CheckFlags ( ) ; <nl> - if ( dest . IsImm ( ) ) { <nl> - ASSERT_MSG ( 0 , " WriteBitTest - can ' t test imms " ) ; <nl> - } <nl> - if ( ( index . IsImm ( ) & & index . GetImmBits ( ) ! = 8 ) ) { <nl> - ASSERT_MSG ( 0 , " WriteBitTest - illegal argument " ) ; <nl> - } <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - if ( index . IsImm ( ) ) { <nl> - dest . WriteRex ( this , bits , bits ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xBA ) ; <nl> - dest . WriteRest ( this , 1 , ( X64Reg ) ext ) ; <nl> - Write8 ( ( u8 ) index . offset ) ; <nl> - } else { <nl> - X64Reg operand = index . GetSimpleReg ( ) ; <nl> - dest . WriteRex ( this , bits , bits , operand ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x83 + 8 * ext ) ; <nl> - dest . WriteRest ( this , 1 , operand ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : BT ( int bits , const OpArg & dest , const OpArg & index ) { <nl> - WriteBitTest ( bits , dest , index , 4 ) ; <nl> - } <nl> - void XEmitter : : BTS ( int bits , const OpArg & dest , const OpArg & index ) { <nl> - WriteBitTest ( bits , dest , index , 5 ) ; <nl> - } <nl> - void XEmitter : : BTR ( int bits , const OpArg & dest , const OpArg & index ) { <nl> - WriteBitTest ( bits , dest , index , 6 ) ; <nl> - } <nl> - void XEmitter : : BTC ( int bits , const OpArg & dest , const OpArg & index ) { <nl> - WriteBitTest ( bits , dest , index , 7 ) ; <nl> - } <nl> - <nl> - / / shift can be either imm8 or cl <nl> - void XEmitter : : SHRD ( int bits , const OpArg & dest , const OpArg & src , const OpArg & shift ) { <nl> - CheckFlags ( ) ; <nl> - if ( dest . IsImm ( ) ) { <nl> - ASSERT_MSG ( 0 , " SHRD - can ' t use imms as destination " ) ; <nl> - } <nl> - if ( ! src . IsSimpleReg ( ) ) { <nl> - ASSERT_MSG ( 0 , " SHRD - must use simple register as source " ) ; <nl> - } <nl> - if ( ( shift . IsSimpleReg ( ) & & shift . GetSimpleReg ( ) ! = ECX ) | | <nl> - ( shift . IsImm ( ) & & shift . GetImmBits ( ) ! = 8 ) ) { <nl> - ASSERT_MSG ( 0 , " SHRD - illegal shift " ) ; <nl> - } <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - X64Reg operand = src . GetSimpleReg ( ) ; <nl> - dest . WriteRex ( this , bits , bits , operand ) ; <nl> - if ( shift . GetImmBits ( ) = = 8 ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xAC ) ; <nl> - dest . WriteRest ( this , 1 , operand ) ; <nl> - Write8 ( ( u8 ) shift . offset ) ; <nl> - } else { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xAD ) ; <nl> - dest . WriteRest ( this , 0 , operand ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : SHLD ( int bits , const OpArg & dest , const OpArg & src , const OpArg & shift ) { <nl> - CheckFlags ( ) ; <nl> - if ( dest . IsImm ( ) ) { <nl> - ASSERT_MSG ( 0 , " SHLD - can ' t use imms as destination " ) ; <nl> - } <nl> - if ( ! src . IsSimpleReg ( ) ) { <nl> - ASSERT_MSG ( 0 , " SHLD - must use simple register as source " ) ; <nl> - } <nl> - if ( ( shift . IsSimpleReg ( ) & & shift . GetSimpleReg ( ) ! = ECX ) | | <nl> - ( shift . IsImm ( ) & & shift . GetImmBits ( ) ! = 8 ) ) { <nl> - ASSERT_MSG ( 0 , " SHLD - illegal shift " ) ; <nl> - } <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - X64Reg operand = src . GetSimpleReg ( ) ; <nl> - dest . WriteRex ( this , bits , bits , operand ) ; <nl> - if ( shift . GetImmBits ( ) = = 8 ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xA4 ) ; <nl> - dest . WriteRest ( this , 1 , operand ) ; <nl> - Write8 ( ( u8 ) shift . offset ) ; <nl> - } else { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xA5 ) ; <nl> - dest . WriteRest ( this , 0 , operand ) ; <nl> - } <nl> - } <nl> - <nl> - void OpArg : : WriteSingleByteOp ( XEmitter * emit , u8 op , X64Reg _operandReg , int bits ) { <nl> - if ( bits = = 16 ) <nl> - emit - > Write8 ( 0x66 ) ; <nl> - <nl> - this - > operandReg = ( u8 ) _operandReg ; <nl> - WriteRex ( emit , bits , bits ) ; <nl> - emit - > Write8 ( op ) ; <nl> - WriteRest ( emit ) ; <nl> - } <nl> - <nl> - / / operand can either be immediate or register <nl> - void OpArg : : WriteNormalOp ( XEmitter * emit , bool toRM , NormalOp op , const OpArg & operand , <nl> - int bits ) const { <nl> - X64Reg _operandReg ; <nl> - if ( IsImm ( ) ) { <nl> - ASSERT_MSG ( 0 , " WriteNormalOp - Imm argument , wrong order " ) ; <nl> - } <nl> - <nl> - if ( bits = = 16 ) <nl> - emit - > Write8 ( 0x66 ) ; <nl> - <nl> - int immToWrite = 0 ; <nl> - <nl> - if ( operand . IsImm ( ) ) { <nl> - WriteRex ( emit , bits , bits ) ; <nl> - <nl> - if ( ! toRM ) { <nl> - ASSERT_MSG ( 0 , " WriteNormalOp - Writing to Imm ( ! toRM ) " ) ; <nl> - } <nl> - <nl> - if ( operand . scale = = SCALE_IMM8 & & bits = = 8 ) { <nl> - / / op al , imm8 <nl> - if ( ! scale & & offsetOrBaseReg = = AL & & normalops [ op ] . eaximm8 ! = 0xCC ) { <nl> - emit - > Write8 ( normalops [ op ] . eaximm8 ) ; <nl> - emit - > Write8 ( ( u8 ) operand . offset ) ; <nl> - return ; <nl> - } <nl> - / / mov reg , imm8 <nl> - if ( ! scale & & op = = nrmMOV ) { <nl> - emit - > Write8 ( 0xB0 + ( offsetOrBaseReg & 7 ) ) ; <nl> - emit - > Write8 ( ( u8 ) operand . offset ) ; <nl> - return ; <nl> - } <nl> - / / op r / m8 , imm8 <nl> - emit - > Write8 ( normalops [ op ] . imm8 ) ; <nl> - immToWrite = 8 ; <nl> - } else if ( ( operand . scale = = SCALE_IMM16 & & bits = = 16 ) | | <nl> - ( operand . scale = = SCALE_IMM32 & & bits = = 32 ) | | <nl> - ( operand . scale = = SCALE_IMM32 & & bits = = 64 ) ) { <nl> - / / Try to save immediate size if we can , but first check to see <nl> - / / if the instruction supports simm8 . <nl> - / / op r / m , imm8 <nl> - if ( normalops [ op ] . simm8 ! = 0xCC & & <nl> - ( ( operand . scale = = SCALE_IMM16 & & ( s16 ) operand . offset = = ( s8 ) operand . offset ) | | <nl> - ( operand . scale = = SCALE_IMM32 & & ( s32 ) operand . offset = = ( s8 ) operand . offset ) ) ) { <nl> - emit - > Write8 ( normalops [ op ] . simm8 ) ; <nl> - immToWrite = 8 ; <nl> - } else { <nl> - / / mov reg , imm <nl> - if ( ! scale & & op = = nrmMOV & & bits ! = 64 ) { <nl> - emit - > Write8 ( 0xB8 + ( offsetOrBaseReg & 7 ) ) ; <nl> - if ( bits = = 16 ) <nl> - emit - > Write16 ( ( u16 ) operand . offset ) ; <nl> - else <nl> - emit - > Write32 ( ( u32 ) operand . offset ) ; <nl> - return ; <nl> - } <nl> - / / op eax , imm <nl> - if ( ! scale & & offsetOrBaseReg = = EAX & & normalops [ op ] . eaximm32 ! = 0xCC ) { <nl> - emit - > Write8 ( normalops [ op ] . eaximm32 ) ; <nl> - if ( bits = = 16 ) <nl> - emit - > Write16 ( ( u16 ) operand . offset ) ; <nl> - else <nl> - emit - > Write32 ( ( u32 ) operand . offset ) ; <nl> - return ; <nl> - } <nl> - / / op r / m , imm <nl> - emit - > Write8 ( normalops [ op ] . imm32 ) ; <nl> - immToWrite = bits = = 16 ? 16 : 32 ; <nl> - } <nl> - } else if ( ( operand . scale = = SCALE_IMM8 & & bits = = 16 ) | | <nl> - ( operand . scale = = SCALE_IMM8 & & bits = = 32 ) | | <nl> - ( operand . scale = = SCALE_IMM8 & & bits = = 64 ) ) { <nl> - / / op r / m , imm8 <nl> - emit - > Write8 ( normalops [ op ] . simm8 ) ; <nl> - immToWrite = 8 ; <nl> - } else if ( operand . scale = = SCALE_IMM64 & & bits = = 64 ) { <nl> - if ( scale ) { <nl> - ASSERT_MSG ( 0 , " WriteNormalOp - MOV with 64 - bit imm requres register destination " ) ; <nl> - } <nl> - / / mov reg64 , imm64 <nl> - else if ( op = = nrmMOV ) { <nl> - emit - > Write8 ( 0xB8 + ( offsetOrBaseReg & 7 ) ) ; <nl> - emit - > Write64 ( ( u64 ) operand . offset ) ; <nl> - return ; <nl> - } <nl> - ASSERT_MSG ( 0 , " WriteNormalOp - Only MOV can take 64 - bit imm " ) ; <nl> - } else { <nl> - ASSERT_MSG ( 0 , " WriteNormalOp - Unhandled case " ) ; <nl> - } <nl> - _operandReg = ( X64Reg ) normalops [ op ] . ext ; / / pass extension in REG of ModRM <nl> - } else { <nl> - _operandReg = ( X64Reg ) operand . offsetOrBaseReg ; <nl> - WriteRex ( emit , bits , bits , _operandReg ) ; <nl> - / / op r / m , reg <nl> - if ( toRM ) { <nl> - emit - > Write8 ( bits = = 8 ? normalops [ op ] . toRm8 : normalops [ op ] . toRm32 ) ; <nl> - } <nl> - / / op reg , r / m <nl> - else { <nl> - emit - > Write8 ( bits = = 8 ? normalops [ op ] . fromRm8 : normalops [ op ] . fromRm32 ) ; <nl> - } <nl> - } <nl> - WriteRest ( emit , immToWrite > > 3 , _operandReg ) ; <nl> - switch ( immToWrite ) { <nl> - case 0 : <nl> - break ; <nl> - case 8 : <nl> - emit - > Write8 ( ( u8 ) operand . offset ) ; <nl> - break ; <nl> - case 16 : <nl> - emit - > Write16 ( ( u16 ) operand . offset ) ; <nl> - break ; <nl> - case 32 : <nl> - emit - > Write32 ( ( u32 ) operand . offset ) ; <nl> - break ; <nl> - default : <nl> - ASSERT_MSG ( 0 , " WriteNormalOp - Unhandled case " ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : WriteNormalOp ( XEmitter * emit , int bits , NormalOp op , const OpArg & a1 , <nl> - const OpArg & a2 ) { <nl> - if ( a1 . IsImm ( ) ) { <nl> - / / Booh ! Can ' t write to an imm <nl> - ASSERT_MSG ( 0 , " WriteNormalOp - a1 cannot be imm " ) ; <nl> - return ; <nl> - } <nl> - if ( a2 . IsImm ( ) ) { <nl> - a1 . WriteNormalOp ( emit , true , op , a2 , bits ) ; <nl> - } else { <nl> - if ( a1 . IsSimpleReg ( ) ) { <nl> - a2 . WriteNormalOp ( emit , false , op , a1 , bits ) ; <nl> - } else { <nl> - ASSERT_MSG ( a2 . IsSimpleReg ( ) | | a2 . IsImm ( ) , <nl> - " WriteNormalOp - a1 and a2 cannot both be memory " ) ; <nl> - a1 . WriteNormalOp ( emit , true , op , a2 , bits ) ; <nl> - } <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : ADD ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - WriteNormalOp ( this , bits , nrmADD , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : ADC ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - WriteNormalOp ( this , bits , nrmADC , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : SUB ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - WriteNormalOp ( this , bits , nrmSUB , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : SBB ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - WriteNormalOp ( this , bits , nrmSBB , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : AND ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - WriteNormalOp ( this , bits , nrmAND , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : OR ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - WriteNormalOp ( this , bits , nrmOR , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : XOR ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - WriteNormalOp ( this , bits , nrmXOR , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : MOV ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - if ( a1 . IsSimpleReg ( ) & & a2 . IsSimpleReg ( ) & & a1 . GetSimpleReg ( ) = = a2 . GetSimpleReg ( ) ) <nl> - LOG_ERROR ( Common , " Redundant MOV @ % p - bug in JIT ? " , code ) ; <nl> - WriteNormalOp ( this , bits , nrmMOV , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : TEST ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - WriteNormalOp ( this , bits , nrmTEST , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : CMP ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - WriteNormalOp ( this , bits , nrmCMP , a1 , a2 ) ; <nl> - } <nl> - void XEmitter : : XCHG ( int bits , const OpArg & a1 , const OpArg & a2 ) { <nl> - WriteNormalOp ( this , bits , nrmXCHG , a1 , a2 ) ; <nl> - } <nl> - <nl> - void XEmitter : : IMUL ( int bits , X64Reg regOp , const OpArg & a1 , const OpArg & a2 ) { <nl> - CheckFlags ( ) ; <nl> - if ( bits = = 8 ) { <nl> - ASSERT_MSG ( 0 , " IMUL - illegal bit size ! " ) ; <nl> - return ; <nl> - } <nl> - <nl> - if ( a1 . IsImm ( ) ) { <nl> - ASSERT_MSG ( 0 , " IMUL - second arg cannot be imm ! " ) ; <nl> - return ; <nl> - } <nl> - <nl> - if ( ! a2 . IsImm ( ) ) { <nl> - ASSERT_MSG ( 0 , " IMUL - third arg must be imm ! " ) ; <nl> - return ; <nl> - } <nl> - <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - a1 . WriteRex ( this , bits , bits , regOp ) ; <nl> - <nl> - if ( a2 . GetImmBits ( ) = = 8 | | ( a2 . GetImmBits ( ) = = 16 & & ( s8 ) a2 . offset = = ( s16 ) a2 . offset ) | | <nl> - ( a2 . GetImmBits ( ) = = 32 & & ( s8 ) a2 . offset = = ( s32 ) a2 . offset ) ) { <nl> - Write8 ( 0x6B ) ; <nl> - a1 . WriteRest ( this , 1 , regOp ) ; <nl> - Write8 ( ( u8 ) a2 . offset ) ; <nl> - } else { <nl> - Write8 ( 0x69 ) ; <nl> - if ( a2 . GetImmBits ( ) = = 16 & & bits = = 16 ) { <nl> - a1 . WriteRest ( this , 2 , regOp ) ; <nl> - Write16 ( ( u16 ) a2 . offset ) ; <nl> - } else if ( a2 . GetImmBits ( ) = = 32 & & ( bits = = 32 | | bits = = 64 ) ) { <nl> - a1 . WriteRest ( this , 4 , regOp ) ; <nl> - Write32 ( ( u32 ) a2 . offset ) ; <nl> - } else { <nl> - ASSERT_MSG ( 0 , " IMUL - unhandled case ! " ) ; <nl> - } <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : IMUL ( int bits , X64Reg regOp , const OpArg & a ) { <nl> - CheckFlags ( ) ; <nl> - if ( bits = = 8 ) { <nl> - ASSERT_MSG ( 0 , " IMUL - illegal bit size ! " ) ; <nl> - return ; <nl> - } <nl> - <nl> - if ( a . IsImm ( ) ) { <nl> - IMUL ( bits , regOp , R ( regOp ) , a ) ; <nl> - return ; <nl> - } <nl> - <nl> - if ( bits = = 16 ) <nl> - Write8 ( 0x66 ) ; <nl> - a . WriteRex ( this , bits , bits , regOp ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xAF ) ; <nl> - a . WriteRest ( this , 0 , regOp ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteSSEOp ( u8 opPrefix , u16 op , X64Reg regOp , OpArg arg , int extrabytes ) { <nl> - if ( opPrefix ) <nl> - Write8 ( opPrefix ) ; <nl> - arg . operandReg = regOp ; <nl> - arg . WriteRex ( this , 0 , 0 ) ; <nl> - Write8 ( 0x0F ) ; <nl> - if ( op > 0xFF ) <nl> - Write8 ( ( op > > 8 ) & 0xFF ) ; <nl> - Write8 ( op & 0xFF ) ; <nl> - arg . WriteRest ( this , extrabytes ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteAVXOp ( u8 opPrefix , u16 op , X64Reg regOp , const OpArg & arg , int extrabytes ) { <nl> - WriteAVXOp ( opPrefix , op , regOp , INVALID_REG , arg , extrabytes ) ; <nl> - } <nl> - <nl> - static int GetVEXmmmmm ( u16 op ) { <nl> - / / Currently , only 0x38 and 0x3A are used as secondary escape byte . <nl> - if ( ( op > > 8 ) = = 0x3A ) <nl> - return 3 ; <nl> - if ( ( op > > 8 ) = = 0x38 ) <nl> - return 2 ; <nl> - <nl> - return 1 ; <nl> - } <nl> - <nl> - static int GetVEXpp ( u8 opPrefix ) { <nl> - if ( opPrefix = = 0x66 ) <nl> - return 1 ; <nl> - if ( opPrefix = = 0xF3 ) <nl> - return 2 ; <nl> - if ( opPrefix = = 0xF2 ) <nl> - return 3 ; <nl> - <nl> - return 0 ; <nl> - } <nl> - <nl> - void XEmitter : : WriteAVXOp ( u8 opPrefix , u16 op , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg , <nl> - int extrabytes ) { <nl> - if ( ! Common : : GetCPUCaps ( ) . avx ) <nl> - ASSERT_MSG ( 0 , " Trying to use AVX on a system that doesn ' t support it . Bad programmer . " ) ; <nl> - int mmmmm = GetVEXmmmmm ( op ) ; <nl> - int pp = GetVEXpp ( opPrefix ) ; <nl> - / / FIXME : we currently don ' t support 256 - bit instructions , and " size " is not the vector size <nl> - / / here <nl> - arg . WriteVex ( this , regOp1 , regOp2 , 0 , pp , mmmmm ) ; <nl> - Write8 ( op & 0xFF ) ; <nl> - arg . WriteRest ( this , extrabytes , regOp1 ) ; <nl> - } <nl> - <nl> - / / Like the above , but more general ; covers GPR - based VEX operations , like BMI1 / 2 <nl> - void XEmitter : : WriteVEXOp ( int size , u8 opPrefix , u16 op , X64Reg regOp1 , X64Reg regOp2 , <nl> - const OpArg & arg , int extrabytes ) { <nl> - if ( size ! = 32 & & size ! = 64 ) <nl> - ASSERT_MSG ( 0 , " VEX GPR instructions only support 32 - bit and 64 - bit modes ! " ) ; <nl> - int mmmmm = GetVEXmmmmm ( op ) ; <nl> - int pp = GetVEXpp ( opPrefix ) ; <nl> - arg . WriteVex ( this , regOp1 , regOp2 , 0 , pp , mmmmm , size = = 64 ) ; <nl> - Write8 ( op & 0xFF ) ; <nl> - arg . WriteRest ( this , extrabytes , regOp1 ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteBMI1Op ( int size , u8 opPrefix , u16 op , X64Reg regOp1 , X64Reg regOp2 , <nl> - const OpArg & arg , int extrabytes ) { <nl> - CheckFlags ( ) ; <nl> - if ( ! Common : : GetCPUCaps ( ) . bmi1 ) <nl> - ASSERT_MSG ( 0 , " Trying to use BMI1 on a system that doesn ' t support it . Bad programmer . " ) ; <nl> - WriteVEXOp ( size , opPrefix , op , regOp1 , regOp2 , arg , extrabytes ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteBMI2Op ( int size , u8 opPrefix , u16 op , X64Reg regOp1 , X64Reg regOp2 , <nl> - const OpArg & arg , int extrabytes ) { <nl> - CheckFlags ( ) ; <nl> - if ( ! Common : : GetCPUCaps ( ) . bmi2 ) <nl> - ASSERT_MSG ( 0 , " Trying to use BMI2 on a system that doesn ' t support it . Bad programmer . " ) ; <nl> - WriteVEXOp ( size , opPrefix , op , regOp1 , regOp2 , arg , extrabytes ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVD_xmm ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x6E , dest , arg , 0 ) ; <nl> - } <nl> - void XEmitter : : MOVD_xmm ( const OpArg & arg , X64Reg src ) { <nl> - WriteSSEOp ( 0x66 , 0x7E , src , arg , 0 ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVQ_xmm ( X64Reg dest , OpArg arg ) { <nl> - # ifdef ARCHITECTURE_x86_64 <nl> - / / Alternate encoding <nl> - / / This does not display correctly in MSVC ' s debugger , it thinks it ' s a MOVD <nl> - arg . operandReg = dest ; <nl> - Write8 ( 0x66 ) ; <nl> - arg . WriteRex ( this , 64 , 0 ) ; <nl> - Write8 ( 0x0f ) ; <nl> - Write8 ( 0x6E ) ; <nl> - arg . WriteRest ( this , 0 ) ; <nl> - # else <nl> - arg . operandReg = dest ; <nl> - Write8 ( 0xF3 ) ; <nl> - Write8 ( 0x0f ) ; <nl> - Write8 ( 0x7E ) ; <nl> - arg . WriteRest ( this , 0 ) ; <nl> - # endif <nl> - } <nl> - <nl> - void XEmitter : : MOVQ_xmm ( OpArg arg , X64Reg src ) { <nl> - if ( src > 7 | | arg . IsSimpleReg ( ) ) { <nl> - / / Alternate encoding <nl> - / / This does not display correctly in MSVC ' s debugger , it thinks it ' s a MOVD <nl> - arg . operandReg = src ; <nl> - Write8 ( 0x66 ) ; <nl> - arg . WriteRex ( this , 64 , 0 ) ; <nl> - Write8 ( 0x0f ) ; <nl> - Write8 ( 0x7E ) ; <nl> - arg . WriteRest ( this , 0 ) ; <nl> - } else { <nl> - arg . operandReg = src ; <nl> - arg . WriteRex ( this , 0 , 0 ) ; <nl> - Write8 ( 0x66 ) ; <nl> - Write8 ( 0x0f ) ; <nl> - Write8 ( 0xD6 ) ; <nl> - arg . WriteRest ( this , 0 ) ; <nl> - } <nl> - } <nl> - <nl> - void XEmitter : : WriteMXCSR ( OpArg arg , int ext ) { <nl> - if ( arg . IsImm ( ) | | arg . IsSimpleReg ( ) ) <nl> - ASSERT_MSG ( 0 , " MXCSR - invalid operand " ) ; <nl> - <nl> - arg . operandReg = ext ; <nl> - arg . WriteRex ( this , 0 , 0 ) ; <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0xAE ) ; <nl> - arg . WriteRest ( this ) ; <nl> - } <nl> - <nl> - void XEmitter : : STMXCSR ( const OpArg & memloc ) { <nl> - WriteMXCSR ( memloc , 3 ) ; <nl> - } <nl> - void XEmitter : : LDMXCSR ( const OpArg & memloc ) { <nl> - WriteMXCSR ( memloc , 2 ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVNTDQ ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x66 , sseMOVNTDQ , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVNTPS ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x00 , sseMOVNTP , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVNTPD ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x66 , sseMOVNTP , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : ADDSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseADD , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : ADDSD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseADD , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : SUBSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseSUB , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : SUBSD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseSUB , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CMPSS ( X64Reg regOp , const OpArg & arg , u8 compare ) { <nl> - WriteSSEOp ( 0xF3 , sseCMP , regOp , arg , 1 ) ; <nl> - Write8 ( compare ) ; <nl> - } <nl> - void XEmitter : : CMPSD ( X64Reg regOp , const OpArg & arg , u8 compare ) { <nl> - WriteSSEOp ( 0xF2 , sseCMP , regOp , arg , 1 ) ; <nl> - Write8 ( compare ) ; <nl> - } <nl> - void XEmitter : : MULSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseMUL , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MULSD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseMUL , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : DIVSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseDIV , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : DIVSD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseDIV , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MINSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseMIN , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MINSD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseMIN , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MAXSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseMAX , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MAXSD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseMAX , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : SQRTSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseSQRT , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : SQRTSD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseSQRT , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : RCPSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseRCP , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : RSQRTSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseRSQRT , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : ADDPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseADD , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : ADDPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseADD , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : SUBPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseSUB , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : SUBPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseSUB , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CMPPS ( X64Reg regOp , const OpArg & arg , u8 compare ) { <nl> - WriteSSEOp ( 0x00 , sseCMP , regOp , arg , 1 ) ; <nl> - Write8 ( compare ) ; <nl> - } <nl> - void XEmitter : : CMPPD ( X64Reg regOp , const OpArg & arg , u8 compare ) { <nl> - WriteSSEOp ( 0x66 , sseCMP , regOp , arg , 1 ) ; <nl> - Write8 ( compare ) ; <nl> - } <nl> - void XEmitter : : ANDPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseAND , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : ANDPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseAND , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : ANDNPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseANDN , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : ANDNPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseANDN , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : ORPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseOR , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : ORPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseOR , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : XORPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseXOR , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : XORPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseXOR , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MULPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseMUL , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MULPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseMUL , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : DIVPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseDIV , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : DIVPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseDIV , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MINPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseMIN , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MINPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseMIN , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MAXPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseMAX , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MAXPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseMAX , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : SQRTPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseSQRT , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : SQRTPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseSQRT , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : RCPPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseRCP , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : RSQRTPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseRSQRT , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : SHUFPS ( X64Reg regOp , const OpArg & arg , u8 shuffle ) { <nl> - WriteSSEOp ( 0x00 , sseSHUF , regOp , arg , 1 ) ; <nl> - Write8 ( shuffle ) ; <nl> - } <nl> - void XEmitter : : SHUFPD ( X64Reg regOp , const OpArg & arg , u8 shuffle ) { <nl> - WriteSSEOp ( 0x66 , sseSHUF , regOp , arg , 1 ) ; <nl> - Write8 ( shuffle ) ; <nl> - } <nl> - <nl> - void XEmitter : : HADDPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseHADD , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : COMISS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseCOMIS , regOp , arg ) ; <nl> - } / / weird that these should be packed <nl> - void XEmitter : : COMISD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseCOMIS , regOp , arg ) ; <nl> - } / / ordered <nl> - void XEmitter : : UCOMISS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseUCOMIS , regOp , arg ) ; <nl> - } / / unordered <nl> - void XEmitter : : UCOMISD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseUCOMIS , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVAPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseMOVAPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVAPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseMOVAPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVAPS ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x00 , sseMOVAPtoRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVAPD ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x66 , sseMOVAPtoRM , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVUPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseMOVUPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVUPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseMOVUPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVUPS ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x00 , sseMOVUPtoRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVUPD ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x66 , sseMOVUPtoRM , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVDQA ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseMOVDQfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVDQA ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x66 , sseMOVDQtoRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVDQU ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseMOVDQfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVDQU ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0xF3 , sseMOVDQtoRM , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVSS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , sseMOVUPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVSD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseMOVUPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVSS ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0xF3 , sseMOVUPtoRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVSD ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0xF2 , sseMOVUPtoRM , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVLPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseMOVLPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVLPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseMOVLPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVLPS ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x00 , sseMOVLPtoRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVLPD ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x66 , sseMOVLPtoRM , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVHPS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , sseMOVHPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVHPD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , sseMOVHPfromRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVHPS ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x00 , sseMOVHPtoRM , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : MOVHPD ( const OpArg & arg , X64Reg regOp ) { <nl> - WriteSSEOp ( 0x66 , sseMOVHPtoRM , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVHLPS ( X64Reg regOp1 , X64Reg regOp2 ) { <nl> - WriteSSEOp ( 0x00 , sseMOVHLPS , regOp1 , R ( regOp2 ) ) ; <nl> - } <nl> - void XEmitter : : MOVLHPS ( X64Reg regOp1 , X64Reg regOp2 ) { <nl> - WriteSSEOp ( 0x00 , sseMOVLHPS , regOp1 , R ( regOp2 ) ) ; <nl> - } <nl> - <nl> - void XEmitter : : CVTPS2PD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , 0x5A , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTPD2PS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x5A , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : CVTSD2SS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , 0x5A , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTSS2SD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , 0x5A , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTSD2SI ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , 0x2D , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTSS2SI ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , 0x2D , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTSI2SD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , 0x2A , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTSI2SS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , 0x2A , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : CVTDQ2PD ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , 0xE6 , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTDQ2PS ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , 0x5B , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTPD2DQ ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , 0xE6 , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTPS2DQ ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x5B , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : CVTTSD2SI ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , 0x2C , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTTSS2SI ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , 0x2C , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTTPS2DQ ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF3 , 0x5B , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : CVTTPD2DQ ( X64Reg regOp , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xE6 , regOp , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : MASKMOVDQU ( X64Reg dest , X64Reg src ) { <nl> - WriteSSEOp ( 0x66 , sseMASKMOVDQU , dest , R ( src ) ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVMSKPS ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , 0x50 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : MOVMSKPD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x50 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : LDDQU ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0xF2 , sseLDDQU , dest , arg ) ; <nl> - } / / For integer data only <nl> - <nl> - / / THESE TWO ARE UNTESTED . <nl> - void XEmitter : : UNPCKLPS ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , 0x14 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : UNPCKHPS ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x00 , 0x15 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : UNPCKLPD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x14 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : UNPCKHPD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x15 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : MOVDDUP ( X64Reg regOp , const OpArg & arg ) { <nl> - if ( Common : : GetCPUCaps ( ) . sse3 ) { <nl> - WriteSSEOp ( 0xF2 , 0x12 , regOp , arg ) ; / / SSE3 movddup <nl> - } else { <nl> - / / Simulate this instruction with SSE2 instructions <nl> - if ( ! arg . IsSimpleReg ( regOp ) ) <nl> - MOVSD ( regOp , arg ) ; <nl> - UNPCKLPD ( regOp , R ( regOp ) ) ; <nl> - } <nl> - } <nl> - <nl> - / / There are a few more left <nl> - <nl> - / / Also some integer instructions are missing <nl> - void XEmitter : : PACKSSDW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x6B , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PACKSSWB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x63 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PACKUSWB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x67 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PUNPCKLBW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x60 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PUNPCKLWD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x61 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PUNPCKLDQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x62 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PUNPCKLQDQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x6C , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSRLW ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x71 , ( X64Reg ) 2 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSRLD ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x72 , ( X64Reg ) 2 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSRLQ ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x73 , ( X64Reg ) 2 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSRLQ ( X64Reg reg , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xd3 , reg , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSRLDQ ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x73 , ( X64Reg ) 3 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSLLW ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x71 , ( X64Reg ) 6 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSLLD ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x72 , ( X64Reg ) 6 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSLLQ ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x73 , ( X64Reg ) 6 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSLLDQ ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x73 , ( X64Reg ) 7 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSRAW ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x71 , ( X64Reg ) 4 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSRAD ( X64Reg reg , int shift ) { <nl> - WriteSSEOp ( 0x66 , 0x72 , ( X64Reg ) 4 , R ( reg ) ) ; <nl> - Write8 ( shift ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteSSSE3Op ( u8 opPrefix , u16 op , X64Reg regOp , const OpArg & arg , int extrabytes ) { <nl> - if ( ! Common : : GetCPUCaps ( ) . ssse3 ) <nl> - ASSERT_MSG ( 0 , " Trying to use SSSE3 on a system that doesn ' t support it . Bad programmer . " ) ; <nl> - WriteSSEOp ( opPrefix , op , regOp , arg , extrabytes ) ; <nl> - } <nl> - <nl> - void XEmitter : : WriteSSE41Op ( u8 opPrefix , u16 op , X64Reg regOp , const OpArg & arg , int extrabytes ) { <nl> - if ( ! Common : : GetCPUCaps ( ) . sse4_1 ) <nl> - ASSERT_MSG ( 0 , " Trying to use SSE4 . 1 on a system that doesn ' t support it . Bad programmer . " ) ; <nl> - WriteSSEOp ( opPrefix , op , regOp , arg , extrabytes ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSHUFB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSSE3Op ( 0x66 , 0x3800 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PTEST ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3817 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PACKUSDW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x382b , dest , arg ) ; <nl> - } <nl> - void XEmitter : : DPPS ( X64Reg dest , const OpArg & arg , u8 mask ) { <nl> - WriteSSE41Op ( 0x66 , 0x3A40 , dest , arg , 1 ) ; <nl> - Write8 ( mask ) ; <nl> - } <nl> - <nl> - void XEmitter : : PMINSB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3838 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMINSD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3839 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMINUW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x383a , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMINUD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x383b , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMAXSB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x383c , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMAXSD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x383d , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMAXUW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x383e , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMAXUD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x383f , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PMOVSXBW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3820 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVSXBD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3821 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVSXBQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3822 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVSXWD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3823 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVSXWQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3824 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVSXDQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3825 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVZXBW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3830 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVZXBD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3831 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVZXBQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3832 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVZXWD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3833 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVZXWQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3834 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMOVZXDQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3835 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PBLENDVB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3810 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : BLENDVPS ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3814 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : BLENDVPD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSE41Op ( 0x66 , 0x3815 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : BLENDPS ( X64Reg dest , const OpArg & arg , u8 blend ) { <nl> - WriteSSE41Op ( 0x66 , 0x3A0C , dest , arg , 1 ) ; <nl> - Write8 ( blend ) ; <nl> - } <nl> - void XEmitter : : BLENDPD ( X64Reg dest , const OpArg & arg , u8 blend ) { <nl> - WriteSSE41Op ( 0x66 , 0x3A0D , dest , arg , 1 ) ; <nl> - Write8 ( blend ) ; <nl> - } <nl> - <nl> - void XEmitter : : ROUNDSS ( X64Reg dest , const OpArg & arg , u8 mode ) { <nl> - WriteSSE41Op ( 0x66 , 0x3A0A , dest , arg , 1 ) ; <nl> - Write8 ( mode ) ; <nl> - } <nl> - void XEmitter : : ROUNDSD ( X64Reg dest , const OpArg & arg , u8 mode ) { <nl> - WriteSSE41Op ( 0x66 , 0x3A0B , dest , arg , 1 ) ; <nl> - Write8 ( mode ) ; <nl> - } <nl> - void XEmitter : : ROUNDPS ( X64Reg dest , const OpArg & arg , u8 mode ) { <nl> - WriteSSE41Op ( 0x66 , 0x3A08 , dest , arg , 1 ) ; <nl> - Write8 ( mode ) ; <nl> - } <nl> - void XEmitter : : ROUNDPD ( X64Reg dest , const OpArg & arg , u8 mode ) { <nl> - WriteSSE41Op ( 0x66 , 0x3A09 , dest , arg , 1 ) ; <nl> - Write8 ( mode ) ; <nl> - } <nl> - <nl> - void XEmitter : : PAND ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xDB , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PANDN ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xDF , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PXOR ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xEF , dest , arg ) ; <nl> - } <nl> - void XEmitter : : POR ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xEB , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PADDB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xFC , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PADDW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xFD , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PADDD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xFE , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PADDQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xD4 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PADDSB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xEC , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PADDSW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xED , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PADDUSB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xDC , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PADDUSW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xDD , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSUBB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xF8 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PSUBW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xF9 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PSUBD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xFA , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PSUBQ ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xFB , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PSUBSB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xE8 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PSUBSW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xE9 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PSUBUSB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xD8 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PSUBUSW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xD9 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PAVGB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xE0 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PAVGW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xE3 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PCMPEQB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x74 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PCMPEQW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x75 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PCMPEQD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x76 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PCMPGTB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x64 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PCMPGTW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x65 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PCMPGTD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0x66 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PEXTRW ( X64Reg dest , const OpArg & arg , u8 subreg ) { <nl> - WriteSSEOp ( 0x66 , 0xC5 , dest , arg , 1 ) ; <nl> - Write8 ( subreg ) ; <nl> - } <nl> - void XEmitter : : PINSRW ( X64Reg dest , const OpArg & arg , u8 subreg ) { <nl> - WriteSSEOp ( 0x66 , 0xC4 , dest , arg , 1 ) ; <nl> - Write8 ( subreg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PMADDWD ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xF5 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PSADBW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xF6 , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PMAXSW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xEE , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMAXUB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xDE , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMINSW ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xEA , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PMINUB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xDA , dest , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : PMOVMSKB ( X64Reg dest , const OpArg & arg ) { <nl> - WriteSSEOp ( 0x66 , 0xD7 , dest , arg ) ; <nl> - } <nl> - void XEmitter : : PSHUFD ( X64Reg regOp , const OpArg & arg , u8 shuffle ) { <nl> - WriteSSEOp ( 0x66 , 0x70 , regOp , arg , 1 ) ; <nl> - Write8 ( shuffle ) ; <nl> - } <nl> - void XEmitter : : PSHUFLW ( X64Reg regOp , const OpArg & arg , u8 shuffle ) { <nl> - WriteSSEOp ( 0xF2 , 0x70 , regOp , arg , 1 ) ; <nl> - Write8 ( shuffle ) ; <nl> - } <nl> - void XEmitter : : PSHUFHW ( X64Reg regOp , const OpArg & arg , u8 shuffle ) { <nl> - WriteSSEOp ( 0xF3 , 0x70 , regOp , arg , 1 ) ; <nl> - Write8 ( shuffle ) ; <nl> - } <nl> - <nl> - / / VEX <nl> - void XEmitter : : VADDSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0xF2 , sseADD , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VSUBSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0xF2 , sseSUB , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VMULSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0xF2 , sseMUL , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VDIVSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0xF2 , sseDIV , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VADDPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , sseADD , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VSUBPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , sseSUB , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VMULPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , sseMUL , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VDIVPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , sseDIV , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VSQRTSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0xF2 , sseSQRT , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VSHUFPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg , u8 shuffle ) { <nl> - WriteAVXOp ( 0x66 , sseSHUF , regOp1 , regOp2 , arg , 1 ) ; <nl> - Write8 ( shuffle ) ; <nl> - } <nl> - void XEmitter : : VUNPCKLPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x14 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VUNPCKHPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x15 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : VANDPS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x00 , sseAND , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VANDPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , sseAND , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VANDNPS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x00 , sseANDN , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VANDNPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , sseANDN , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VORPS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x00 , sseOR , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VORPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , sseOR , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VXORPS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x00 , sseXOR , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VXORPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , sseXOR , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : VPAND ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0xDB , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VPANDN ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0xDF , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VPOR ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0xEB , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VPXOR ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0xEF , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - <nl> - void XEmitter : : VFMADD132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x3898 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMADD213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38A8 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMADD231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38B8 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMADD132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x3898 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMADD213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38A8 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMADD231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38B8 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMADD132SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x3899 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMADD213SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38A9 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMADD231SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38B9 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMADD132SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x3899 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMADD213SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38A9 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMADD231SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38B9 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMSUB132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389A , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMSUB213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AA , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMSUB231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BA , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMSUB132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389A , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMSUB213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AA , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMSUB231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BA , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMSUB132SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389B , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMSUB213SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AB , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMSUB231SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BB , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMSUB132SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389B , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMSUB213SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AB , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMSUB231SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BB , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMADD132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389C , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMADD213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AC , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMADD231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BC , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMADD132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389C , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMADD213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AC , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMADD231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BC , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMADD132SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389D , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMADD213SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AD , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMADD231SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BD , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMADD132SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389D , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMADD213SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AD , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMADD231SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BD , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389E , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AE , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BE , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389E , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AE , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BE , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB132SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389F , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB213SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AF , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB231SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BF , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB132SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x389F , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB213SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38AF , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFNMSUB231SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38BF , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMADDSUB132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x3896 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMADDSUB213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38A6 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMADDSUB231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38B6 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMADDSUB132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x3896 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMADDSUB213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38A6 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMADDSUB231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38B6 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMSUBADD132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x3897 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMSUBADD213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38A7 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMSUBADD231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38B7 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : VFMSUBADD132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x3897 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMSUBADD213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38A7 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - void XEmitter : : VFMSUBADD231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteAVXOp ( 0x66 , 0x38B7 , regOp1 , regOp2 , arg , 1 ) ; <nl> - } <nl> - <nl> - void XEmitter : : SARX ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) { <nl> - WriteBMI2Op ( bits , 0xF3 , 0x38F7 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : SHLX ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) { <nl> - WriteBMI2Op ( bits , 0x66 , 0x38F7 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : SHRX ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) { <nl> - WriteBMI2Op ( bits , 0xF2 , 0x38F7 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : RORX ( int bits , X64Reg regOp , const OpArg & arg , u8 rotate ) { <nl> - WriteBMI2Op ( bits , 0xF2 , 0x3AF0 , regOp , INVALID_REG , arg , 1 ) ; <nl> - Write8 ( rotate ) ; <nl> - } <nl> - void XEmitter : : PEXT ( int bits , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteBMI2Op ( bits , 0xF3 , 0x38F5 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : PDEP ( int bits , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteBMI2Op ( bits , 0xF2 , 0x38F5 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : MULX ( int bits , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteBMI2Op ( bits , 0xF2 , 0x38F6 , regOp2 , regOp1 , arg ) ; <nl> - } <nl> - void XEmitter : : BZHI ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) { <nl> - WriteBMI2Op ( bits , 0x00 , 0x38F5 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : BLSR ( int bits , X64Reg regOp , const OpArg & arg ) { <nl> - WriteBMI1Op ( bits , 0x00 , 0x38F3 , ( X64Reg ) 0x1 , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : BLSMSK ( int bits , X64Reg regOp , const OpArg & arg ) { <nl> - WriteBMI1Op ( bits , 0x00 , 0x38F3 , ( X64Reg ) 0x2 , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : BLSI ( int bits , X64Reg regOp , const OpArg & arg ) { <nl> - WriteBMI1Op ( bits , 0x00 , 0x38F3 , ( X64Reg ) 0x3 , regOp , arg ) ; <nl> - } <nl> - void XEmitter : : BEXTR ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) { <nl> - WriteBMI1Op ( bits , 0x00 , 0x38F7 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - void XEmitter : : ANDN ( int bits , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) { <nl> - WriteBMI1Op ( bits , 0x00 , 0x38F2 , regOp1 , regOp2 , arg ) ; <nl> - } <nl> - <nl> - / / Prefixes <nl> - <nl> - void XEmitter : : LOCK ( ) { <nl> - Write8 ( 0xF0 ) ; <nl> - } <nl> - void XEmitter : : REP ( ) { <nl> - Write8 ( 0xF3 ) ; <nl> - } <nl> - void XEmitter : : REPNE ( ) { <nl> - Write8 ( 0xF2 ) ; <nl> - } <nl> - void XEmitter : : FSOverride ( ) { <nl> - Write8 ( 0x64 ) ; <nl> - } <nl> - void XEmitter : : GSOverride ( ) { <nl> - Write8 ( 0x65 ) ; <nl> - } <nl> - <nl> - void XEmitter : : FWAIT ( ) { <nl> - Write8 ( 0x9B ) ; <nl> - } <nl> - <nl> - / / TODO : make this more generic <nl> - void XEmitter : : WriteFloatLoadStore ( int bits , FloatOp op , FloatOp op_80b , const OpArg & arg ) { <nl> - int mf = 0 ; <nl> - ASSERT_MSG ( ! ( bits = = 80 & & op_80b = = floatINVALID ) , <nl> - " WriteFloatLoadStore : 80 bits not supported for this instruction " ) ; <nl> - switch ( bits ) { <nl> - case 32 : <nl> - mf = 0 ; <nl> - break ; <nl> - case 64 : <nl> - mf = 4 ; <nl> - break ; <nl> - case 80 : <nl> - mf = 2 ; <nl> - break ; <nl> - default : <nl> - ASSERT_MSG ( 0 , " WriteFloatLoadStore : invalid bits ( should be 32 / 64 / 80 ) " ) ; <nl> - } <nl> - Write8 ( 0xd9 | mf ) ; <nl> - / / x87 instructions use the reg field of the ModR / M byte as opcode : <nl> - if ( bits = = 80 ) <nl> - op = op_80b ; <nl> - arg . WriteRest ( this , 0 , ( X64Reg ) op ) ; <nl> - } <nl> - <nl> - void XEmitter : : FLD ( int bits , const OpArg & src ) { <nl> - WriteFloatLoadStore ( bits , floatLD , floatLD80 , src ) ; <nl> - } <nl> - void XEmitter : : FST ( int bits , const OpArg & dest ) { <nl> - WriteFloatLoadStore ( bits , floatST , floatINVALID , dest ) ; <nl> - } <nl> - void XEmitter : : FSTP ( int bits , const OpArg & dest ) { <nl> - WriteFloatLoadStore ( bits , floatSTP , floatSTP80 , dest ) ; <nl> - } <nl> - void XEmitter : : FNSTSW_AX ( ) { <nl> - Write8 ( 0xDF ) ; <nl> - Write8 ( 0xE0 ) ; <nl> - } <nl> - <nl> - void XEmitter : : RDTSC ( ) { <nl> - Write8 ( 0x0F ) ; <nl> - Write8 ( 0x31 ) ; <nl> - } <nl> - <nl> - void XCodeBlock : : PoisonMemory ( ) { <nl> - / / x86 / 64 : 0xCC = breakpoint <nl> - memset ( region , 0xCC , region_size ) ; <nl> - } <nl> - } <nl> deleted file mode 100644 <nl> index 7d7cdde169e . . 00000000000 <nl> mmm a / src / common / x64 / emitter . h <nl> ppp / dev / null <nl> <nl> - / / Copyright ( C ) 2003 Dolphin Project . <nl> - <nl> - / / This program is free software : you can redistribute it and / or modify <nl> - / / it under the terms of the GNU General Public License as published by <nl> - / / the Free Software Foundation , version 2 . 0 or later versions . <nl> - <nl> - / / This program is distributed in the hope that it will be useful , <nl> - / / but WITHOUT ANY WARRANTY ; without even the implied warranty of <nl> - / / MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the <nl> - / / GNU General Public License 2 . 0 for more details . <nl> - <nl> - / / A copy of the GPL 2 . 0 should have been included with the program . <nl> - / / If not , see http : / / www . gnu . org / licenses / <nl> - <nl> - / / Official SVN repository and contact information can be found at <nl> - / / http : / / code . google . com / p / dolphin - emu / <nl> - <nl> - # pragma once <nl> - <nl> - # include < cstddef > <nl> - # include " common / assert . h " <nl> - # include " common / bit_set . h " <nl> - # include " common / code_block . h " <nl> - # include " common / common_types . h " <nl> - <nl> - # if defined ( ARCHITECTURE_x86_64 ) & & ! defined ( _ARCH_64 ) <nl> - # define _ARCH_64 <nl> - # endif <nl> - <nl> - # ifdef _ARCH_64 <nl> - # define PTRBITS 64 <nl> - # else <nl> - # define PTRBITS 32 <nl> - # endif <nl> - <nl> - namespace Gen { <nl> - <nl> - enum X64Reg { <nl> - EAX = 0 , <nl> - EBX = 3 , <nl> - ECX = 1 , <nl> - EDX = 2 , <nl> - ESI = 6 , <nl> - EDI = 7 , <nl> - EBP = 5 , <nl> - ESP = 4 , <nl> - <nl> - RAX = 0 , <nl> - RBX = 3 , <nl> - RCX = 1 , <nl> - RDX = 2 , <nl> - RSI = 6 , <nl> - RDI = 7 , <nl> - RBP = 5 , <nl> - RSP = 4 , <nl> - R8 = 8 , <nl> - R9 = 9 , <nl> - R10 = 10 , <nl> - R11 = 11 , <nl> - R12 = 12 , <nl> - R13 = 13 , <nl> - R14 = 14 , <nl> - R15 = 15 , <nl> - <nl> - AL = 0 , <nl> - BL = 3 , <nl> - CL = 1 , <nl> - DL = 2 , <nl> - SIL = 6 , <nl> - DIL = 7 , <nl> - BPL = 5 , <nl> - SPL = 4 , <nl> - AH = 0x104 , <nl> - BH = 0x107 , <nl> - CH = 0x105 , <nl> - DH = 0x106 , <nl> - <nl> - AX = 0 , <nl> - BX = 3 , <nl> - CX = 1 , <nl> - DX = 2 , <nl> - SI = 6 , <nl> - DI = 7 , <nl> - BP = 5 , <nl> - SP = 4 , <nl> - <nl> - XMM0 = 0 , <nl> - XMM1 , <nl> - XMM2 , <nl> - XMM3 , <nl> - XMM4 , <nl> - XMM5 , <nl> - XMM6 , <nl> - XMM7 , <nl> - XMM8 , <nl> - XMM9 , <nl> - XMM10 , <nl> - XMM11 , <nl> - XMM12 , <nl> - XMM13 , <nl> - XMM14 , <nl> - XMM15 , <nl> - <nl> - YMM0 = 0 , <nl> - YMM1 , <nl> - YMM2 , <nl> - YMM3 , <nl> - YMM4 , <nl> - YMM5 , <nl> - YMM6 , <nl> - YMM7 , <nl> - YMM8 , <nl> - YMM9 , <nl> - YMM10 , <nl> - YMM11 , <nl> - YMM12 , <nl> - YMM13 , <nl> - YMM14 , <nl> - YMM15 , <nl> - <nl> - INVALID_REG = 0xFFFFFFFF <nl> - } ; <nl> - <nl> - enum CCFlags { <nl> - CC_O = 0 , <nl> - CC_NO = 1 , <nl> - CC_B = 2 , <nl> - CC_C = 2 , <nl> - CC_NAE = 2 , <nl> - CC_NB = 3 , <nl> - CC_NC = 3 , <nl> - CC_AE = 3 , <nl> - CC_Z = 4 , <nl> - CC_E = 4 , <nl> - CC_NZ = 5 , <nl> - CC_NE = 5 , <nl> - CC_BE = 6 , <nl> - CC_NA = 6 , <nl> - CC_NBE = 7 , <nl> - CC_A = 7 , <nl> - CC_S = 8 , <nl> - CC_NS = 9 , <nl> - CC_P = 0xA , <nl> - CC_PE = 0xA , <nl> - CC_NP = 0xB , <nl> - CC_PO = 0xB , <nl> - CC_L = 0xC , <nl> - CC_NGE = 0xC , <nl> - CC_NL = 0xD , <nl> - CC_GE = 0xD , <nl> - CC_LE = 0xE , <nl> - CC_NG = 0xE , <nl> - CC_NLE = 0xF , <nl> - CC_G = 0xF <nl> - } ; <nl> - <nl> - enum { <nl> - NUMGPRs = 16 , <nl> - NUMXMMs = 16 , <nl> - } ; <nl> - <nl> - enum { <nl> - SCALE_NONE = 0 , <nl> - SCALE_1 = 1 , <nl> - SCALE_2 = 2 , <nl> - SCALE_4 = 4 , <nl> - SCALE_8 = 8 , <nl> - SCALE_ATREG = 16 , <nl> - / / SCALE_NOBASE_1 is not supported and can be replaced with SCALE_ATREG <nl> - SCALE_NOBASE_2 = 34 , <nl> - SCALE_NOBASE_4 = 36 , <nl> - SCALE_NOBASE_8 = 40 , <nl> - SCALE_RIP = 0xFF , <nl> - SCALE_IMM8 = 0xF0 , <nl> - SCALE_IMM16 = 0xF1 , <nl> - SCALE_IMM32 = 0xF2 , <nl> - SCALE_IMM64 = 0xF3 , <nl> - } ; <nl> - <nl> - enum NormalOp { <nl> - nrmADD , <nl> - nrmADC , <nl> - nrmSUB , <nl> - nrmSBB , <nl> - nrmAND , <nl> - nrmOR , <nl> - nrmXOR , <nl> - nrmMOV , <nl> - nrmTEST , <nl> - nrmCMP , <nl> - nrmXCHG , <nl> - } ; <nl> - <nl> - enum { <nl> - CMP_EQ = 0 , <nl> - CMP_LT = 1 , <nl> - CMP_LE = 2 , <nl> - CMP_UNORD = 3 , <nl> - CMP_NEQ = 4 , <nl> - CMP_NLT = 5 , <nl> - CMP_NLE = 6 , <nl> - CMP_ORD = 7 , <nl> - } ; <nl> - <nl> - enum FloatOp { <nl> - floatLD = 0 , <nl> - floatST = 2 , <nl> - floatSTP = 3 , <nl> - floatLD80 = 5 , <nl> - floatSTP80 = 7 , <nl> - <nl> - floatINVALID = - 1 , <nl> - } ; <nl> - <nl> - enum FloatRound { <nl> - FROUND_NEAREST = 0 , <nl> - FROUND_FLOOR = 1 , <nl> - FROUND_CEIL = 2 , <nl> - FROUND_ZERO = 3 , <nl> - FROUND_MXCSR = 4 , <nl> - <nl> - FROUND_RAISE_PRECISION = 0 , <nl> - FROUND_IGNORE_PRECISION = 8 , <nl> - } ; <nl> - <nl> - class XEmitter ; <nl> - <nl> - / / RIP addressing does not benefit from micro op fusion on Core arch <nl> - struct OpArg { <nl> - friend class XEmitter ; <nl> - <nl> - constexpr OpArg ( ) = default ; / / dummy op arg , used for storage <nl> - constexpr OpArg ( u64 offset_ , int scale_ , X64Reg rmReg = RAX , X64Reg scaledReg = RAX ) <nl> - : scale ( static_cast < u8 > ( scale_ ) ) , offsetOrBaseReg ( static_cast < u16 > ( rmReg ) ) , <nl> - indexReg ( static_cast < u16 > ( scaledReg ) ) , offset ( offset_ ) { } <nl> - <nl> - constexpr bool operator = = ( const OpArg & b ) const { <nl> - return operandReg = = b . operandReg & & scale = = b . scale & & <nl> - offsetOrBaseReg = = b . offsetOrBaseReg & & indexReg = = b . indexReg & & offset = = b . offset ; <nl> - } <nl> - <nl> - void WriteRex ( XEmitter * emit , int opBits , int bits , int customOp = - 1 ) const ; <nl> - void WriteVex ( XEmitter * emit , X64Reg regOp1 , X64Reg regOp2 , int L , int pp , int mmmmm , <nl> - int W = 0 ) const ; <nl> - void WriteRest ( XEmitter * emit , int extraBytes = 0 , X64Reg operandReg = INVALID_REG , <nl> - bool warn_64bit_offset = true ) const ; <nl> - void WriteSingleByteOp ( XEmitter * emit , u8 op , X64Reg operandReg , int bits ) ; <nl> - void WriteNormalOp ( XEmitter * emit , bool toRM , NormalOp op , const OpArg & operand , <nl> - int bits ) const ; <nl> - <nl> - constexpr bool IsImm ( ) const { <nl> - return scale = = SCALE_IMM8 | | scale = = SCALE_IMM16 | | scale = = SCALE_IMM32 | | <nl> - scale = = SCALE_IMM64 ; <nl> - } <nl> - constexpr bool IsSimpleReg ( ) const { <nl> - return scale = = SCALE_NONE ; <nl> - } <nl> - constexpr bool IsSimpleReg ( X64Reg reg ) const { <nl> - return IsSimpleReg ( ) & & GetSimpleReg ( ) = = reg ; <nl> - } <nl> - <nl> - int GetImmBits ( ) const { <nl> - switch ( scale ) { <nl> - case SCALE_IMM8 : <nl> - return 8 ; <nl> - case SCALE_IMM16 : <nl> - return 16 ; <nl> - case SCALE_IMM32 : <nl> - return 32 ; <nl> - case SCALE_IMM64 : <nl> - return 64 ; <nl> - default : <nl> - return - 1 ; <nl> - } <nl> - } <nl> - <nl> - void SetImmBits ( int bits ) { <nl> - switch ( bits ) { <nl> - case 8 : <nl> - scale = SCALE_IMM8 ; <nl> - break ; <nl> - case 16 : <nl> - scale = SCALE_IMM16 ; <nl> - break ; <nl> - case 32 : <nl> - scale = SCALE_IMM32 ; <nl> - break ; <nl> - case 64 : <nl> - scale = SCALE_IMM64 ; <nl> - break ; <nl> - } <nl> - } <nl> - <nl> - constexpr X64Reg GetSimpleReg ( ) const { <nl> - return scale = = SCALE_NONE ? static_cast < X64Reg > ( offsetOrBaseReg ) : INVALID_REG ; <nl> - } <nl> - <nl> - constexpr u32 GetImmValue ( ) const { <nl> - return static_cast < u32 > ( offset ) ; <nl> - } <nl> - <nl> - / / For loops . <nl> - void IncreaseOffset ( int sz ) { <nl> - offset + = sz ; <nl> - } <nl> - <nl> - private : <nl> - u8 scale = 0 ; <nl> - u16 offsetOrBaseReg = 0 ; <nl> - u16 indexReg = 0 ; <nl> - u64 offset = 0 ; / / use RIP - relative as much as possible - 64 - bit immediates are not available . <nl> - u16 operandReg = 0 ; <nl> - } ; <nl> - <nl> - template < typename T > <nl> - inline OpArg M ( const T * ptr ) { <nl> - return OpArg ( reinterpret_cast < u64 > ( ptr ) , static_cast < int > ( SCALE_RIP ) ) ; <nl> - } <nl> - constexpr OpArg R ( X64Reg value ) { <nl> - return OpArg ( 0 , SCALE_NONE , value ) ; <nl> - } <nl> - constexpr OpArg MatR ( X64Reg value ) { <nl> - return OpArg ( 0 , SCALE_ATREG , value ) ; <nl> - } <nl> - <nl> - constexpr OpArg MDisp ( X64Reg value , int offset ) { <nl> - return OpArg ( static_cast < u32 > ( offset ) , SCALE_ATREG , value ) ; <nl> - } <nl> - <nl> - constexpr OpArg MComplex ( X64Reg base , X64Reg scaled , int scale , int offset ) { <nl> - return OpArg ( offset , scale , base , scaled ) ; <nl> - } <nl> - <nl> - constexpr OpArg MScaled ( X64Reg scaled , int scale , int offset ) { <nl> - return scale = = SCALE_1 ? OpArg ( offset , SCALE_ATREG , scaled ) <nl> - : OpArg ( offset , scale | 0x20 , RAX , scaled ) ; <nl> - } <nl> - <nl> - constexpr OpArg MRegSum ( X64Reg base , X64Reg offset ) { <nl> - return MComplex ( base , offset , 1 , 0 ) ; <nl> - } <nl> - <nl> - constexpr OpArg Imm8 ( u8 imm ) { <nl> - return OpArg ( imm , SCALE_IMM8 ) ; <nl> - } <nl> - constexpr OpArg Imm16 ( u16 imm ) { <nl> - return OpArg ( imm , SCALE_IMM16 ) ; <nl> - } / / rarely used <nl> - constexpr OpArg Imm32 ( u32 imm ) { <nl> - return OpArg ( imm , SCALE_IMM32 ) ; <nl> - } <nl> - constexpr OpArg Imm64 ( u64 imm ) { <nl> - return OpArg ( imm , SCALE_IMM64 ) ; <nl> - } <nl> - constexpr OpArg UImmAuto ( u32 imm ) { <nl> - return OpArg ( imm , imm > = 128 ? SCALE_IMM32 : SCALE_IMM8 ) ; <nl> - } <nl> - constexpr OpArg SImmAuto ( s32 imm ) { <nl> - return OpArg ( imm , ( imm > = 128 | | imm < - 128 ) ? SCALE_IMM32 : SCALE_IMM8 ) ; <nl> - } <nl> - <nl> - template < typename T > <nl> - OpArg ImmPtr ( const T * imm ) { <nl> - # ifdef _ARCH_64 <nl> - return Imm64 ( reinterpret_cast < u64 > ( imm ) ) ; <nl> - # else <nl> - return Imm32 ( reinterpret_cast < u32 > ( imm ) ) ; <nl> - # endif <nl> - } <nl> - <nl> - inline u32 PtrOffset ( const void * ptr , const void * base ) { <nl> - # ifdef _ARCH_64 <nl> - s64 distance = ( s64 ) ptr - ( s64 ) base ; <nl> - if ( distance > = 0x80000000LL | | distance < - 0x80000000LL ) { <nl> - ASSERT_MSG ( 0 , " pointer offset out of range " ) ; <nl> - return 0 ; <nl> - } <nl> - <nl> - return ( u32 ) distance ; <nl> - # else <nl> - return ( u32 ) ptr - ( u32 ) base ; <nl> - # endif <nl> - } <nl> - <nl> - / / usage : int a [ ] ; ARRAY_OFFSET ( a , 10 ) <nl> - # define ARRAY_OFFSET ( array , index ) ( ( u32 ) ( ( u64 ) & ( array ) [ index ] - ( u64 ) & ( array ) [ 0 ] ) ) <nl> - / / usage : struct { int e ; } s ; STRUCT_OFFSET ( s , e ) <nl> - # define STRUCT_OFFSET ( str , elem ) ( ( u32 ) ( ( u64 ) & ( str ) . elem - ( u64 ) & ( str ) ) ) <nl> - <nl> - struct FixupBranch { <nl> - u8 * ptr ; <nl> - int type ; / / 0 = 8bit 1 = 32bit <nl> - } ; <nl> - <nl> - enum SSECompare { <nl> - EQ = 0 , <nl> - LT , <nl> - LE , <nl> - UNORD , <nl> - NEQ , <nl> - NLT , <nl> - NLE , <nl> - ORD , <nl> - } ; <nl> - <nl> - class XEmitter { <nl> - friend struct OpArg ; / / for Write8 etc <nl> - private : <nl> - u8 * code ; <nl> - bool flags_locked ; <nl> - <nl> - void CheckFlags ( ) ; <nl> - <nl> - void Rex ( int w , int r , int x , int b ) ; <nl> - void WriteSimple1Byte ( int bits , u8 byte , X64Reg reg ) ; <nl> - void WriteSimple2Byte ( int bits , u8 byte1 , u8 byte2 , X64Reg reg ) ; <nl> - void WriteMulDivType ( int bits , OpArg src , int ext ) ; <nl> - void WriteBitSearchType ( int bits , X64Reg dest , OpArg src , u8 byte2 , bool rep = false ) ; <nl> - void WriteShift ( int bits , OpArg dest , const OpArg & shift , int ext ) ; <nl> - void WriteBitTest ( int bits , const OpArg & dest , const OpArg & index , int ext ) ; <nl> - void WriteMXCSR ( OpArg arg , int ext ) ; <nl> - void WriteSSEOp ( u8 opPrefix , u16 op , X64Reg regOp , OpArg arg , int extrabytes = 0 ) ; <nl> - void WriteSSSE3Op ( u8 opPrefix , u16 op , X64Reg regOp , const OpArg & arg , int extrabytes = 0 ) ; <nl> - void WriteSSE41Op ( u8 opPrefix , u16 op , X64Reg regOp , const OpArg & arg , int extrabytes = 0 ) ; <nl> - void WriteAVXOp ( u8 opPrefix , u16 op , X64Reg regOp , const OpArg & arg , int extrabytes = 0 ) ; <nl> - void WriteAVXOp ( u8 opPrefix , u16 op , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg , <nl> - int extrabytes = 0 ) ; <nl> - void WriteVEXOp ( int size , u8 opPrefix , u16 op , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg , <nl> - int extrabytes = 0 ) ; <nl> - void WriteBMI1Op ( int size , u8 opPrefix , u16 op , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg , <nl> - int extrabytes = 0 ) ; <nl> - void WriteBMI2Op ( int size , u8 opPrefix , u16 op , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg , <nl> - int extrabytes = 0 ) ; <nl> - void WriteFloatLoadStore ( int bits , FloatOp op , FloatOp op_80b , const OpArg & arg ) ; <nl> - void WriteNormalOp ( XEmitter * emit , int bits , NormalOp op , const OpArg & a1 , const OpArg & a2 ) ; <nl> - <nl> - void ABI_CalculateFrameSize ( BitSet32 mask , size_t rsp_alignment , size_t needed_frame_size , <nl> - size_t * shadowp , size_t * subtractionp , size_t * xmm_offsetp ) ; <nl> - <nl> - protected : <nl> - void Write8 ( u8 value ) ; <nl> - void Write16 ( u16 value ) ; <nl> - void Write32 ( u32 value ) ; <nl> - void Write64 ( u64 value ) ; <nl> - <nl> - public : <nl> - XEmitter ( ) { <nl> - code = nullptr ; <nl> - flags_locked = false ; <nl> - } <nl> - XEmitter ( u8 * code_ptr ) { <nl> - code = code_ptr ; <nl> - flags_locked = false ; <nl> - } <nl> - virtual ~ XEmitter ( ) { } <nl> - <nl> - void WriteModRM ( int mod , int rm , int reg ) ; <nl> - void WriteSIB ( int scale , int index , int base ) ; <nl> - <nl> - void SetCodePtr ( u8 * ptr ) ; <nl> - void ReserveCodeSpace ( int bytes ) ; <nl> - const u8 * AlignCode4 ( ) ; <nl> - const u8 * AlignCode16 ( ) ; <nl> - const u8 * AlignCodePage ( ) ; <nl> - const u8 * GetCodePtr ( ) const ; <nl> - u8 * GetWritableCodePtr ( ) ; <nl> - <nl> - void LockFlags ( ) { <nl> - flags_locked = true ; <nl> - } <nl> - void UnlockFlags ( ) { <nl> - flags_locked = false ; <nl> - } <nl> - <nl> - / / Looking for one of these ? It ' s BANNED ! ! Some instructions are slow on modern CPU <nl> - / / INC , DEC , LOOP , LOOPNE , LOOPE , ENTER , LEAVE , XCHG , XLAT , REP MOVSB / MOVSD , REP SCASD + other <nl> - / / string instr . , <nl> - / / INC and DEC are slow on Intel Core , but not on AMD . They create a <nl> - / / false flag dependency because they only update a subset of the flags . <nl> - / / XCHG is SLOW and should be avoided . <nl> - <nl> - / / Debug breakpoint <nl> - void INT3 ( ) ; <nl> - <nl> - / / Do nothing <nl> - void NOP ( size_t count = 1 ) ; <nl> - <nl> - / / Save energy in wait - loops on P4 only . Probably not too useful . <nl> - void PAUSE ( ) ; <nl> - <nl> - / / Flag control <nl> - void STC ( ) ; <nl> - void CLC ( ) ; <nl> - void CMC ( ) ; <nl> - <nl> - / / These two can not be executed in 64 - bit mode on early Intel 64 - bit CPU : s , only on Core2 and <nl> - / / AMD ! <nl> - void LAHF ( ) ; / / 3 cycle vector path <nl> - void SAHF ( ) ; / / direct path fast <nl> - <nl> - / / Stack control <nl> - void PUSH ( X64Reg reg ) ; <nl> - void POP ( X64Reg reg ) ; <nl> - void PUSH ( int bits , const OpArg & reg ) ; <nl> - void POP ( int bits , const OpArg & reg ) ; <nl> - void PUSHF ( ) ; <nl> - void POPF ( ) ; <nl> - <nl> - / / Flow control <nl> - void RET ( ) ; <nl> - void RET_FAST ( ) ; <nl> - void UD2 ( ) ; <nl> - FixupBranch J ( bool force5bytes = false ) ; <nl> - <nl> - void JMP ( const u8 * addr , bool force5Bytes = false ) ; <nl> - void JMPptr ( const OpArg & arg ) ; <nl> - void JMPself ( ) ; / / infinite loop ! <nl> - # ifdef CALL <nl> - # undef CALL <nl> - # endif <nl> - void CALL ( const void * fnptr ) ; <nl> - FixupBranch CALL ( ) ; <nl> - void CALLptr ( OpArg arg ) ; <nl> - <nl> - FixupBranch J_CC ( CCFlags conditionCode , bool force5bytes = false ) ; <nl> - void J_CC ( CCFlags conditionCode , const u8 * addr , bool force5Bytes = false ) ; <nl> - <nl> - void SetJumpTarget ( const FixupBranch & branch ) ; <nl> - void SetJumpTarget ( const FixupBranch & branch , const u8 * target ) ; <nl> - <nl> - void SETcc ( CCFlags flag , OpArg dest ) ; <nl> - / / Note : CMOV brings small if any benefit on current cpus . <nl> - void CMOVcc ( int bits , X64Reg dest , OpArg src , CCFlags flag ) ; <nl> - <nl> - / / Fences <nl> - void LFENCE ( ) ; <nl> - void MFENCE ( ) ; <nl> - void SFENCE ( ) ; <nl> - <nl> - / / Bit scan <nl> - void BSF ( int bits , X64Reg dest , const OpArg & src ) ; / / Bottom bit to top bit <nl> - void BSR ( int bits , X64Reg dest , const OpArg & src ) ; / / Top bit to bottom bit <nl> - <nl> - / / Cache control <nl> - enum PrefetchLevel { <nl> - PF_NTA , / / Non - temporal ( data used once and only once ) <nl> - PF_T0 , / / All cache levels <nl> - PF_T1 , / / Levels 2 + ( aliased to T0 on AMD ) <nl> - PF_T2 , / / Levels 3 + ( aliased to T0 on AMD ) <nl> - } ; <nl> - void PREFETCH ( PrefetchLevel level , OpArg arg ) ; <nl> - void MOVNTI ( int bits , const OpArg & dest , X64Reg src ) ; <nl> - void MOVNTDQ ( const OpArg & arg , X64Reg regOp ) ; <nl> - void MOVNTPS ( const OpArg & arg , X64Reg regOp ) ; <nl> - void MOVNTPD ( const OpArg & arg , X64Reg regOp ) ; <nl> - <nl> - / / Multiplication / division <nl> - void MUL ( int bits , const OpArg & src ) ; / / UNSIGNED <nl> - void IMUL ( int bits , const OpArg & src ) ; / / SIGNED <nl> - void IMUL ( int bits , X64Reg regOp , const OpArg & src ) ; <nl> - void IMUL ( int bits , X64Reg regOp , const OpArg & src , const OpArg & imm ) ; <nl> - void DIV ( int bits , const OpArg & src ) ; <nl> - void IDIV ( int bits , const OpArg & src ) ; <nl> - <nl> - / / Shift <nl> - void ROL ( int bits , const OpArg & dest , const OpArg & shift ) ; <nl> - void ROR ( int bits , const OpArg & dest , const OpArg & shift ) ; <nl> - void RCL ( int bits , const OpArg & dest , const OpArg & shift ) ; <nl> - void RCR ( int bits , const OpArg & dest , const OpArg & shift ) ; <nl> - void SHL ( int bits , const OpArg & dest , const OpArg & shift ) ; <nl> - void SHR ( int bits , const OpArg & dest , const OpArg & shift ) ; <nl> - void SAR ( int bits , const OpArg & dest , const OpArg & shift ) ; <nl> - <nl> - / / Bit Test <nl> - void BT ( int bits , const OpArg & dest , const OpArg & index ) ; <nl> - void BTS ( int bits , const OpArg & dest , const OpArg & index ) ; <nl> - void BTR ( int bits , const OpArg & dest , const OpArg & index ) ; <nl> - void BTC ( int bits , const OpArg & dest , const OpArg & index ) ; <nl> - <nl> - / / Double - Precision Shift <nl> - void SHRD ( int bits , const OpArg & dest , const OpArg & src , const OpArg & shift ) ; <nl> - void SHLD ( int bits , const OpArg & dest , const OpArg & src , const OpArg & shift ) ; <nl> - <nl> - / / Extend EAX into EDX in various ways <nl> - void CWD ( int bits = 16 ) ; <nl> - void CDQ ( ) { <nl> - CWD ( 32 ) ; <nl> - } <nl> - void CQO ( ) { <nl> - CWD ( 64 ) ; <nl> - } <nl> - void CBW ( int bits = 8 ) ; <nl> - void CWDE ( ) { <nl> - CBW ( 16 ) ; <nl> - } <nl> - void CDQE ( ) { <nl> - CBW ( 32 ) ; <nl> - } <nl> - <nl> - / / Load effective address <nl> - void LEA ( int bits , X64Reg dest , OpArg src ) ; <nl> - <nl> - / / Integer arithmetic <nl> - void NEG ( int bits , const OpArg & src ) ; <nl> - void ADD ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - void ADC ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - void SUB ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - void SBB ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - void AND ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - void CMP ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - <nl> - / / Bit operations <nl> - void NOT ( int bits , const OpArg & src ) ; <nl> - void OR ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - void XOR ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - void MOV ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - void TEST ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - <nl> - / / Are these useful at all ? Consider removing . <nl> - void XCHG ( int bits , const OpArg & a1 , const OpArg & a2 ) ; <nl> - void XCHG_AHAL ( ) ; <nl> - <nl> - / / Byte swapping ( 32 and 64 - bit only ) . <nl> - void BSWAP ( int bits , X64Reg reg ) ; <nl> - <nl> - / / Sign / zero extension <nl> - void MOVSX ( int dbits , int sbits , X64Reg dest , <nl> - OpArg src ) ; / / automatically uses MOVSXD if necessary <nl> - void MOVZX ( int dbits , int sbits , X64Reg dest , OpArg src ) ; <nl> - <nl> - / / Available only on Atom or > = Haswell so far . Test with GetCPUCaps ( ) . movbe . <nl> - void MOVBE ( int dbits , const OpArg & dest , const OpArg & src ) ; <nl> - <nl> - / / Available only on AMD > = Phenom or Intel > = Haswell <nl> - void LZCNT ( int bits , X64Reg dest , const OpArg & src ) ; <nl> - / / Note : this one is actually part of BMI1 <nl> - void TZCNT ( int bits , X64Reg dest , const OpArg & src ) ; <nl> - <nl> - / / WARNING - These two take 11 - 13 cycles and are VectorPath ! ( AMD64 ) <nl> - void STMXCSR ( const OpArg & memloc ) ; <nl> - void LDMXCSR ( const OpArg & memloc ) ; <nl> - <nl> - / / Prefixes <nl> - void LOCK ( ) ; <nl> - void REP ( ) ; <nl> - void REPNE ( ) ; <nl> - void FSOverride ( ) ; <nl> - void GSOverride ( ) ; <nl> - <nl> - / / x87 <nl> - enum x87StatusWordBits { <nl> - x87_InvalidOperation = 0x1 , <nl> - x87_DenormalizedOperand = 0x2 , <nl> - x87_DivisionByZero = 0x4 , <nl> - x87_Overflow = 0x8 , <nl> - x87_Underflow = 0x10 , <nl> - x87_Precision = 0x20 , <nl> - x87_StackFault = 0x40 , <nl> - x87_ErrorSummary = 0x80 , <nl> - x87_C0 = 0x100 , <nl> - x87_C1 = 0x200 , <nl> - x87_C2 = 0x400 , <nl> - x87_TopOfStack = 0x2000 | 0x1000 | 0x800 , <nl> - x87_C3 = 0x4000 , <nl> - x87_FPUBusy = 0x8000 , <nl> - } ; <nl> - <nl> - void FLD ( int bits , const OpArg & src ) ; <nl> - void FST ( int bits , const OpArg & dest ) ; <nl> - void FSTP ( int bits , const OpArg & dest ) ; <nl> - void FNSTSW_AX ( ) ; <nl> - void FWAIT ( ) ; <nl> - <nl> - / / SSE / SSE2 : Floating point arithmetic <nl> - void ADDSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void ADDSD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void SUBSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void SUBSD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MULSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MULSD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void DIVSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void DIVSD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MINSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MINSD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MAXSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MAXSD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void SQRTSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void SQRTSD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void RCPSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void RSQRTSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - <nl> - / / SSE / SSE2 : Floating point bitwise ( yes ) <nl> - void CMPSS ( X64Reg regOp , const OpArg & arg , u8 compare ) ; <nl> - void CMPSD ( X64Reg regOp , const OpArg & arg , u8 compare ) ; <nl> - <nl> - void CMPEQSS ( X64Reg regOp , const OpArg & arg ) { <nl> - CMPSS ( regOp , arg , CMP_EQ ) ; <nl> - } <nl> - void CMPLTSS ( X64Reg regOp , const OpArg & arg ) { <nl> - CMPSS ( regOp , arg , CMP_LT ) ; <nl> - } <nl> - void CMPLESS ( X64Reg regOp , const OpArg & arg ) { <nl> - CMPSS ( regOp , arg , CMP_LE ) ; <nl> - } <nl> - void CMPUNORDSS ( X64Reg regOp , const OpArg & arg ) { <nl> - CMPSS ( regOp , arg , CMP_UNORD ) ; <nl> - } <nl> - void CMPNEQSS ( X64Reg regOp , const OpArg & arg ) { <nl> - CMPSS ( regOp , arg , CMP_NEQ ) ; <nl> - } <nl> - void CMPNLTSS ( X64Reg regOp , const OpArg & arg ) { <nl> - CMPSS ( regOp , arg , CMP_NLT ) ; <nl> - } <nl> - void CMPORDSS ( X64Reg regOp , const OpArg & arg ) { <nl> - CMPSS ( regOp , arg , CMP_ORD ) ; <nl> - } <nl> - <nl> - / / SSE / SSE2 : Floating point packed arithmetic ( x4 for float , x2 for double ) <nl> - void ADDPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void ADDPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void SUBPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void SUBPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void CMPPS ( X64Reg regOp , const OpArg & arg , u8 compare ) ; <nl> - void CMPPD ( X64Reg regOp , const OpArg & arg , u8 compare ) ; <nl> - void MULPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MULPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void DIVPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void DIVPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MINPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MINPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MAXPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MAXPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void SQRTPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void SQRTPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void RCPPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void RSQRTPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - <nl> - / / SSE / SSE2 : Floating point packed bitwise ( x4 for float , x2 for double ) <nl> - void ANDPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void ANDPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void ANDNPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void ANDNPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void ORPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void ORPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void XORPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void XORPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - <nl> - / / SSE / SSE2 : Shuffle components . These are tricky - see Intel documentation . <nl> - void SHUFPS ( X64Reg regOp , const OpArg & arg , u8 shuffle ) ; <nl> - void SHUFPD ( X64Reg regOp , const OpArg & arg , u8 shuffle ) ; <nl> - <nl> - / / SSE / SSE2 : Useful alternative to shuffle in some cases . <nl> - void MOVDDUP ( X64Reg regOp , const OpArg & arg ) ; <nl> - <nl> - / / SSE3 : Horizontal operations in SIMD registers . Very slow ! shufps - based code beats it handily <nl> - / / on Ivy . <nl> - void HADDPS ( X64Reg dest , const OpArg & src ) ; <nl> - <nl> - / / SSE4 : Further horizontal operations - dot products . These are weirdly flexible , the arg <nl> - / / contains both a read mask and a write " mask " . <nl> - void DPPS ( X64Reg dest , const OpArg & src , u8 arg ) ; <nl> - <nl> - void UNPCKLPS ( X64Reg dest , const OpArg & src ) ; <nl> - void UNPCKHPS ( X64Reg dest , const OpArg & src ) ; <nl> - void UNPCKLPD ( X64Reg dest , const OpArg & src ) ; <nl> - void UNPCKHPD ( X64Reg dest , const OpArg & src ) ; <nl> - <nl> - / / SSE / SSE2 : Compares . <nl> - void COMISS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void COMISD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void UCOMISS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void UCOMISD ( X64Reg regOp , const OpArg & arg ) ; <nl> - <nl> - / / SSE / SSE2 : Moves . Use the right data type for your data , in most cases . <nl> - void MOVAPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVAPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVAPS ( const OpArg & arg , X64Reg regOp ) ; <nl> - void MOVAPD ( const OpArg & arg , X64Reg regOp ) ; <nl> - <nl> - void MOVUPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVUPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVUPS ( const OpArg & arg , X64Reg regOp ) ; <nl> - void MOVUPD ( const OpArg & arg , X64Reg regOp ) ; <nl> - <nl> - void MOVDQA ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVDQA ( const OpArg & arg , X64Reg regOp ) ; <nl> - void MOVDQU ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVDQU ( const OpArg & arg , X64Reg regOp ) ; <nl> - <nl> - void MOVSS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVSD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVSS ( const OpArg & arg , X64Reg regOp ) ; <nl> - void MOVSD ( const OpArg & arg , X64Reg regOp ) ; <nl> - <nl> - void MOVLPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVLPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVLPS ( const OpArg & arg , X64Reg regOp ) ; <nl> - void MOVLPD ( const OpArg & arg , X64Reg regOp ) ; <nl> - <nl> - void MOVHPS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVHPD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void MOVHPS ( const OpArg & arg , X64Reg regOp ) ; <nl> - void MOVHPD ( const OpArg & arg , X64Reg regOp ) ; <nl> - <nl> - void MOVHLPS ( X64Reg regOp1 , X64Reg regOp2 ) ; <nl> - void MOVLHPS ( X64Reg regOp1 , X64Reg regOp2 ) ; <nl> - <nl> - void MOVD_xmm ( X64Reg dest , const OpArg & arg ) ; <nl> - void MOVQ_xmm ( X64Reg dest , OpArg arg ) ; <nl> - void MOVD_xmm ( const OpArg & arg , X64Reg src ) ; <nl> - void MOVQ_xmm ( OpArg arg , X64Reg src ) ; <nl> - <nl> - / / SSE / SSE2 : Generates a mask from the high bits of the components of the packed register in <nl> - / / question . <nl> - void MOVMSKPS ( X64Reg dest , const OpArg & arg ) ; <nl> - void MOVMSKPD ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - / / SSE2 : Selective byte store , mask in src register . EDI / RDI specifies store address . This is a <nl> - / / weird one . <nl> - void MASKMOVDQU ( X64Reg dest , X64Reg src ) ; <nl> - void LDDQU ( X64Reg dest , const OpArg & src ) ; <nl> - <nl> - / / SSE / SSE2 : Data type conversions . <nl> - void CVTPS2PD ( X64Reg dest , const OpArg & src ) ; <nl> - void CVTPD2PS ( X64Reg dest , const OpArg & src ) ; <nl> - void CVTSS2SD ( X64Reg dest , const OpArg & src ) ; <nl> - void CVTSI2SS ( X64Reg dest , const OpArg & src ) ; <nl> - void CVTSD2SS ( X64Reg dest , const OpArg & src ) ; <nl> - void CVTSI2SD ( X64Reg dest , const OpArg & src ) ; <nl> - void CVTDQ2PD ( X64Reg regOp , const OpArg & arg ) ; <nl> - void CVTPD2DQ ( X64Reg regOp , const OpArg & arg ) ; <nl> - void CVTDQ2PS ( X64Reg regOp , const OpArg & arg ) ; <nl> - void CVTPS2DQ ( X64Reg regOp , const OpArg & arg ) ; <nl> - <nl> - void CVTTPS2DQ ( X64Reg regOp , const OpArg & arg ) ; <nl> - void CVTTPD2DQ ( X64Reg regOp , const OpArg & arg ) ; <nl> - <nl> - / / Destinations are X64 regs ( rax , rbx , . . . ) for these instructions . <nl> - void CVTSS2SI ( X64Reg xregdest , const OpArg & src ) ; <nl> - void CVTSD2SI ( X64Reg xregdest , const OpArg & src ) ; <nl> - void CVTTSS2SI ( X64Reg xregdest , const OpArg & arg ) ; <nl> - void CVTTSD2SI ( X64Reg xregdest , const OpArg & arg ) ; <nl> - <nl> - / / SSE2 : Packed integer instructions <nl> - void PACKSSDW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PACKSSWB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PACKUSDW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PACKUSWB ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PUNPCKLBW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PUNPCKLWD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PUNPCKLDQ ( X64Reg dest , const OpArg & arg ) ; <nl> - void PUNPCKLQDQ ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PTEST ( X64Reg dest , const OpArg & arg ) ; <nl> - void PAND ( X64Reg dest , const OpArg & arg ) ; <nl> - void PANDN ( X64Reg dest , const OpArg & arg ) ; <nl> - void PXOR ( X64Reg dest , const OpArg & arg ) ; <nl> - void POR ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PADDB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PADDW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PADDD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PADDQ ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PADDSB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PADDSW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PADDUSB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PADDUSW ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PSUBB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PSUBW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PSUBD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PSUBQ ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PSUBSB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PSUBSW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PSUBUSB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PSUBUSW ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PAVGB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PAVGW ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PCMPEQB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PCMPEQW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PCMPEQD ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PCMPGTB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PCMPGTW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PCMPGTD ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PEXTRW ( X64Reg dest , const OpArg & arg , u8 subreg ) ; <nl> - void PINSRW ( X64Reg dest , const OpArg & arg , u8 subreg ) ; <nl> - <nl> - void PMADDWD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PSADBW ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PMAXSW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMAXUB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMINSW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMINUB ( X64Reg dest , const OpArg & arg ) ; <nl> - / / SSE4 : More MAX / MIN instructions . <nl> - void PMINSB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMINSD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMINUW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMINUD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMAXSB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMAXSD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMAXUW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMAXUD ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PMOVMSKB ( X64Reg dest , const OpArg & arg ) ; <nl> - void PSHUFD ( X64Reg dest , const OpArg & arg , u8 shuffle ) ; <nl> - void PSHUFB ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - void PSHUFLW ( X64Reg dest , const OpArg & arg , u8 shuffle ) ; <nl> - void PSHUFHW ( X64Reg dest , const OpArg & arg , u8 shuffle ) ; <nl> - <nl> - void PSRLW ( X64Reg reg , int shift ) ; <nl> - void PSRLD ( X64Reg reg , int shift ) ; <nl> - void PSRLQ ( X64Reg reg , int shift ) ; <nl> - void PSRLQ ( X64Reg reg , const OpArg & arg ) ; <nl> - void PSRLDQ ( X64Reg reg , int shift ) ; <nl> - <nl> - void PSLLW ( X64Reg reg , int shift ) ; <nl> - void PSLLD ( X64Reg reg , int shift ) ; <nl> - void PSLLQ ( X64Reg reg , int shift ) ; <nl> - void PSLLDQ ( X64Reg reg , int shift ) ; <nl> - <nl> - void PSRAW ( X64Reg reg , int shift ) ; <nl> - void PSRAD ( X64Reg reg , int shift ) ; <nl> - <nl> - / / SSE4 : data type conversions <nl> - void PMOVSXBW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVSXBD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVSXBQ ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVSXWD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVSXWQ ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVSXDQ ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVZXBW ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVZXBD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVZXBQ ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVZXWD ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVZXWQ ( X64Reg dest , const OpArg & arg ) ; <nl> - void PMOVZXDQ ( X64Reg dest , const OpArg & arg ) ; <nl> - <nl> - / / SSE4 : variable blend instructions ( xmm0 implicit argument ) <nl> - void PBLENDVB ( X64Reg dest , const OpArg & arg ) ; <nl> - void BLENDVPS ( X64Reg dest , const OpArg & arg ) ; <nl> - void BLENDVPD ( X64Reg dest , const OpArg & arg ) ; <nl> - void BLENDPS ( X64Reg dest , const OpArg & arg , u8 blend ) ; <nl> - void BLENDPD ( X64Reg dest , const OpArg & arg , u8 blend ) ; <nl> - <nl> - / / SSE4 : rounding ( see FloatRound for mode or use ROUNDNEARSS , etc . helpers . ) <nl> - void ROUNDSS ( X64Reg dest , const OpArg & arg , u8 mode ) ; <nl> - void ROUNDSD ( X64Reg dest , const OpArg & arg , u8 mode ) ; <nl> - void ROUNDPS ( X64Reg dest , const OpArg & arg , u8 mode ) ; <nl> - void ROUNDPD ( X64Reg dest , const OpArg & arg , u8 mode ) ; <nl> - <nl> - void ROUNDNEARSS ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDSS ( dest , arg , FROUND_NEAREST ) ; <nl> - } <nl> - void ROUNDFLOORSS ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDSS ( dest , arg , FROUND_FLOOR ) ; <nl> - } <nl> - void ROUNDCEILSS ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDSS ( dest , arg , FROUND_CEIL ) ; <nl> - } <nl> - void ROUNDZEROSS ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDSS ( dest , arg , FROUND_ZERO ) ; <nl> - } <nl> - <nl> - void ROUNDNEARSD ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDSD ( dest , arg , FROUND_NEAREST ) ; <nl> - } <nl> - void ROUNDFLOORSD ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDSD ( dest , arg , FROUND_FLOOR ) ; <nl> - } <nl> - void ROUNDCEILSD ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDSD ( dest , arg , FROUND_CEIL ) ; <nl> - } <nl> - void ROUNDZEROSD ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDSD ( dest , arg , FROUND_ZERO ) ; <nl> - } <nl> - <nl> - void ROUNDNEARPS ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDPS ( dest , arg , FROUND_NEAREST ) ; <nl> - } <nl> - void ROUNDFLOORPS ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDPS ( dest , arg , FROUND_FLOOR ) ; <nl> - } <nl> - void ROUNDCEILPS ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDPS ( dest , arg , FROUND_CEIL ) ; <nl> - } <nl> - void ROUNDZEROPS ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDPS ( dest , arg , FROUND_ZERO ) ; <nl> - } <nl> - <nl> - void ROUNDNEARPD ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDPD ( dest , arg , FROUND_NEAREST ) ; <nl> - } <nl> - void ROUNDFLOORPD ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDPD ( dest , arg , FROUND_FLOOR ) ; <nl> - } <nl> - void ROUNDCEILPD ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDPD ( dest , arg , FROUND_CEIL ) ; <nl> - } <nl> - void ROUNDZEROPD ( X64Reg dest , const OpArg & arg ) { <nl> - ROUNDPD ( dest , arg , FROUND_ZERO ) ; <nl> - } <nl> - <nl> - / / AVX <nl> - void VADDSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VSUBSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VMULSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VDIVSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VADDPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VSUBPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VMULPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VDIVPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VSQRTSD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VSHUFPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg , u8 shuffle ) ; <nl> - void VUNPCKLPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VUNPCKHPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - <nl> - void VANDPS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VANDPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VANDNPS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VANDNPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VORPS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VORPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VXORPS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VXORPD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - <nl> - void VPAND ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VPANDN ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VPOR ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VPXOR ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - <nl> - / / FMA3 <nl> - void VFMADD132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD132SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD213SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD231SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD132SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD213SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADD231SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB132SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB213SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB231SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB132SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB213SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUB231SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD132SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD213SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD231SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD132SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD213SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMADD231SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB132SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB213SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB231SS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB132SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB213SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFNMSUB231SD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADDSUB132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADDSUB213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADDSUB231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADDSUB132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADDSUB213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMADDSUB231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUBADD132PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUBADD213PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUBADD231PS ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUBADD132PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUBADD213PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void VFMSUBADD231PD ( X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - <nl> - / / VEX GPR instructions <nl> - void SARX ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) ; <nl> - void SHLX ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) ; <nl> - void SHRX ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) ; <nl> - void RORX ( int bits , X64Reg regOp , const OpArg & arg , u8 rotate ) ; <nl> - void PEXT ( int bits , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void PDEP ( int bits , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void MULX ( int bits , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - void BZHI ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) ; <nl> - void BLSR ( int bits , X64Reg regOp , const OpArg & arg ) ; <nl> - void BLSMSK ( int bits , X64Reg regOp , const OpArg & arg ) ; <nl> - void BLSI ( int bits , X64Reg regOp , const OpArg & arg ) ; <nl> - void BEXTR ( int bits , X64Reg regOp1 , const OpArg & arg , X64Reg regOp2 ) ; <nl> - void ANDN ( int bits , X64Reg regOp1 , X64Reg regOp2 , const OpArg & arg ) ; <nl> - <nl> - void RDTSC ( ) ; <nl> - <nl> - / / Utility functions <nl> - / / The difference between this and CALL is that this aligns the stack <nl> - / / where appropriate . <nl> - void ABI_CallFunction ( const void * func ) ; <nl> - template < typename T > <nl> - void ABI_CallFunction ( T ( * func ) ( ) ) { <nl> - ABI_CallFunction ( ( const void * ) func ) ; <nl> - } <nl> - <nl> - void ABI_CallFunction ( const u8 * func ) { <nl> - ABI_CallFunction ( ( const void * ) func ) ; <nl> - } <nl> - void ABI_CallFunctionC16 ( const void * func , u16 param1 ) ; <nl> - void ABI_CallFunctionCC16 ( const void * func , u32 param1 , u16 param2 ) ; <nl> - <nl> - / / These only support u32 parameters , but that ' s enough for a lot of uses . <nl> - / / These will destroy the 1 or 2 first " parameter regs " . <nl> - void ABI_CallFunctionC ( const void * func , u32 param1 ) ; <nl> - void ABI_CallFunctionCC ( const void * func , u32 param1 , u32 param2 ) ; <nl> - void ABI_CallFunctionCCC ( const void * func , u32 param1 , u32 param2 , u32 param3 ) ; <nl> - void ABI_CallFunctionCCP ( const void * func , u32 param1 , u32 param2 , void * param3 ) ; <nl> - void ABI_CallFunctionCCCP ( const void * func , u32 param1 , u32 param2 , u32 param3 , void * param4 ) ; <nl> - void ABI_CallFunctionP ( const void * func , void * param1 ) ; <nl> - void ABI_CallFunctionPA ( const void * func , void * param1 , const OpArg & arg2 ) ; <nl> - void ABI_CallFunctionPAA ( const void * func , void * param1 , const OpArg & arg2 , const OpArg & arg3 ) ; <nl> - void ABI_CallFunctionPPC ( const void * func , void * param1 , void * param2 , u32 param3 ) ; <nl> - void ABI_CallFunctionAC ( const void * func , const OpArg & arg1 , u32 param2 ) ; <nl> - void ABI_CallFunctionACC ( const void * func , const OpArg & arg1 , u32 param2 , u32 param3 ) ; <nl> - void ABI_CallFunctionA ( const void * func , const OpArg & arg1 ) ; <nl> - void ABI_CallFunctionAA ( const void * func , const OpArg & arg1 , const OpArg & arg2 ) ; <nl> - <nl> - / / Pass a register as a parameter . <nl> - void ABI_CallFunctionR ( const void * func , X64Reg reg1 ) ; <nl> - void ABI_CallFunctionRR ( const void * func , X64Reg reg1 , X64Reg reg2 ) ; <nl> - <nl> - template < typename Tr , typename T1 > <nl> - void ABI_CallFunctionC ( Tr ( * func ) ( T1 ) , u32 param1 ) { <nl> - ABI_CallFunctionC ( ( const void * ) func , param1 ) ; <nl> - } <nl> - <nl> - / * * <nl> - * Saves specified registers and adjusts the stack to be 16 - byte aligned as required by the ABI <nl> - * <nl> - * @ param mask Registers to push on the stack ( high 16 bits are XMMs , low 16 bits are GPRs ) <nl> - * @ param rsp_alignment Current alignment of the stack pointer , must be 0 or 8 <nl> - * @ param needed_frame_size Additional space needed , e . g . , for function arguments passed on the <nl> - * stack <nl> - * @ return Size of the shadow space , i . e . , offset of the frame <nl> - * / <nl> - size_t ABI_PushRegistersAndAdjustStack ( BitSet32 mask , size_t rsp_alignment , <nl> - size_t needed_frame_size = 0 ) ; <nl> - <nl> - / * * <nl> - * Restores specified registers and adjusts the stack to its original alignment , i . e . , the <nl> - * alignment before <nl> - * the matching PushRegistersAndAdjustStack . <nl> - * <nl> - * @ param mask Registers to restores from the stack ( high 16 bits are XMMs , low 16 bits are <nl> - * GPRs ) <nl> - * @ param rsp_alignment Original alignment before the matching PushRegistersAndAdjustStack , must <nl> - * be 0 or 8 <nl> - * @ param needed_frame_size Additional space that was needed <nl> - * @ warning Stack must be currently 16 - byte aligned <nl> - * / <nl> - void ABI_PopRegistersAndAdjustStack ( BitSet32 mask , size_t rsp_alignment , <nl> - size_t needed_frame_size = 0 ) ; <nl> - <nl> - # ifdef _M_IX86 <nl> - static int ABI_GetNumXMMRegs ( ) { <nl> - return 8 ; <nl> - } <nl> - # else <nl> - static int ABI_GetNumXMMRegs ( ) { <nl> - return 16 ; <nl> - } <nl> - # endif <nl> - } ; / / class XEmitter <nl> - <nl> - / / Everything that needs to generate X86 code should inherit from this . <nl> - / / You get memory management for free , plus , you can use all the MOV etc functions without <nl> - / / having to prefix them with gen - > or something similar . <nl> - <nl> - class XCodeBlock : public CodeBlock < XEmitter > { <nl> - public : <nl> - void PoisonMemory ( ) override ; <nl> - } ; <nl> - <nl> - } / / namespace <nl> mmm a / src / video_core / shader / shader_jit_x64_compiler . h <nl> ppp b / src / video_core / shader / shader_jit_x64_compiler . h <nl> <nl> # include < xbyak . h > <nl> # include " common / bit_set . h " <nl> # include " common / common_types . h " <nl> - # include " common / x64 / emitter . h " <nl> # include " video_core / shader / shader . h " <nl> <nl> using nihstro : : Instruction ; <nl>

Common / x64 : remove legacy emitter and abi ( )

yuzu-emu/yuzu

0b9c59ff220b7c8f8c06f5cf6fea716970773f00

2017-01-31T09:06:42Z

mmm a / test / IRGen / big_types_corner_cases . swift <nl> ppp b / test / IRGen / big_types_corner_cases . swift <nl> <nl> / / RUN : % target - swift - frontend - assume - parsing - unqualified - ownership - sil - enable - large - loadable - types % s - emit - ir | % FileCheck % s - - check - prefix = CHECK - - check - prefix = CHECK - % target - ptrsize <nl> + / / REQUIRES : optimized_stdlib <nl> / / UNSUPPORTED : resilient_stdlib <nl> <nl> public struct BigStruct { <nl> mmm a / validation - test / execution_crashers / arc_36509461 . swift <nl> ppp b / validation - test / execution_crashers / arc_36509461 . swift <nl> <nl> / / REQUIRES : executable_test <nl> / / REQUIRES : asan_runtime <nl> / / REQUIRES : objc_interop <nl> + / / UNSUPPORTED : CPU = i386 <nl> <nl> import Foundation <nl> <nl>

Merge remote - tracking branch ' origin / master ' into master - llvm - swift5 - transition

apple/swift

b3d220ecfc4e293fb8f055e7d89ecc00cf6ee4e9

2018-01-28T03:18:33Z