Deleted Added
sdiff udiff text old ( 126372 ) new ( 127175 )
full compact
dsmethod.c (126372) dsmethod.c (127175)
1/******************************************************************************
2 *
3 * Module Name: dsmethod - Parser/Interpreter interface - control method parsing
1/******************************************************************************
2 *
3 * Module Name: dsmethod - Parser/Interpreter interface - control method parsing
4 * $Revision: 93 $
4 * $Revision: 94 $
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.

--- 164 unchanged lines hidden (view full) ---

177 ObjDesc = AcpiNsGetAttachedObject (Node);
178 if (!ObjDesc)
179 {
180 return_ACPI_STATUS (AE_NULL_OBJECT);
181 }
182
183 /* Create a mutex for the method if there is a concurrency limit */
184
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.

--- 164 unchanged lines hidden (view full) ---

177 ObjDesc = AcpiNsGetAttachedObject (Node);
178 if (!ObjDesc)
179 {
180 return_ACPI_STATUS (AE_NULL_OBJECT);
181 }
182
183 /* Create a mutex for the method if there is a concurrency limit */
184
185 if ((ObjDesc->Method.Concurrency != INFINITE_CONCURRENCY) &&
185 if ((ObjDesc->Method.Concurrency != ACPI_INFINITE_CONCURRENCY) &&
186 (!ObjDesc->Method.Semaphore))
187 {
188 Status = AcpiOsCreateSemaphore (ObjDesc->Method.Concurrency,
189 ObjDesc->Method.Concurrency,
190 &ObjDesc->Method.Semaphore);
191 if (ACPI_FAILURE (Status))
192 {
193 return_ACPI_STATUS (Status);

--- 190 unchanged lines hidden (view full) ---

384
385 Status = AcpiDsBeginMethodExecution (MethodNode, ObjDesc,
386 ThisWalkState->MethodNode);
387 if (ACPI_FAILURE (Status))
388 {
389 return_ACPI_STATUS (Status);
390 }
391
186 (!ObjDesc->Method.Semaphore))
187 {
188 Status = AcpiOsCreateSemaphore (ObjDesc->Method.Concurrency,
189 ObjDesc->Method.Concurrency,
190 &ObjDesc->Method.Semaphore);
191 if (ACPI_FAILURE (Status))
192 {
193 return_ACPI_STATUS (Status);

--- 190 unchanged lines hidden (view full) ---

384
385 Status = AcpiDsBeginMethodExecution (MethodNode, ObjDesc,
386 ThisWalkState->MethodNode);
387 if (ACPI_FAILURE (Status))
388 {
389 return_ACPI_STATUS (Status);
390 }
391
392 /* 1) Parse: Create a new walk state for the preempting walk */
393
394 NextWalkState = AcpiDsCreateWalkState (ObjDesc->Method.OwningId,
395 Op, ObjDesc, NULL);
396 if (!NextWalkState)
392 if (!(ObjDesc->Method.MethodFlags & AML_METHOD_INTERNAL_ONLY))
397 {
393 {
398 return_ACPI_STATUS (AE_NO_MEMORY);
399 }
394 /* 1) Parse: Create a new walk state for the preempting walk */
400
395
401 /* Create and init a Root Node */
396 NextWalkState = AcpiDsCreateWalkState (ObjDesc->Method.OwningId,
397 Op, ObjDesc, NULL);
398 if (!NextWalkState)
399 {
400 return_ACPI_STATUS (AE_NO_MEMORY);
401 }
402
402
403 Op = AcpiPsCreateScopeOp ();
404 if (!Op)
405 {
406 Status = AE_NO_MEMORY;
407 goto Cleanup;
408 }
409
403
410 Status = AcpiDsInitAmlWalk (NextWalkState, Op, MethodNode,
411 ObjDesc->Method.AmlStart, ObjDesc->Method.AmlLength,
412 NULL, NULL, 1);
413 if (ACPI_FAILURE (Status))
414 {
415 AcpiDsDeleteWalkState (NextWalkState);
416 goto Cleanup;
417 }
404 /* Create and init a Root Node */
418
405
419 /* Begin AML parse */
406 Op = AcpiPsCreateScopeOp ();
407 if (!Op)
408 {
409 Status = AE_NO_MEMORY;
410 goto Cleanup;
411 }
420
412
421 Status = AcpiPsParseAml (NextWalkState);
422 AcpiPsDeleteParseTree (Op);
413 Status = AcpiDsInitAmlWalk (NextWalkState, Op, MethodNode,
414 ObjDesc->Method.AmlStart, ObjDesc->Method.AmlLength,
415 NULL, NULL, 1);
416 if (ACPI_FAILURE (Status))
417 {
418 AcpiDsDeleteWalkState (NextWalkState);
419 goto Cleanup;
420 }
423
421
422 /* Begin AML parse */
423
424 Status = AcpiPsParseAml (NextWalkState);
425 AcpiPsDeleteParseTree (Op);
426 }
427
424 /* 2) Execute: Create a new state for the preempting walk */
425
426 NextWalkState = AcpiDsCreateWalkState (ObjDesc->Method.OwningId,
427 NULL, ObjDesc, Thread);
428 if (!NextWalkState)
429 {
430 Status = AE_NO_MEMORY;
431 goto Cleanup;
432 }
428 /* 2) Execute: Create a new state for the preempting walk */
429
430 NextWalkState = AcpiDsCreateWalkState (ObjDesc->Method.OwningId,
431 NULL, ObjDesc, Thread);
432 if (!NextWalkState)
433 {
434 Status = AE_NO_MEMORY;
435 goto Cleanup;
436 }
433
434 /*
435 * The resolved arguments were put on the previous walk state's operand
436 * stack. Operands on the previous walk state stack always
437 * start at index 0.
438 * Null terminate the list of arguments
439 */
440 ThisWalkState->Operands [ThisWalkState->NumOperands] = NULL;
441

--- 17 unchanged lines hidden (view full) ---

459
460 /* Clear the operand stack */
461
462 ThisWalkState->NumOperands = 0;
463
464 ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
465 "Starting nested execution, newstate=%p\n", NextWalkState));
466
437 /*
438 * The resolved arguments were put on the previous walk state's operand
439 * stack. Operands on the previous walk state stack always
440 * start at index 0.
441 * Null terminate the list of arguments
442 */
443 ThisWalkState->Operands [ThisWalkState->NumOperands] = NULL;
444

--- 17 unchanged lines hidden (view full) ---

462
463 /* Clear the operand stack */
464
465 ThisWalkState->NumOperands = 0;
466
467 ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
468 "Starting nested execution, newstate=%p\n", NextWalkState));
469
470 if (ObjDesc->Method.MethodFlags & AML_METHOD_INTERNAL_ONLY)
471 {
472 Status = ObjDesc->Method.Implementation (NextWalkState);
473 return_ACPI_STATUS (Status);
474 }
475
467 return_ACPI_STATUS (AE_OK);
468
469
470 /* On error, we must delete the new walk state */
471
472Cleanup:
476 return_ACPI_STATUS (AE_OK);
477
478
479 /* On error, we must delete the new walk state */
480
481Cleanup:
482 if (NextWalkState->MethodDesc)
483 {
484 /* Decrement the thread count on the method parse tree */
485
486 NextWalkState->MethodDesc->Method.ThreadCount--;
487 }
473 (void) AcpiDsTerminateControlMethod (NextWalkState);
474 AcpiDsDeleteWalkState (NextWalkState);
475 return_ACPI_STATUS (Status);
488 (void) AcpiDsTerminateControlMethod (NextWalkState);
489 AcpiDsDeleteWalkState (NextWalkState);
490 return_ACPI_STATUS (Status);
476
477}
478
479
480/*******************************************************************************
481 *
482 * FUNCTION: AcpiDsRestartControlMethod
483 *
484 * PARAMETERS: WalkState - State of the method when it was preempted

--- 114 unchanged lines hidden (view full) ---

599 {
600 ACPI_REPORT_ERROR (("Could not signal method semaphore\n"));
601 Status = AE_OK;
602
603 /* Ignore error and continue cleanup */
604 }
605 }
606
491}
492
493
494/*******************************************************************************
495 *
496 * FUNCTION: AcpiDsRestartControlMethod
497 *
498 * PARAMETERS: WalkState - State of the method when it was preempted

--- 114 unchanged lines hidden (view full) ---

613 {
614 ACPI_REPORT_ERROR (("Could not signal method semaphore\n"));
615 Status = AE_OK;
616
617 /* Ignore error and continue cleanup */
618 }
619 }
620
607 /* Decrement the thread count on the method parse tree */
621 if (WalkState->MethodDesc->Method.ThreadCount)
622 {
623 ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
624 "*** Not deleting method namespace, there are still %d threads\n",
625 WalkState->MethodDesc->Method.ThreadCount));
626 }
608
627
609 WalkState->MethodDesc->Method.ThreadCount--;
610 if (!WalkState->MethodDesc->Method.ThreadCount)
611 {
612 /*
628 if (!WalkState->MethodDesc->Method.ThreadCount)
629 {
630 /*
631 * Support to dynamically change a method from NotSerialized to
632 * Serialized if it appears that the method is written foolishly and
633 * does not support multiple thread execution. The best example of this
634 * is if such a method creates namespace objects and blocks. A second
635 * thread will fail with an AE_ALREADY_EXISTS exception
636 *
637 * This code is here because we must wait until the last thread exits
638 * before creating the synchronization semaphore.
639 */
640 if ((WalkState->MethodDesc->Method.Concurrency == 1) &&
641 (!WalkState->MethodDesc->Method.Semaphore))
642 {
643 Status = AcpiOsCreateSemaphore (1,
644 1,
645 &WalkState->MethodDesc->Method.Semaphore);
646 }
647
648 /*
613 * There are no more threads executing this method. Perform
614 * additional cleanup.
615 *
616 * The method Node is stored in the walk state
617 */
618 MethodNode = WalkState->MethodNode;
619
620 /*

--- 31 unchanged lines hidden --- 		649 * There are no more threads executing this method. Perform
650 * additional cleanup.
651 *
652 * The method Node is stored in the walk state
653 */
654 MethodNode = WalkState->MethodNode;
655
656 /*

--- 31 unchanged lines hidden ---