1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140
|
cp -rf py3.7/examples .
cp -rf py3.7/doc .
cp -f py3.7/index.html .
cp -rf py3.7/Modules/_multiprocess/* Modules/_multiprocess
cp -f Python-3.8.0b1/Modules/multiprocessing/posixshmem.c Modules/_multiprocess
cp -rf Python-3.8.0b1/Modules/multiprocessing/clinic Modules/_multiprocess
cp -f Python-3.8.0b1/Lib/multiprocessing/* multiprocess
cp -rf py3.7/multiprocess/dummy multiprocess
cp -f Python-3.8.0b1/Lib/test/*test_multiprocessing*.py multiprocess/tests
cp Python-3.8.8/Lib/test/mp_*py multiprocess/tests
cp Python-3.8.8/Lib/test/_test_multiprocessing.py multiprocess/tests/__init__.py
# ----------------------------------------------------------------------
diff Python-3.7.3/Modules/_multiprocessing/semaphore.c Python-3.8.0b1/Modules/_multiprocessing/semaphore.c
144c144
< "value %d", res);
---
> "value %u", res);
524c524
< semlock_count(SemLockObject *self)
---
> semlock_count(SemLockObject *self, PyObject *Py_UNUSED(ignored))
530c530
< semlock_ismine(SemLockObject *self)
---
> semlock_ismine(SemLockObject *self, PyObject *Py_UNUSED(ignored))
537c537
< semlock_getvalue(SemLockObject *self)
---
> semlock_getvalue(SemLockObject *self, PyObject *Py_UNUSED(ignored))
555c555
< semlock_iszero(SemLockObject *self)
---
> semlock_iszero(SemLockObject *self, PyObject *Py_UNUSED(ignored))
576c576
< semlock_afterfork(SemLockObject *self)
---
> semlock_afterfork(SemLockObject *self, PyObject *Py_UNUSED(ignored))
587c587
< {"acquire", (PyCFunction)semlock_acquire, METH_VARARGS | METH_KEYWORDS,
---
> {"acquire", (PyCFunction)(void(*)(void))semlock_acquire, METH_VARARGS | METH_KEYWORDS,
591c591
< {"__enter__", (PyCFunction)semlock_acquire, METH_VARARGS | METH_KEYWORDS,
---
> {"__enter__", (PyCFunction)(void(*)(void))semlock_acquire, METH_VARARGS | METH_KEYWORDS,
636c636
< /* tp_print */ 0,
---
> /* tp_vectorcall_offset */ 0,
639c639
< /* tp_reserved */ 0,
---
> /* tp_as_async */ 0,
diff Python-3.7.3/Lib/multiprocessing/dummy/__init__.py Python-3.8.0b1/Lib/multiprocessing/dummy/__init__.py
83c83
< def __init__(self, **kwds):
---
> def __init__(self, /, **kwds):
diff Python-3.8.0b1/Lib/multiprocessing/__init__.py py3.8/multiprocess/__init__.py
17a18,19
> __version__ = '0.70.8.dev0'
>
diff Python-3.8.0b1/Lib/multiprocessing/connection.py py3.8/multiprocess/connection.py
21c21,24
< import _multiprocessing
---
> try:
> import _multiprocess as _multiprocessing
> except ImportError:
> import _multiprocessing
60c63
< return time.monotonic() + timeout
---
> return getattr(time,'monotonic',time.time)() + timeout
63c66
< return time.monotonic() > t
---
> return getattr(time,'monotonic',time.time)() > t
927c930
< deadline = time.monotonic() + timeout
---
> deadline = getattr(time,'monotonic',time.time)() + timeout
935c938
< timeout = deadline - time.monotonic()
---
> timeout = deadline - getattr(time,'monotonic',time.time)()
Common subdirectories: Python-3.8.0b1/Lib/multiprocessing/dummy and py3.8/multiprocess/dummy
diff Python-3.8.0b1/Lib/multiprocessing/forkserver.py py3.8/multiprocess/forkserver.py
106c106
< cmd = ('from multiprocessing.forkserver import main; ' +
---
> cmd = ('from multiprocess.forkserver import main; ' +
diff Python-3.8.0b1/Lib/multiprocessing/managers.py py3.8/multiprocess/managers.py
500c500
< listener_client = {
---
> listener_client = { #XXX: register dill?
1087c1087
< endtime = time.monotonic() + timeout
---
> endtime = getattr(time,'monotonic',time.time)() + timeout
1093c1093
< waittime = endtime - time.monotonic()
---
> waittime = endtime - getattr(time,'monotonic',time.time)()
1177c1177
< '__setitem__', 'clear', 'copy', 'get', 'items',
---
> '__setitem__', 'clear', 'copy', 'get', 'has_key', 'items',
1218c1218
< The `multiprocessing.Manager()` function creates started instances of
---
> The `multiprocess.Manager()` function creates started instances of
diff Python-3.8.0b1/Lib/multiprocessing/popen_fork.py py3.8/multiprocess/popen_fork.py
43c43
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
diff Python-3.8.0b1/Lib/multiprocessing/popen_forkserver.py py3.8/multiprocess/popen_forkserver.py
63c63
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
diff Python-3.8.0b1/Lib/multiprocessing/queues.py py3.8/multiprocess/queues.py
22c22,25
< import _multiprocessing
---
> try:
> import _multiprocess as _multiprocessing
> except ImportError:
> import _multiprocessing
101c104
< deadline = time.monotonic() + timeout
---
> deadline = getattr(time,'monotonic',time.time)() + timeout
106c109
< timeout = deadline - time.monotonic()
---
> timeout = deadline - getattr(time,'monotonic',time.time)()
diff Python-3.8.0b1/Lib/multiprocessing/reduction.py py3.8/multiprocess/reduction.py
15c15,18
< import pickle
---
> try:
> import dill as pickle
> except ImportError:
> import pickle
34c37
< '''Pickler subclass used by multiprocessing.'''
---
> '''Pickler subclass used by multiprocess.'''
254c257
< used in multiprocessing.'''
---
> used in multiprocess.'''
diff Python-3.8.0b1/Lib/multiprocessing/resource_tracker.py py3.8/multiprocess/resource_tracker.py
37c37,40
< import _multiprocessing
---
> try:
> import _multiprocess as _multiprocessing
> except ImportError:
> import _multiprocessing
91c94
< cmd = 'from multiprocessing.resource_tracker import main;main(%d)'
---
> cmd = 'from multiprocess.resource_tracker import main;main(%d)'
diff Python-3.8.0b1/Lib/multiprocessing/spawn.py py3.8/multiprocess/spawn.py
86c86
< prog = 'from multiprocessing.spawn import spawn_main; spawn_main(%s)'
---
> prog = 'from multiprocess.spawn import spawn_main; spawn_main(%s)'
diff Python-3.8.0b1/Lib/multiprocessing/synchronize.py py3.8/multiprocess/synchronize.py
17c17,20
< import _multiprocessing
---
> try:
> import _multiprocess as _multiprocessing
> except ImportError:
> import _multiprocessing
28,33c31,39
< from _multiprocessing import SemLock, sem_unlink
< except (ImportError):
< raise ImportError("This platform lacks a functioning sem_open" +
< " implementation, therefore, the required" +
< " synchronization primitives needed will not" +
< " function, see issue 3770.")
---
> from _multiprocess import SemLock, sem_unlink
> except ImportError:
> try:
> from _multiprocessing import SemLock, sem_unlink
> except (ImportError):
> raise ImportError("This platform lacks a functioning sem_open" +
> " implementation, therefore, the required" +
> " synchronization primitives needed will not" +
> " function, see issue 3770.")
304c310
< endtime = time.monotonic() + timeout
---
> endtime = getattr(time,'monotonic',time.time)() + timeout
310c316
< waittime = endtime - time.monotonic()
---
> waittime = endtime - getattr(time,'monotonic',time.time)()
Only in py3.8/multiprocess: tests
diff Python-3.8.0b1/Lib/multiprocessing/util.py py3.8/multiprocess/util.py
38c38
< LOGGER_NAME = 'multiprocessing'
---
> LOGGER_NAME = 'multiprocess'
62c62
< Returns logger used by multiprocessing
---
> Returns logger used by multiprocess
diff Python-3.8.0b1/Lib/test/_test_multiprocessing.py ~/dev/svn/pathos/multiprocess/py3.8/multiprocess/tests/__init__.py
23c23
< import pickle
---
> import pickle #XXX: use dill?
32c32
< _multiprocessing = test.support.import_module('_multiprocessing')
---
> _multiprocessing = test.support.import_module('_multiprocess')
34c34
< test.support.import_module('multiprocessing.synchronize')
---
> test.support.import_module('multiprocess.synchronize')
37,42c37,43
< import multiprocessing.connection
< import multiprocessing.dummy
< import multiprocessing.heap
< import multiprocessing.managers
< import multiprocessing.pool
< import multiprocessing.queues
---
> import multiprocess as multiprocessing
> import multiprocess.connection
> import multiprocess.dummy
> import multiprocess.heap
> import multiprocess.managers
> import multiprocess.pool
> import multiprocess.queues
44c45
< from multiprocessing import util
---
> from multiprocess import util
47c48
< from multiprocessing import reduction
---
> from multiprocess import reduction
53c54
< from multiprocessing.sharedctypes import Value, copy
---
> from multiprocess.sharedctypes import Value, copy
59c60
< from multiprocessing import shared_memory
---
> from multiprocess import shared_memory
93c94
< from multiprocessing import resource_tracker
---
> from multiprocess import resource_tracker
121c122
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
134c135
< PRELOAD = ['__main__', 'test.test_multiprocessing_forkserver']
---
> PRELOAD = ['__main__', 'test_multiprocessing_forkserver']
173c174
< t = time.monotonic()
---
> t = getattr(time,'monotonic',time.time)()
177c178
< self.elapsed = time.monotonic() - t
---
> self.elapsed = getattr(time,'monotonic',time.time)() - t
289c290
< from multiprocessing.process import parent_process
---
> from multiprocess.process import parent_process
325c326
< from multiprocessing.process import parent_process
---
> from multiprocess.process import parent_process
470a472
> @unittest.skipIf(True, "fails with is_dill(obj, child=True)")
722c724
< from multiprocessing.forkserver import _forkserver
---
> from multiprocess.forkserver import _forkserver
811c813
< self.assertIn("test_multiprocessing.py", err)
---
> self.assertIn("__init__.py", err)
1092c1094
< import multiprocessing
---
> import multiprocess as multiprocessing
1110c1112
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
1112c1114
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
1516c1518
< dt = time.monotonic()
---
> dt = getattr(time,'monotonic',time.time)()
1518c1520
< dt = time.monotonic() - dt
---
> dt = getattr(time,'monotonic',time.time)() - dt
1987c1989
< self.skipTest("requires multiprocessing.sharedctypes")
---
> self.skipTest("requires multiprocess.sharedctypes")
2553a2556
> @unittest.skipIf(True, "fails with is_dill(obj, child=True)")
2595a2599
> @unittest.skipIf(True, "fails with is_dill(obj, child=True)")
2609c2613
< t_start = time.monotonic()
---
> t_start = getattr(time,'monotonic',time.time)()
2621c2625
< self.assertGreater(time.monotonic() - t_start, 0.9)
---
> self.assertGreater(getattr(time,'monotonic',time.time)() - t_start, 0.9)
2693,2694c2697,2698
< def test_unpickleable_result(self):
< from multiprocessing.pool import MaybeEncodingError
---
> def _test_unpickleable_result(self):
> from multiprocess.pool import MaybeEncodingError
2764c2768
< from multiprocessing.managers import BaseManager, BaseProxy, RemoteError
---
> from multiprocess.managers import BaseManager, BaseProxy, RemoteError
3390c3394
< from multiprocessing import resource_sharer
---
> from multiprocess import resource_sharer
3832c3836
< from multiprocessing.managers import SharedMemoryManager
---
> from multiprocess.managers import SharedMemoryManager
3989c3993
< from multiprocessing import shared_memory
---
> from multiprocess import shared_memory
4007c4011
< deadline = time.monotonic() + 60
---
> deadline = getattr(time,'monotonic',time.time)() + 60
4009c4013
< while time.monotonic() < deadline:
---
> while getattr(time,'monotonic',time.time)() < deadline:
4161,4163c4165,4167
< modules = ['multiprocessing.' + m for m in modules]
< modules.remove('multiprocessing.__init__')
< modules.append('multiprocessing')
---
> modules = ['multiprocess.' + m for m in modules]
> modules.remove('multiprocess.__init__')
> modules.append('multiprocess')
4169,4171c4173,4175
< modules.remove('multiprocessing.popen_fork')
< modules.remove('multiprocessing.popen_forkserver')
< modules.remove('multiprocessing.popen_spawn_posix')
---
> modules.remove('multiprocess.popen_fork')
> modules.remove('multiprocess.popen_forkserver')
> modules.remove('multiprocess.popen_spawn_posix')
4173c4177
< modules.remove('multiprocessing.popen_spawn_win32')
---
> modules.remove('multiprocess.popen_spawn_win32')
4175c4179
< modules.remove('multiprocessing.popen_forkserver')
---
> modules.remove('multiprocess.popen_forkserver')
4179c4183
< modules.remove('multiprocessing.sharedctypes')
---
> modules.remove('multiprocess.sharedctypes')
4459c4463
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4499c4503
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4540c4544
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4545c4549
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4547c4551
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4555c4559
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4557c4561
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4568c4572
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4581c4585
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4583c4587
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4591c4595
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4593c4597
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4600c4604
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4602c4606
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4611c4615
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4613c4617
< t = time.monotonic()
---
> t = getattr(time,'monotonic',time.time)()
4615c4619
< t = time.monotonic() - t
---
> t = getattr(time,'monotonic',time.time)() - t
4662c4666
< prog = ('from test._test_multiprocessing import TestFlags; ' +
---
> prog = ('from __init__ import TestFlags; ' +
4708c4712
< def test_noforkbomb(self):
---
> def _test_noforkbomb(self):
4837c4841
< def test_ignore(self):
---
> def _test_ignore(self):
4945c4949
< def test_preload_resources(self):
---
> def _test_preload_resources(self):
4962c4966
< def test_resource_tracker(self):
---
> def _test_resource_tracker(self):
4968,4970c4972,4974
< import multiprocessing as mp
< from multiprocessing import resource_tracker
< from multiprocessing.shared_memory import SharedMemory
---
> import multiprocess as mp
> from multiprocess import resource_tracker
> from multiprocess.shared_memory import SharedMemory
5030c5034
< from multiprocessing.resource_tracker import _resource_tracker
---
> from multiprocess.resource_tracker import _resource_tracker
5078c5082
< from multiprocessing.resource_tracker import _resource_tracker
---
> from multiprocess.resource_tracker import _resource_tracker
5087c5091
< from multiprocessing.resource_tracker import _resource_tracker
---
> from multiprocess.resource_tracker import _resource_tracker
5231c5235
< start_time = time.monotonic()
---
> start_time = getattr(time,'monotonic',time.time)()
5236c5240
< dt = time.monotonic() - start_time
---
> dt = getattr(time,'monotonic',time.time)() - start_time
5239c5243
< print("Warning -- multiprocessing.Manager still has %s active "
---
> print("Warning -- multiprocess.Manager still has %s active "
5510c5514
< start_time = time.monotonic()
---
> start_time = getattr(time,'monotonic',time.time)()
5515c5519
< dt = time.monotonic() - start_time
---
> dt = getattr(time,'monotonic',time.time)() - start_time
5518c5522
< print("Warning -- multiprocessing.Manager still has %s active "
---
> print("Warning -- multiprocess.Manager still has %s active "
diff Python-3.8.0b1/Lib/multiprocessing/popen_spawn_win32.py Python-3.8.0b2/Lib/multiprocessing/popen_spawn_win32.py
25,26c25
< WINENV = (hasattr(sys, '_base_executable') and
< not _path_eq(sys.executable, sys._base_executable))
---
> WINENV = not _path_eq(sys.executable, sys._base_executable)
diff Python-3.8.0b1/Modules/_multiprocessing/clinic/posixshmem.c.h Python-3.8.0b4/Modules/_multiprocessing/clinic/posixshmem.c.h
38c38
< _PyArg_BadArgument("shm_open", 1, "str", args[0]);
---
> _PyArg_BadArgument("shm_open", "argument 'path'", "str", args[0]);
111c111
< _PyArg_BadArgument("shm_unlink", 1, "str", args[0]);
---
> _PyArg_BadArgument("shm_unlink", "argument 'path'", "str", args[0]);
133c133
< /*[clinic end generated code: output=be42e23c18677c0f input=a9049054013a1b77]*/
---
> /*[clinic end generated code: output=9132861c61d8c2d8 input=a9049054013a1b77]*/
diff Python-3.8.0b1/Lib/multiprocessing/forkserver.py Python-3.8.0b4/Lib/multiprocessing/forkserver.py
41a42,60
> def _stop(self):
> # Method used by unit tests to stop the server
> with self._lock:
> self._stop_unlocked()
>
> def _stop_unlocked(self):
> if self._forkserver_pid is None:
> return
>
> # close the "alive" file descriptor asks the server to stop
> os.close(self._forkserver_alive_fd)
> self._forkserver_alive_fd = None
>
> os.waitpid(self._forkserver_pid, 0)
> self._forkserver_pid = None
>
> os.unlink(self._forkserver_address)
> self._forkserver_address = None
>
diff Python-3.8.0b1/Lib/multiprocessing/util.py Python-3.8.0b4/Lib/multiprocessing/util.py
108a109,117
> def _remove_temp_dir(rmtree, tempdir):
> rmtree(tempdir)
>
> current_process = process.current_process()
> # current_process() can be None if the finalizer is called
> # late during Python finalization
> if current_process is not None:
> current_process._config['tempdir'] = None
>
116c125,128
< Finalize(None, shutil.rmtree, args=[tempdir], exitpriority=-100)
---
> # keep a strong reference to shutil.rmtree(), since the finalizer
> # can be called late during Python shutdown
> Finalize(None, _remove_temp_dir, args=(shutil.rmtree, tempdir),
> exitpriority=-100)
# ----------------------------------------------------------------------
ADDED *args, **kwds for ForkingPickler in __init__, dump, and dumps
# ----------------------------------------------------------------------
diff Python-3.8.0b4/Lib/multiprocessing/context.py py3.8/multiprocessing/context.py
312c312
< _default_context = DefaultContext(_concrete_contexts['spawn'])
---
> _default_context = DefaultContext(_concrete_contexts['fork']) #FIXME: spawn
# ----------------------------------------------------------------------
diff Python-3.8.0b4/Lib/multiprocessing/popen_spawn_win32.py Python-3.8.1/Lib/multiprocessing/popen_spawn_win32.py
75c75
< env, None, False, 0, None, None, None)
---
> None, None, False, 0, env, None, None)
diff Python-3.8.0b4/Lib/multiprocessing/process.py Python-3.8.1/Lib/multiprocessing/process.py
303a304,305
> if threading._HAVE_THREAD_NATIVE_ID:
> threading.main_thread()._set_native_id()
diff Python-3.8.0b4/Lib/multiprocessing/resource_tracker.py Python-3.8.1/Lib/multiprocessing/resource_tracker.py
52a53,65
> def _stop(self):
> with self._lock:
> if self._fd is None:
> # not running
> return
>
> # closing the "alive" file descriptor stops main()
> os.close(self._fd)
> self._fd = None
>
> os.waitpid(self._pid, 0)
> self._pid = None
>
diff Python-3.8.0b4/Lib/multiprocessing/spawn.py Python-3.8.1/Lib/multiprocessing/spawn.py
39c39
< _python_exe = sys.executable
---
> _python_exe = sys._base_executable
diff Python-3.8.0b4/Lib/multiprocessing/util.py Python-3.8.1/Lib/multiprocessing/util.py
241c241
< x += ', exitprority=' + str(self._key[0])
---
> x += ', exitpriority=' + str(self._key[0])
441a442,466
>
>
> def _cleanup_tests():
> """Cleanup multiprocessing resources when multiprocessing tests
> completed."""
>
> from test import support
>
> # cleanup multiprocessing
> process._cleanup()
>
> # Stop the ForkServer process if it's running
> from multiprocessing import forkserver
> forkserver._forkserver._stop()
>
> # Stop the ResourceTracker process if it's running
> from multiprocessing import resource_tracker
> resource_tracker._resource_tracker._stop()
>
> # bpo-37421: Explicitly call _run_finalizers() to remove immediately
> # temporary directories created by multiprocessing.util.get_temp_dir().
> _run_finalizers()
> support.gc_collect()
>
> support.reap_children()
# ----------------------------------------------------------------------
diff Python-3.8.1/Lib/multiprocessing/connection.py Python-3.8.3/Lib/multiprocessing/connection.py
105c105
< elif type(address) is str:
---
> elif type(address) is str or util.is_abstract_socket_namespace(address):
600c600,601
< if family == 'AF_UNIX':
---
> if family == 'AF_UNIX' and not util.is_abstract_socket_namespace(address):
> # Linux abstract socket namespaces do not need to be explicitly unlinked
diff Python-3.8.1/Lib/multiprocessing/forkserver.py Python-3.8.3/Lib/multiprocessing/forkserver.py
58c58,59
< os.unlink(self._forkserver_address)
---
> if not util.is_abstract_socket_namespace(self._forkserver_address):
> os.unlink(self._forkserver_address)
138c139,140
< os.chmod(address, 0o600)
---
> if not util.is_abstract_socket_namespace(address):
> os.chmod(address, 0o600)
diff Python-3.8.1/Lib/multiprocessing/managers.py Python-3.8.3/Lib/multiprocessing/managers.py
62c62
< Type to uniquely indentify a shared object
---
> Type to uniquely identify a shared object
824c824
< Try to call a method of the referrent and return a copy of the result
---
> Try to call a method of the referent and return a copy of the result
1291a1292,1295
> address = self.address
> # The address of Linux abstract namespaces can be bytes
> if isinstance(address, bytes):
> address = os.fsdecode(address)
1293c1297
< _SharedMemoryTracker(f"shmm_{self.address}_{getpid()}")
---
> _SharedMemoryTracker(f"shm_{address}_{getpid()}")
diff Python-3.8.1/Lib/multiprocessing/pool.py Python-3.8.3/Lib/multiprocessing/pool.py
654,655d653
< self._worker_handler._state = TERMINATE
< self._change_notifier.put(None)
684a683,685
> # Notify that the worker_handler state has been changed so the
> # _handle_workers loop can be unblocked (and exited) in order to
> # send the finalization sentinel all the workers.
685a687,688
> change_notifier.put(None)
>
diff Python-3.8.1/Lib/multiprocessing/shared_memory.py Python-3.8.3/Lib/multiprocessing/shared_memory.py
435a436
> encoded_value = value
437,438c438,441
< if len(value) > self._allocated_bytes[position]:
< raise ValueError("exceeds available storage for existing str")
---
> encoded_value = (value.encode(_encoding)
> if isinstance(value, str) else value)
> if len(encoded_value) > self._allocated_bytes[position]:
> raise ValueError("bytes/str item exceeds available storage")
451,452c454
< value = value.encode(_encoding) if isinstance(value, str) else value
< struct.pack_into(new_format, self.shm.buf, offset, value)
---
> struct.pack_into(new_format, self.shm.buf, offset, encoded_value)
diff Python-3.8.1/Lib/multiprocessing/spawn.py Python-3.8.3/Lib/multiprocessing/spawn.py
39c39
< _python_exe = sys._base_executable
---
> _python_exe = sys.executable
diff Python-3.8.1/Lib/multiprocessing/util.py Python-3.8.3/Lib/multiprocessing/util.py
104a105,127
>
> # Abstract socket support
>
> def _platform_supports_abstract_sockets():
> if sys.platform == "linux":
> return True
> if hasattr(sys, 'getandroidapilevel'):
> return True
> return False
>
>
> def is_abstract_socket_namespace(address):
> if not address:
> return False
> if isinstance(address, bytes):
> return address[0] == 0
> elif isinstance(address, str):
> return address[0] == "\0"
> raise TypeError('address type of {address!r} unrecognized')
>
>
> abstract_sockets_supported = _platform_supports_abstract_sockets()
# ----------------------------------------------------------------------
diff Python-3.8.3/Lib/multiprocessing/context.py Python-3.8.6/Lib/multiprocessing/context.py
259a260
> methods = ['spawn', 'fork'] if sys.platform == 'darwin' else ['fork', 'spawn']
261,263c262,264
< return ['fork', 'spawn', 'forkserver']
< else:
< return ['fork', 'spawn']
---
> methods.append('forkserver')
> return methods
>
diff Python-3.8.3/Lib/multiprocessing/shared_memory.py Python-3.8.6/Lib/multiprocessing/shared_memory.py
77a78,79
> if size == 0:
> raise ValueError("'size' must be a positive number different from zero")
diff Python-3.8.3/Lib/multiprocessing/synchronize.py Python-3.8.6/Lib/multiprocessing/synchronize.py
273c273
< False), ('notify: Should not have been able to acquire'
---
> False), ('notify: Should not have been able to acquire '
# ----------------------------------------------------------------------
diff Python-3.8.8/Lib/test/_test_multiprocessing.py multiprocess/tests/__init__.py
23c23
< import pickle
---
> import pickle #XXX: use dill?
34c34
< support.skip_if_broken_multiprocessing_synchronize()
---
> test.support.import_module('multiprocess.synchronize')
37,42c37,43
< import multiprocessing.connection
< import multiprocessing.dummy
< import multiprocessing.heap
< import multiprocessing.managers
< import multiprocessing.pool
< import multiprocessing.queues
---
> import multiprocess as multiprocessing
> import multiprocess.connection
> import multiprocess.dummy
> import multiprocess.heap
> import multiprocess.managers
> import multiprocess.pool
> import multiprocess.queues
44c45
< from multiprocessing import util
---
> from multiprocess import util
47c48
< from multiprocessing import reduction
---
> from multiprocess import reduction
53c54
< from multiprocessing.sharedctypes import Value, copy
---
> from multiprocess.sharedctypes import Value, copy
59c60
< from multiprocessing import shared_memory
---
> from multiprocess import shared_memory
93c94
< from multiprocessing import resource_tracker
---
> from multiprocess import resource_tracker
121c122
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
134c135
< PRELOAD = ['__main__', 'test.test_multiprocessing_forkserver']
---
> PRELOAD = ['__main__', 'test_multiprocessing_forkserver']
173c174
< t = time.monotonic()
---
> t = getattr(time,'monotonic',time.time)()
177c178
< self.elapsed = time.monotonic() - t
---
> self.elapsed = getattr(time,'monotonic',time.time)() - t
289c290
< from multiprocessing.process import parent_process
---
> from multiprocess.process import parent_process
292c293
< def test_parent_process(self):
---
> def _test_parent_process(self):
325c326
< from multiprocessing.process import parent_process
---
> from multiprocess.process import parent_process
492a494
> @unittest.skipIf(True, "fails with is_dill(obj, child=True)")
744c746
< from multiprocessing.forkserver import _forkserver
---
> from multiprocess.forkserver import _forkserver
833c835
< self.assertIn("test_multiprocessing.py", err)
---
> self.assertIn("__init__.py", err)
1114c1116
< import multiprocessing
---
> import multiprocess as multiprocessing
1132c1134
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
1134c1136
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
1537c1539
< dt = time.monotonic()
---
> dt = getattr(time,'monotonic',time.time)()
1539c1541
< dt = time.monotonic() - dt
---
> dt = getattr(time,'monotonic',time.time)() - dt
2008c2010
< self.skipTest("requires multiprocessing.sharedctypes")
---
> self.skipTest("requires multiprocess.sharedctypes")
2574a2577
> @unittest.skipIf(True, "fails with is_dill(obj, child=True)")
2616a2620
> @unittest.skipIf(True, "fails with is_dill(obj, child=True)")
2630c2634
< t_start = time.monotonic()
---
> t_start = getattr(time,'monotonic',time.time)()
2642c2646
< self.assertGreater(time.monotonic() - t_start, 0.9)
---
> self.assertGreater(getattr(time,'monotonic',time.time)() - t_start, 0.9)
2714,2715c2718,2719
< def test_unpickleable_result(self):
< from multiprocessing.pool import MaybeEncodingError
---
> def _test_unpickleable_result(self):
> from multiprocess.pool import MaybeEncodingError
2803c2807
< from multiprocessing.managers import BaseManager, BaseProxy, RemoteError
---
> from multiprocess.managers import BaseManager, BaseProxy, RemoteError
3443c3447
< from multiprocessing import resource_sharer
---
> from multiprocess import resource_sharer
3688c3692
< self.skipTest("requires multiprocessing.sharedctypes")
---
> self.skipTest("requires multiprocess.sharedctypes")
3738c3742
< @unittest.skipUnless(HAS_SHMEM, "requires multiprocessing.shared_memory")
---
> @unittest.skipUnless(HAS_SHMEM, "requires multiprocess.shared_memory")
3844c3848
< # the failure when we run multiprocessing tests in parallel.
---
> # the failure when we run multiprocess tests in parallel.
4086c4090
< deadline = time.monotonic() + 60
---
> deadline = getattr(time,'monotonic',time.time)() + 60
4088c4092
< while time.monotonic() < deadline:
---
> while getattr(time,'monotonic',time.time)() < deadline:
4240,4242c4244,4246
< modules = ['multiprocessing.' + m for m in modules]
< modules.remove('multiprocessing.__init__')
< modules.append('multiprocessing')
---
> modules = ['multiprocess.' + m for m in modules]
> modules.remove('multiprocess.__init__')
> modules.append('multiprocess')
4248,4250c4252,4254
< modules.remove('multiprocessing.popen_fork')
< modules.remove('multiprocessing.popen_forkserver')
< modules.remove('multiprocessing.popen_spawn_posix')
---
> modules.remove('multiprocess.popen_fork')
> modules.remove('multiprocess.popen_forkserver')
> modules.remove('multiprocess.popen_spawn_posix')
4252c4256
< modules.remove('multiprocessing.popen_spawn_win32')
---
> modules.remove('multiprocess.popen_spawn_win32')
4254c4258
< modules.remove('multiprocessing.popen_forkserver')
---
> modules.remove('multiprocess.popen_forkserver')
4258c4262
< modules.remove('multiprocessing.sharedctypes')
---
> modules.remove('multiprocess.sharedctypes')
4538c4542
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4578c4582
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4619c4623
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4624c4628
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4626c4630
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4634c4638
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4636c4640
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4647c4651
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4660c4664
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4662c4666
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4670c4674
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4672c4676
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4679c4683
< start = time.monotonic()
---
> start = getattr(time,'monotonic',time.time)()
4681c4685
< delta = time.monotonic() - start
---
> delta = getattr(time,'monotonic',time.time)() - start
4690c4694
< from multiprocessing.connection import wait
---
> from multiprocess.connection import wait
4692c4696
< t = time.monotonic()
---
> t = getattr(time,'monotonic',time.time)()
4694c4698
< t = time.monotonic() - t
---
> t = getattr(time,'monotonic',time.time)() - t
4738c4742
< def test_flags(self):
---
> def _test_flags(self):
4741c4745
< prog = ('from test._test_multiprocessing import TestFlags; ' +
---
> prog = ('from multiprocess.tests import TestFlags; ' +
5043c5047
< def test_resource_tracker(self):
---
> def _test_resource_tracker(self):
5049,5051c5053,5055
< import multiprocessing as mp
< from multiprocessing import resource_tracker
< from multiprocessing.shared_memory import SharedMemory
---
> import multiprocess as mp
> from multiprocess import resource_tracker
> from multiprocess.shared_memory import SharedMemory
5095,5096c5099,5100
< deadline = time.monotonic() + 60
< while time.monotonic() < deadline:
---
> deadline = getattr(time,'monotonic',time.time)() + 60
> while getattr(time,'monotonic',time.time)() < deadline:
5120c5124
< from multiprocessing.resource_tracker import _resource_tracker
---
> from multiprocess.resource_tracker import _resource_tracker
5168c5172
< from multiprocessing.resource_tracker import _resource_tracker
---
> from multiprocess.resource_tracker import _resource_tracker
5177c5181
< from multiprocessing.resource_tracker import _resource_tracker
---
> from multiprocess.resource_tracker import _resource_tracker
5321c5325
< start_time = time.monotonic()
---
> start_time = getattr(time,'monotonic',time.time)()
5326c5330
< dt = time.monotonic() - start_time
---
> dt = getattr(time,'monotonic',time.time)() - start_time
5329c5333
< support.print_warning(f"multiprocessing.Manager still has "
---
> support.print_warning(f"multiprocess.Manager still has "
5597c5601
< start_time = time.monotonic()
---
> start_time = getattr(time,'monotonic',time.time)()
5602c5606
< dt = time.monotonic() - start_time
---
> dt = getattr(time,'monotonic',time.time)() - start_time
5605c5609
< support.print_warning(f"multiprocessing.Manager still has "
---
> support.print_warning(f"multiprocess.Manager still has "
# ----------------------------------------------------------------------
$ diff Python-3.8.12/Lib/test/_test_multiprocessing.py Python-3.8.13/Lib/test/_test_multiprocessing.py
3751a3752,3757
> def _new_shm_name(self, prefix):
> # Add a PID to the name of a POSIX shared memory object to allow
> # running multiprocessing tests (test_multiprocessing_fork,
> # test_multiprocessing_spawn, etc) in parallel.
> return prefix + str(os.getpid())
>
3753c3759,3760
< sms = shared_memory.SharedMemory('test01_tsmb', create=True, size=512)
---
> name_tsmb = self._new_shm_name('test01_tsmb')
> sms = shared_memory.SharedMemory(name_tsmb, create=True, size=512)
3757c3764
< self.assertEqual(sms.name, 'test01_tsmb')
---
> self.assertEqual(sms.name, name_tsmb)
3766c3773
< also_sms = shared_memory.SharedMemory('test01_tsmb')
---
> also_sms = shared_memory.SharedMemory(name_tsmb)
3771c3778
< same_sms = shared_memory.SharedMemory('test01_tsmb', size=20*sms.size)
---
> same_sms = shared_memory.SharedMemory(name_tsmb, size=20*sms.size)
3781a3789,3794
> name_dblunlink = self._new_shm_name('test01_dblunlink')
> sms_uno = shared_memory.SharedMemory(
> name_dblunlink,
> create=True,
> size=5000
> )
3783,3788d3795
< sms_uno = shared_memory.SharedMemory(
< 'test01_dblunlink',
< create=True,
< size=5000
< )
<
3792c3799
< sms_duo = shared_memory.SharedMemory('test01_dblunlink')
---
> sms_duo = shared_memory.SharedMemory(name_dblunlink)
3804c3811
< 'test01_tsmb',
---
> name_tsmb,
3818c3825
< ok_if_exists_sms = OptionalAttachSharedMemory('test01_tsmb')
---
> ok_if_exists_sms = OptionalAttachSharedMemory(name_tsmb)
4006c4013,4014
< sl_copy = shared_memory.ShareableList(sl, name='test03_duplicate')
---
> name_duplicate = self._new_shm_name('test03_duplicate')
> sl_copy = shared_memory.ShareableList(sl, name=name_duplicate)
4009c4017
< self.assertEqual('test03_duplicate', sl_copy.shm.name)
---
> self.assertEqual(name_duplicate, sl_copy.shm.name)
|