Ticket #7943: execution_monitor.ipp.diff
File execution_monitor.ipp.diff, 14.8 KB (added by , 10 years ago) |
---|
-
execution_monitor.ipp
331 331 case SI_USER: 332 332 report_error( execution_exception::system_error, 333 333 "signal: generated by kill() (or family); uid=%d; pid=%d", 334 (int) m_sig_info->si_uid, (int)m_sig_info->si_pid);334 (int)BOOST_TEST_SI_UID(*m_sig_info), (int)BOOST_TEST_SI_PID(*m_sig_info) ); 335 335 break; 336 336 case SI_QUEUE: 337 337 report_error( execution_exception::system_error, … … 360 360 case ILL_ILLOPC: 361 361 report_error( execution_exception::system_fatal_error, 362 362 "signal: illegal opcode; address of failing instruction: 0x%08lx", 363 m_sig_info->si_addr);363 BOOST_TEST_SI_ADDR(*m_sig_info) ); 364 364 break; 365 365 case ILL_ILLTRP: 366 366 report_error( execution_exception::system_fatal_error, 367 367 "signal: illegal trap; address of failing instruction: 0x%08lx", 368 m_sig_info->si_addr);368 BOOST_TEST_SI_ADDR(*m_sig_info) ); 369 369 break; 370 370 case ILL_PRVREG: 371 371 report_error( execution_exception::system_fatal_error, 372 372 "signal: privileged register; address of failing instruction: 0x%08lx", 373 m_sig_info->si_addr);373 BOOST_TEST_SI_ADDR(*m_sig_info) ); 374 374 break; 375 375 case ILL_BADSTK: 376 376 report_error( execution_exception::system_fatal_error, 377 377 "signal: internal stack error; address of failing instruction: 0x%08lx", 378 m_sig_info->si_addr);378 BOOST_TEST_SI_ADDR(*m_sig_info) ); 379 379 break; 380 380 #endif 381 381 case ILL_ILLOPN: 382 382 report_error( execution_exception::system_fatal_error, 383 383 "signal: illegal operand; address of failing instruction: 0x%08lx", 384 m_sig_info->si_addr);384 BOOST_TEST_SI_ADDR(*m_sig_info) ); 385 385 break; 386 386 case ILL_ILLADR: 387 387 report_error( execution_exception::system_fatal_error, 388 388 "signal: illegal addressing mode; address of failing instruction: 0x%08lx", 389 m_sig_info->si_addr);389 BOOST_TEST_SI_ADDR(*m_sig_info) ); 390 390 break; 391 391 case ILL_PRVOPC: 392 392 report_error( execution_exception::system_fatal_error, 393 393 "signal: privileged opcode; address of failing instruction: 0x%08lx", 394 m_sig_info->si_addr);394 BOOST_TEST_SI_ADDR(*m_sig_info) ); 395 395 break; 396 396 case ILL_COPROC: 397 397 report_error( execution_exception::system_fatal_error, 398 398 "signal: co-processor error; address of failing instruction: 0x%08lx", 399 m_sig_info->si_addr);399 BOOST_TEST_SI_ADDR(*m_sig_info) ); 400 400 break; 401 401 default: 402 402 report_error( execution_exception::system_fatal_error, 403 403 "signal: SIGILL, si_code: %d (illegal instruction; address of failing instruction: 0x%08lx)", 404 m_sig_info->si_addr, m_sig_info->si_code );404 BOOST_TEST_SI_ADDR(*m_sig_info), m_sig_info->si_code ); 405 405 break; 406 406 } 407 407 break; … … 411 411 case FPE_INTDIV: 412 412 report_error( execution_exception::system_error, 413 413 "signal: integer divide by zero; address of failing instruction: 0x%08lx", 414 m_sig_info->si_addr);414 BOOST_TEST_SI_ADDR(*m_sig_info) ); 415 415 break; 416 416 case FPE_INTOVF: 417 417 report_error( execution_exception::system_error, 418 418 "signal: integer overflow; address of failing instruction: 0x%08lx", 419 m_sig_info->si_addr);419 BOOST_TEST_SI_ADDR(*m_sig_info) ); 420 420 break; 421 421 case FPE_FLTDIV: 422 422 report_error( execution_exception::system_error, 423 423 "signal: floating point divide by zero; address of failing instruction: 0x%08lx", 424 m_sig_info->si_addr);424 BOOST_TEST_SI_ADDR(*m_sig_info) ); 425 425 break; 426 426 case FPE_FLTOVF: 427 427 report_error( execution_exception::system_error, 428 428 "signal: floating point overflow; address of failing instruction: 0x%08lx", 429 m_sig_info->si_addr);429 BOOST_TEST_SI_ADDR(*m_sig_info) ); 430 430 break; 431 431 case FPE_FLTUND: 432 432 report_error( execution_exception::system_error, 433 433 "signal: floating point underflow; address of failing instruction: 0x%08lx", 434 m_sig_info->si_addr);434 BOOST_TEST_SI_ADDR(*m_sig_info) ); 435 435 break; 436 436 case FPE_FLTRES: 437 437 report_error( execution_exception::system_error, 438 438 "signal: floating point inexact result; address of failing instruction: 0x%08lx", 439 m_sig_info->si_addr);439 BOOST_TEST_SI_ADDR(*m_sig_info) ); 440 440 break; 441 441 case FPE_FLTINV: 442 442 report_error( execution_exception::system_error, 443 443 "signal: invalid floating point operation; address of failing instruction: 0x%08lx", 444 m_sig_info->si_addr);444 BOOST_TEST_SI_ADDR(*m_sig_info) ); 445 445 break; 446 446 case FPE_FLTSUB: 447 447 report_error( execution_exception::system_error, 448 448 "signal: subscript out of range; address of failing instruction: 0x%08lx", 449 m_sig_info->si_addr);449 BOOST_TEST_SI_ADDR(*m_sig_info) ); 450 450 break; 451 451 default: 452 452 report_error( execution_exception::system_error, 453 453 "signal: SIGFPE, si_code: %d (errnoneous arithmetic operations; address of failing instruction: 0x%08lx)", 454 m_sig_info->si_addr, m_sig_info->si_code );454 BOOST_TEST_SI_ADDR(*m_sig_info), m_sig_info->si_code ); 455 455 break; 456 456 } 457 457 break; … … 462 462 case SEGV_MAPERR: 463 463 report_error( execution_exception::system_fatal_error, 464 464 "memory access violation at address: 0x%08lx: no mapping at fault address", 465 m_sig_info->si_addr);465 BOOST_TEST_SI_ADDR(*m_sig_info) ); 466 466 break; 467 467 case SEGV_ACCERR: 468 468 report_error( execution_exception::system_fatal_error, 469 469 "memory access violation at address: 0x%08lx: invalid permissions", 470 m_sig_info->si_addr);470 BOOST_TEST_SI_ADDR(*m_sig_info) ); 471 471 break; 472 472 #endif 473 473 default: 474 474 report_error( execution_exception::system_fatal_error, 475 475 "signal: SIGSEGV, si_code: %d (memory access violation at address: 0x%08lx)", 476 m_sig_info->si_addr, m_sig_info->si_code );476 BOOST_TEST_SI_ADDR(*m_sig_info), m_sig_info->si_code ); 477 477 break; 478 478 } 479 479 break; … … 484 484 case BUS_ADRALN: 485 485 report_error( execution_exception::system_fatal_error, 486 486 "memory access violation at address: 0x%08lx: invalid address alignment", 487 m_sig_info->si_addr);487 BOOST_TEST_SI_ADDR(*m_sig_info) ); 488 488 break; 489 489 case BUS_ADRERR: 490 490 report_error( execution_exception::system_fatal_error, 491 491 "memory access violation at address: 0x%08lx: non-existent physical address", 492 m_sig_info->si_addr);492 BOOST_TEST_SI_ADDR(*m_sig_info) ); 493 493 break; 494 494 case BUS_OBJERR: 495 495 report_error( execution_exception::system_fatal_error, 496 496 "memory access violation at address: 0x%08lx: object specific hardware error", 497 m_sig_info->si_addr);497 BOOST_TEST_SI_ADDR(*m_sig_info) ); 498 498 break; 499 499 #endif 500 500 default: 501 501 report_error( execution_exception::system_fatal_error, 502 502 "signal: SIGSEGV, si_code: %d (memory access violation at address: 0x%08lx)", 503 m_sig_info->si_addr, m_sig_info->si_code );503 BOOST_TEST_SI_ADDR(*m_sig_info), m_sig_info->si_code ); 504 504 break; 505 505 } 506 506 break; … … 511 511 case CLD_EXITED: 512 512 report_error( execution_exception::system_error, 513 513 "child has exited; pid: %d; uid: %d; exit value: %d", 514 (int) m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status);514 (int)BOOST_TEST_SI_PID(*m_sig_info), (int)BOOST_TEST_SI_UID(*m_sig_info), (int)BOOST_TEST_SI_STATUS(*m_sig_info) ); 515 515 break; 516 516 case CLD_KILLED: 517 517 report_error( execution_exception::system_error, 518 518 "child was killed; pid: %d; uid: %d; exit value: %d", 519 (int) m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status);519 (int)BOOST_TEST_SI_PID(*m_sig_info), (int)BOOST_TEST_SI_UID(*m_sig_info), (int)BOOST_TEST_SI_STATUS(*m_sig_info) ); 520 520 break; 521 521 case CLD_DUMPED: 522 522 report_error( execution_exception::system_error, 523 523 "child terminated abnormally; pid: %d; uid: %d; exit value: %d", 524 (int) m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status);524 (int)BOOST_TEST_SI_PID(*m_sig_info), (int)BOOST_TEST_SI_UID(*m_sig_info), (int)BOOST_TEST_SI_STATUS(*m_sig_info) ); 525 525 break; 526 526 case CLD_TRAPPED: 527 527 report_error( execution_exception::system_error, 528 528 "traced child has trapped; pid: %d; uid: %d; exit value: %d", 529 (int) m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status);529 (int)BOOST_TEST_SI_PID(*m_sig_info), (int)BOOST_TEST_SI_UID(*m_sig_info), (int)BOOST_TEST_SI_STATUS(*m_sig_info) ); 530 530 break; 531 531 case CLD_STOPPED: 532 532 report_error( execution_exception::system_error, 533 533 "child has stopped; pid: %d; uid: %d; exit value: %d", 534 (int) m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status);534 (int)BOOST_TEST_SI_PID(*m_sig_info), (int)BOOST_TEST_SI_UID(*m_sig_info), (int)BOOST_TEST_SI_STATUS(*m_sig_info) ); 535 535 break; 536 536 case CLD_CONTINUED: 537 537 report_error( execution_exception::system_error, 538 538 "stopped child had continued; pid: %d; uid: %d; exit value: %d", 539 (int) m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status);539 (int)BOOST_TEST_SI_PID(*m_sig_info), (int)BOOST_TEST_SI_UID(*m_sig_info), (int)BOOST_TEST_SI_STATUS(*m_sig_info) ); 540 540 break; 541 541 #endif 542 542 default: 543 543 report_error( execution_exception::system_error, 544 544 "signal: SIGCHLD, si_code: %d (child process has terminated; pid: %d; uid: %d; exit value: %d)", 545 (int) m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status, m_sig_info->si_code );545 (int)BOOST_TEST_SI_PID(*m_sig_info), (int)BOOST_TEST_SI_UID(*m_sig_info), (int)BOOST_TEST_SI_STATUS(*m_sig_info), m_sig_info->si_code ); 546 546 break; 547 547 } 548 548 break; … … 555 555 case POLL_IN: 556 556 report_error( execution_exception::system_error, 557 557 "data input available; band event %d", 558 (int) m_sig_info->si_band);558 (int)BOOST_TEST_SI_BAND(*m_sig_info) ); 559 559 break; 560 560 case POLL_OUT: 561 561 report_error( execution_exception::system_error, 562 562 "output buffers available; band event %d", 563 (int) m_sig_info->si_band);563 (int)BOOST_TEST_SI_BAND(*m_sig_info) ); 564 564 break; 565 565 case POLL_MSG: 566 566 report_error( execution_exception::system_error, 567 567 "input message available; band event %d", 568 (int) m_sig_info->si_band);568 (int)BOOST_TEST_SI_BAND(*m_sig_info) ); 569 569 break; 570 570 case POLL_ERR: 571 571 report_error( execution_exception::system_error, 572 572 "i/o error; band event %d", 573 (int) m_sig_info->si_band);573 (int)BOOST_TEST_SI_BAND(*m_sig_info) ); 574 574 break; 575 575 case POLL_PRI: 576 576 report_error( execution_exception::system_error, 577 577 "high priority input available; band event %d", 578 (int) m_sig_info->si_band);578 (int)BOOST_TEST_SI_BAND(*m_sig_info) ); 579 579 break; 580 580 #if defined(POLL_ERR) && defined(POLL_HUP) && (POLL_ERR - POLL_HUP) 581 581 case POLL_HUP: 582 582 report_error( execution_exception::system_error, 583 583 "device disconnected; band event %d", 584 (int) m_sig_info->si_band);584 (int)BOOST_TEST_SI_BAND(*m_sig_info) ); 585 585 break; 586 586 #endif 587 587 #endif 588 588 default: 589 589 report_error( execution_exception::system_error, 590 590 "signal: SIGPOLL, si_code: %d (asynchronous I/O event occured; band event %d)", 591 (int) m_sig_info->si_band, m_sig_info->si_code );591 (int)BOOST_TEST_SI_BAND(*m_sig_info), m_sig_info->si_code ); 592 592 break; 593 593 } 594 594 break; … … 822 822 #ifdef BOOST_TEST_IGNORE_NON_ZERO_CHILD_CODE 823 823 ; 824 824 #else 825 && (int) info->si_status== 0;825 && (int)BOOST_TEST_SI_STATUS(*info) == 0; 826 826 #endif 827 827 } 828 828