devel/lttng-tools/patches/200-use-extern.patch

   1 --- a/src/common/mi-lttng.h
   2 +++ b/src/common/mi-lttng.h
   3 @@ -49,133 +49,133 @@ struct mi_lttng_version {
   4  };
   5
   6  /* Strings related to command */
   7 -const char * const mi_lttng_element_command;
   8 -const char * const mi_lttng_element_command_action;
   9 -const char * const mi_lttng_element_command_add_context;
  10 -const char * const mi_lttng_element_command_calibrate;
  11 -const char * const mi_lttng_element_command_create;
  12 -const char * const mi_lttng_element_command_destroy;
  13 -const char * const mi_lttng_element_command_disable_channel;
  14 -const char * const mi_lttng_element_command_disable_event;
  15 -const char * const mi_lttng_element_command_enable_channels;
  16 -const char * const mi_lttng_element_command_enable_event;
  17 -const char * const mi_lttng_element_command_list;
  18 -const char * const mi_lttng_element_command_load;
  19 -const char * const mi_lttng_element_command_name;
  20 -const char * const mi_lttng_element_command_output;
  21 -const char * const mi_lttng_element_command_save;
  22 -const char * const mi_lttng_element_command_set_session;
  23 -const char * const mi_lttng_element_command_snapshot;
  24 -const char * const mi_lttng_element_command_snapshot_add;
  25 -const char * const mi_lttng_element_command_snapshot_del;
  26 -const char * const mi_lttng_element_command_snapshot_list;
  27 -const char * const mi_lttng_element_command_snapshot_record;
  28 -const char * const mi_lttng_element_command_start;
  29 -const char * const mi_lttng_element_command_stop;
  30 -const char * const mi_lttng_element_command_success;
  31 -const char * const mi_lttng_element_command_version;
  32 +extern const char * const mi_lttng_element_command;
  33 +extern const char * const mi_lttng_element_command_action;
  34 +extern const char * const mi_lttng_element_command_add_context;
  35 +extern const char * const mi_lttng_element_command_calibrate;
  36 +extern const char * const mi_lttng_element_command_create;
  37 +extern const char * const mi_lttng_element_command_destroy;
  38 +extern const char * const mi_lttng_element_command_disable_channel;
  39 +extern const char * const mi_lttng_element_command_disable_event;
  40 +extern const char * const mi_lttng_element_command_enable_channels;
  41 +extern const char * const mi_lttng_element_command_enable_event;
  42 +extern const char * const mi_lttng_element_command_list;
  43 +extern const char * const mi_lttng_element_command_load;
  44 +extern const char * const mi_lttng_element_command_name;
  45 +extern const char * const mi_lttng_element_command_output;
  46 +extern const char * const mi_lttng_element_command_save;
  47 +extern const char * const mi_lttng_element_command_set_session;
  48 +extern const char * const mi_lttng_element_command_snapshot;
  49 +extern const char * const mi_lttng_element_command_snapshot_add;
  50 +extern const char * const mi_lttng_element_command_snapshot_del;
  51 +extern const char * const mi_lttng_element_command_snapshot_list;
  52 +extern const char * const mi_lttng_element_command_snapshot_record;
  53 +extern const char * const mi_lttng_element_command_start;
  54 +extern const char * const mi_lttng_element_command_stop;
  55 +extern const char * const mi_lttng_element_command_success;
  56 +extern const char * const mi_lttng_element_command_version;
  57
  58  /* Strings related to version command */
  59 -const char * const mi_lttng_element_version;
  60 -const char * const mi_lttng_element_version_commit;
  61 -const char * const mi_lttng_element_version_description;
  62 -const char * const mi_lttng_element_version_license;
  63 -const char * const mi_lttng_element_version_major;
  64 -const char * const mi_lttng_element_version_minor;
  65 -const char * const mi_lttng_element_version_patch_level;
  66 -const char * const mi_lttng_element_version_str;
  67 -const char * const mi_lttng_element_version_web;
  68 +extern const char * const mi_lttng_element_version;
  69 +extern const char * const mi_lttng_element_version_commit;
  70 +extern const char * const mi_lttng_element_version_description;
  71 +extern const char * const mi_lttng_element_version_license;
  72 +extern const char * const mi_lttng_element_version_major;
  73 +extern const char * const mi_lttng_element_version_minor;
  74 +extern const char * const mi_lttng_element_version_patch_level;
  75 +extern const char * const mi_lttng_element_version_str;
  76 +extern const char * const mi_lttng_element_version_web;
  77
  78  /* String related to a lttng_event_field */
  79 -const char * const mi_lttng_element_event_field;
  80 -const char * const mi_lttng_element_event_fields;
  81 +extern const char * const mi_lttng_element_event_field;
  82 +extern const char * const mi_lttng_element_event_fields;
  83
  84  /* String related to lttng_event_context */
  85 -const char * const mi_lttng_context_type_perf_counter;
  86 -const char * const mi_lttng_context_type_perf_cpu_counter;
  87 -const char * const mi_lttng_context_type_perf_thread_counter;
  88 +extern const char * const mi_lttng_context_type_perf_counter;
  89 +extern const char * const mi_lttng_context_type_perf_cpu_counter;
  90 +extern const char * const mi_lttng_context_type_perf_thread_counter;
  91
  92  /* String related to lttng_event_perf_counter_ctx */
  93 -const char * const mi_lttng_element_perf_counter_context;
  94 +extern const char * const mi_lttng_element_perf_counter_context;
  95
  96  /* Strings related to pid */
  97 -const char * const mi_lttng_element_pids;
  98 -const char * const mi_lttng_element_pid;
  99 -const char * const mi_lttng_element_pid_id;
 100 +extern const char * const mi_lttng_element_pids;
 101 +extern const char * const mi_lttng_element_pid;
 102 +extern const char * const mi_lttng_element_pid_id;
 103
 104  /* Strings related to save command */
 105 -const char * const mi_lttng_element_save;
 106 +extern const char * const mi_lttng_element_save;
 107
 108  /* Strings related to load command */
 109 -const char * const mi_lttng_element_load;
 110 +extern const char * const mi_lttng_element_load;
 111
 112  /* General element of mi_lttng */
 113 -const char * const mi_lttng_element_empty;
 114 -const char * const mi_lttng_element_id;
 115 -const char * const mi_lttng_element_nowrite;
 116 -const char * const mi_lttng_element_success;
 117 -const char * const mi_lttng_element_type_enum;
 118 -const char * const mi_lttng_element_type_float;
 119 -const char * const mi_lttng_element_type_integer;
 120 -const char * const mi_lttng_element_type_other;
 121 -const char * const mi_lttng_element_type_string;
 122 +extern const char * const mi_lttng_element_empty;
 123 +extern const char * const mi_lttng_element_id;
 124 +extern const char * const mi_lttng_element_nowrite;
 125 +extern const char * const mi_lttng_element_success;
 126 +extern const char * const mi_lttng_element_type_enum;
 127 +extern const char * const mi_lttng_element_type_float;
 128 +extern const char * const mi_lttng_element_type_integer;
 129 +extern const char * const mi_lttng_element_type_other;
 130 +extern const char * const mi_lttng_element_type_string;
 131
 132  /* String related to loglevel */
 133 -const char * const mi_lttng_loglevel_str_alert;
 134 -const char * const mi_lttng_loglevel_str_crit;
 135 -const char * const mi_lttng_loglevel_str_debug;
 136 -const char * const mi_lttng_loglevel_str_debug_function;
 137 -const char * const mi_lttng_loglevel_str_debug_line;
 138 -const char * const mi_lttng_loglevel_str_debug_module;
 139 -const char * const mi_lttng_loglevel_str_debug_process;
 140 -const char * const mi_lttng_loglevel_str_debug_program;
 141 -const char * const mi_lttng_loglevel_str_debug_system;
 142 -const char * const mi_lttng_loglevel_str_debug_unit;
 143 -const char * const mi_lttng_loglevel_str_emerg;
 144 -const char * const mi_lttng_loglevel_str_err;
 145 -const char * const mi_lttng_loglevel_str_info;
 146 -const char * const mi_lttng_loglevel_str_notice;
 147 -const char * const mi_lttng_loglevel_str_unknown;
 148 -const char * const mi_lttng_loglevel_str_warning;
 149 +extern const char * const mi_lttng_loglevel_str_alert;
 150 +extern const char * const mi_lttng_loglevel_str_crit;
 151 +extern const char * const mi_lttng_loglevel_str_debug;
 152 +extern const char * const mi_lttng_loglevel_str_debug_function;
 153 +extern const char * const mi_lttng_loglevel_str_debug_line;
 154 +extern const char * const mi_lttng_loglevel_str_debug_module;
 155 +extern const char * const mi_lttng_loglevel_str_debug_process;
 156 +extern const char * const mi_lttng_loglevel_str_debug_program;
 157 +extern const char * const mi_lttng_loglevel_str_debug_system;
 158 +extern const char * const mi_lttng_loglevel_str_debug_unit;
 159 +extern const char * const mi_lttng_loglevel_str_emerg;
 160 +extern const char * const mi_lttng_loglevel_str_err;
 161 +extern const char * const mi_lttng_loglevel_str_info;
 162 +extern const char * const mi_lttng_loglevel_str_notice;
 163 +extern const char * const mi_lttng_loglevel_str_unknown;
 164 +extern const char * const mi_lttng_loglevel_str_warning;
 165
 166  /* String related to loglevel JUL */
 167 -const char * const mi_lttng_loglevel_str_jul_all;
 168 -const char * const mi_lttng_loglevel_str_jul_config;
 169 -const char * const mi_lttng_loglevel_str_jul_fine;
 170 -const char * const mi_lttng_loglevel_str_jul_finer;
 171 -const char * const mi_lttng_loglevel_str_jul_finest;
 172 -const char * const mi_lttng_loglevel_str_jul_info;
 173 -const char * const mi_lttng_loglevel_str_jul_off;
 174 -const char * const mi_lttng_loglevel_str_jul_severe;
 175 -const char * const mi_lttng_loglevel_str_jul_warning;
 176 +extern const char * const mi_lttng_loglevel_str_jul_all;
 177 +extern const char * const mi_lttng_loglevel_str_jul_config;
 178 +extern const char * const mi_lttng_loglevel_str_jul_fine;
 179 +extern const char * const mi_lttng_loglevel_str_jul_finer;
 180 +extern const char * const mi_lttng_loglevel_str_jul_finest;
 181 +extern const char * const mi_lttng_loglevel_str_jul_info;
 182 +extern const char * const mi_lttng_loglevel_str_jul_off;
 183 +extern const char * const mi_lttng_loglevel_str_jul_severe;
 184 +extern const char * const mi_lttng_loglevel_str_jul_warning;
 185
 186  /* String related to loglevel Log4j */
 187 -const char * const mi_lttng_loglevel_str_log4j_off;
 188 -const char * const mi_lttng_loglevel_str_log4j_fatal;
 189 -const char * const mi_lttng_loglevel_str_log4j_error;
 190 -const char * const mi_lttng_loglevel_str_log4j_warn;
 191 -const char * const mi_lttng_loglevel_str_log4j_info;
 192 -const char * const mi_lttng_loglevel_str_log4j_debug;
 193 -const char * const mi_lttng_loglevel_str_log4j_trace;
 194 -const char * const mi_lttng_loglevel_str_log4j_all;
 195 +extern const char * const mi_lttng_loglevel_str_log4j_off;
 196 +extern const char * const mi_lttng_loglevel_str_log4j_fatal;
 197 +extern const char * const mi_lttng_loglevel_str_log4j_error;
 198 +extern const char * const mi_lttng_loglevel_str_log4j_warn;
 199 +extern const char * const mi_lttng_loglevel_str_log4j_info;
 200 +extern const char * const mi_lttng_loglevel_str_log4j_debug;
 201 +extern const char * const mi_lttng_loglevel_str_log4j_trace;
 202 +extern const char * const mi_lttng_loglevel_str_log4j_all;
 203
 204  /* String related to loglevel type */
 205 -const char * const mi_lttng_loglevel_type_all;
 206 -const char * const mi_lttng_loglevel_type_range;
 207 -const char * const mi_lttng_loglevel_type_single;
 208 -const char * const mi_lttng_loglevel_type_unknown;
 209 +extern const char * const mi_lttng_loglevel_type_all;
 210 +extern const char * const mi_lttng_loglevel_type_range;
 211 +extern const char * const mi_lttng_loglevel_type_single;
 212 +extern const char * const mi_lttng_loglevel_type_unknown;
 213
 214  /* Sting related to lttng_calibrate */
 215 -const char * const mi_lttng_element_calibrate;
 216 -const char * const mi_lttng_element_calibrate_function;
 217 +extern const char * const mi_lttng_element_calibrate;
 218 +extern const char * const mi_lttng_element_calibrate_function;
 219
 220  /* String related to a lttng_snapshot */
 221 -const char * const mi_lttng_element_snapshot_ctrl_url;
 222 -const char * const mi_lttng_element_snapshot_data_url;
 223 -const char * const mi_lttng_element_snapshot_max_size;
 224 -const char * const mi_lttng_element_snapshot_n_ptr;
 225 -const char * const mi_lttng_element_snapshot_session_name;
 226 -const char * const mi_lttng_element_snapshots;
 227 +extern const char * const mi_lttng_element_snapshot_ctrl_url;
 228 +extern const char * const mi_lttng_element_snapshot_data_url;
 229 +extern const char * const mi_lttng_element_snapshot_max_size;
 230 +extern const char * const mi_lttng_element_snapshot_n_ptr;
 231 +extern const char * const mi_lttng_element_snapshot_session_name;
 232 +extern const char * const mi_lttng_element_snapshots;
 233
 234  /* Utility string function  */
 235  const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain);
 236 --- a/src/common/config/config-session-abi.h
 237 +++ b/src/common/config/config-session-abi.h
 238 @@ -18,95 +18,95 @@
 239  #ifndef CONFIG_SESSION_INTERNAL_H
 240  #define CONFIG_SESSION_INTERNAL_H
 241
 242 -const char * const config_element_channel;
 243 -const char * const config_element_channels;
 244 -const char * const config_element_domain;
 245 -const char * const config_element_domains;
 246 -const char * const config_element_event;
 247 -const char * const config_element_events;
 248 -const char * const config_element_context;
 249 -const char * const config_element_contexts;
 250 -const char * const config_element_attributes;
 251 -const char * const config_element_exclusion;
 252 -const char * const config_element_exclusions;
 253 -const char * const config_element_function_attributes;
 254 -const char * const config_element_probe_attributes;
 255 -const char * const config_element_symbol_name;
 256 -const char * const config_element_address;
 257 -const char * const config_element_offset;
 258 -const char * const config_element_name;
 259 -const char * const config_element_enabled;
 260 -const char * const config_element_overwrite_mode;
 261 -const char * const config_element_subbuf_size;
 262 -const char * const config_element_num_subbuf;
 263 -const char * const config_element_switch_timer_interval;
 264 -const char * const config_element_read_timer_interval;
 265 -const char * const config_element_output;
 266 -const char * const config_element_output_type;
 267 -const char * const config_element_tracefile_size;
 268 -const char * const config_element_tracefile_count;
 269 -const char * const config_element_live_timer_interval;
 270 -const char * const config_element_type;
 271 -const char * const config_element_buffer_type;
 272 -const char * const config_element_session;
 273 -const char * const config_element_sessions;
 274 -const char * const config_element_perf;
 275 -const char * const config_element_config;
 276 -const char * const config_element_started;
 277 -const char * const config_element_snapshot_mode;
 278 -const char * const config_element_loglevel;
 279 -const char * const config_element_loglevel_type;
 280 -const char * const config_element_filter;
 281 -const char * const config_element_snapshot_outputs;
 282 -const char * const config_element_consumer_output;
 283 -const char * const config_element_destination;
 284 -const char * const config_element_path;
 285 -const char * const config_element_net_output;
 286 -const char * const config_element_control_uri;
 287 -const char * const config_element_data_uri;
 288 -const char * const config_element_max_size;
 289 -
 290 -const char * const config_domain_type_kernel;
 291 -const char * const config_domain_type_ust;
 292 -const char * const config_domain_type_jul;
 293 -const char * const config_domain_type_log4j;
 294 -
 295 -const char * const config_buffer_type_per_pid;
 296 -const char * const config_buffer_type_per_uid;
 297 -const char * const config_buffer_type_global;
 298 -
 299 -const char * const config_overwrite_mode_discard;
 300 -const char * const config_overwrite_mode_overwrite;
 301 -
 302 -const char * const config_output_type_splice;
 303 -const char * const config_output_type_mmap;
 304 -
 305 -const char * const config_loglevel_type_all;
 306 -const char * const config_loglevel_type_range;
 307 -const char * const config_loglevel_type_single;
 308 -
 309 -const char * const config_event_type_all;
 310 -const char * const config_event_type_tracepoint;
 311 -const char * const config_event_type_probe;
 312 -const char * const config_event_type_function;
 313 -const char * const config_event_type_function_entry;
 314 -const char * const config_event_type_noop;
 315 -const char * const config_event_type_syscall;
 316 -const char * const config_event_type_kprobe;
 317 -const char * const config_event_type_kretprobe;
 318 -
 319 -const char * const config_event_context_pid;
 320 -const char * const config_event_context_procname;
 321 -const char * const config_event_context_prio;
 322 -const char * const config_event_context_nice;
 323 -const char * const config_event_context_vpid;
 324 -const char * const config_event_context_tid;
 325 -const char * const config_event_context_vtid;
 326 -const char * const config_event_context_ppid;
 327 -const char * const config_event_context_vppid;
 328 -const char * const config_event_context_pthread_id;
 329 -const char * const config_event_context_hostname;
 330 -const char * const config_event_context_ip;
 331 -const char * const config_event_context_perf_thread_counter;
 332 +extern const char * const config_element_channel;
 333 +extern const char * const config_element_channels;
 334 +extern const char * const config_element_domain;
 335 +extern const char * const config_element_domains;
 336 +extern const char * const config_element_event;
 337 +extern const char * const config_element_events;
 338 +extern const char * const config_element_context;
 339 +extern const char * const config_element_contexts;
 340 +extern const char * const config_element_attributes;
 341 +extern const char * const config_element_exclusion;
 342 +extern const char * const config_element_exclusions;
 343 +extern const char * const config_element_function_attributes;
 344 +extern const char * const config_element_probe_attributes;
 345 +extern const char * const config_element_symbol_name;
 346 +extern const char * const config_element_address;
 347 +extern const char * const config_element_offset;
 348 +extern const char * const config_element_name;
 349 +extern const char * const config_element_enabled;
 350 +extern const char * const config_element_overwrite_mode;
 351 +extern const char * const config_element_subbuf_size;
 352 +extern const char * const config_element_num_subbuf;
 353 +extern const char * const config_element_switch_timer_interval;
 354 +extern const char * const config_element_read_timer_interval;
 355 +extern const char * const config_element_output;
 356 +extern const char * const config_element_output_type;
 357 +extern const char * const config_element_tracefile_size;
 358 +extern const char * const config_element_tracefile_count;
 359 +extern const char * const config_element_live_timer_interval;
 360 +extern const char * const config_element_type;
 361 +extern const char * const config_element_buffer_type;
 362 +extern const char * const config_element_session;
 363 +extern const char * const config_element_sessions;
 364 +extern const char * const config_element_perf;
 365 +extern const char * const config_element_config;
 366 +extern const char * const config_element_started;
 367 +extern const char * const config_element_snapshot_mode;
 368 +extern const char * const config_element_loglevel;
 369 +extern const char * const config_element_loglevel_type;
 370 +extern const char * const config_element_filter;
 371 +extern const char * const config_element_snapshot_outputs;
 372 +extern const char * const config_element_consumer_output;
 373 +extern const char * const config_element_destination;
 374 +extern const char * const config_element_path;
 375 +extern const char * const config_element_net_output;
 376 +extern const char * const config_element_control_uri;
 377 +extern const char * const config_element_data_uri;
 378 +extern const char * const config_element_max_size;
 379 +
 380 +extern const char * const config_domain_type_kernel;
 381 +extern const char * const config_domain_type_ust;
 382 +extern const char * const config_domain_type_jul;
 383 +extern const char * const config_domain_type_log4j;
 384 +
 385 +extern const char * const config_buffer_type_per_pid;
 386 +extern const char * const config_buffer_type_per_uid;
 387 +extern const char * const config_buffer_type_global;
 388 +
 389 +extern const char * const config_overwrite_mode_discard;
 390 +extern const char * const config_overwrite_mode_overwrite;
 391 +
 392 +extern const char * const config_output_type_splice;
 393 +extern const char * const config_output_type_mmap;
 394 +
 395 +extern const char * const config_loglevel_type_all;
 396 +extern const char * const config_loglevel_type_range;
 397 +extern const char * const config_loglevel_type_single;
 398 +
 399 +extern const char * const config_event_type_all;
 400 +extern const char * const config_event_type_tracepoint;
 401 +extern const char * const config_event_type_probe;
 402 +extern const char * const config_event_type_function;
 403 +extern const char * const config_event_type_function_entry;
 404 +extern const char * const config_event_type_noop;
 405 +extern const char * const config_event_type_syscall;
 406 +extern const char * const config_event_type_kprobe;
 407 +extern const char * const config_event_type_kretprobe;
 408 +
 409 +extern const char * const config_event_context_pid;
 410 +extern const char * const config_event_context_procname;
 411 +extern const char * const config_event_context_prio;
 412 +extern const char * const config_event_context_nice;
 413 +extern const char * const config_event_context_vpid;
 414 +extern const char * const config_event_context_tid;
 415 +extern const char * const config_event_context_vtid;
 416 +extern const char * const config_event_context_ppid;
 417 +extern const char * const config_event_context_vppid;
 418 +extern const char * const config_event_context_pthread_id;
 419 +extern const char * const config_event_context_hostname;
 420 +extern const char * const config_event_context_ip;
 421 +extern const char * const config_event_context_perf_thread_counter;
 422
 423  #endif /* CONFIG_SESSION_INTERNAL_H */