… | |
… | |
8 | use Storable; |
8 | use Storable; |
9 | use Opcode; |
9 | use Opcode; |
10 | use Safe; |
10 | use Safe; |
11 | use Safe::Hole; |
11 | use Safe::Hole; |
12 | |
12 | |
13 | use Coro 3.4 (); |
13 | use Coro 3.5 (); |
14 | use Coro::Event; |
14 | use Coro::Event; |
15 | use Coro::Timer; |
15 | use Coro::Timer; |
16 | use Coro::Signal; |
16 | use Coro::Signal; |
17 | use Coro::Semaphore; |
17 | use Coro::Semaphore; |
18 | use Coro::AIO; |
18 | use Coro::AIO; |
… | |
… | |
82 | mkdir cf::localdir . "/" . cf::tmpdir; |
82 | mkdir cf::localdir . "/" . cf::tmpdir; |
83 | mkdir cf::localdir . "/" . cf::uniquedir; |
83 | mkdir cf::localdir . "/" . cf::uniquedir; |
84 | mkdir $RANDOM_MAPS; |
84 | mkdir $RANDOM_MAPS; |
85 | |
85 | |
86 | our $EMERGENCY_POSITION; |
86 | our $EMERGENCY_POSITION; |
|
|
87 | |
|
|
88 | sub cf::map::normalise; |
87 | |
89 | |
88 | ############################################################################# |
90 | ############################################################################# |
89 | |
91 | |
90 | =head2 GLOBAL VARIABLES |
92 | =head2 GLOBAL VARIABLES |
91 | |
93 | |
… | |
… | |
774 | } |
776 | } |
775 | } else { |
777 | } else { |
776 | aio_unlink $filename; |
778 | aio_unlink $filename; |
777 | aio_unlink "$filename.pst"; |
779 | aio_unlink "$filename.pst"; |
778 | } |
780 | } |
|
|
781 | |
|
|
782 | #d##TODO# nuke non .map-files if exist |
|
|
783 | if ($filename =~ s/\.map$//) { |
|
|
784 | aio_unlink $filename; |
|
|
785 | aio_unlink "$filename.pst"; |
|
|
786 | } |
779 | } |
787 | } |
780 | } |
788 | } |
781 | |
789 | |
782 | sub object_freezer_as_string { |
790 | sub object_freezer_as_string { |
783 | my ($rdata, $objs) = @_; |
791 | my ($rdata, $objs) = @_; |
… | |
… | |
789 | |
797 | |
790 | sub object_thawer_load { |
798 | sub object_thawer_load { |
791 | my ($filename) = @_; |
799 | my ($filename) = @_; |
792 | |
800 | |
793 | my ($data, $av); |
801 | my ($data, $av); |
|
|
802 | |
|
|
803 | #d#TODO remove .map if file does not exist |
|
|
804 | aio_stat $filename and $filename =~ s/\.map$//; |
794 | |
805 | |
795 | (aio_load $filename, $data) >= 0 |
806 | (aio_load $filename, $data) >= 0 |
796 | or return; |
807 | or return; |
797 | |
808 | |
798 | unless (aio_stat "$filename.pst") { |
809 | unless (aio_stat "$filename.pst") { |
… | |
… | |
1068 | =cut |
1079 | =cut |
1069 | |
1080 | |
1070 | sub maps($) { |
1081 | sub maps($) { |
1071 | my ($pl) = @_; |
1082 | my ($pl) = @_; |
1072 | |
1083 | |
|
|
1084 | $pl = ref $pl ? $pl->ob->name : $pl; |
|
|
1085 | |
1073 | my $files = aio_readdir playerdir $pl |
1086 | my $files = aio_readdir playerdir $pl |
1074 | or return; |
1087 | or return; |
1075 | |
1088 | |
1076 | my @paths; |
1089 | my @paths; |
1077 | |
1090 | |
1078 | for (@$files) { |
1091 | for (@$files) { |
1079 | utf8::decode $_; |
1092 | utf8::decode $_; |
1080 | next if /\.(?:pl|pst)$/; |
1093 | next if /\.(?:pl|pst)$/; |
1081 | next unless /^$PATH_SEP/o; |
1094 | next unless /^$PATH_SEP/o; |
1082 | |
1095 | |
1083 | s/\.map$//; |
1096 | push @paths, cf::map::normalise "~$pl/$_"; |
1084 | push @paths, "~" . $pl->ob->name . "/" . $_; |
|
|
1085 | } |
1097 | } |
1086 | |
1098 | |
1087 | \@paths |
1099 | \@paths |
1088 | } |
1100 | } |
1089 | |
1101 | |
… | |
… | |
1176 | } |
1188 | } |
1177 | |
1189 | |
1178 | sub normalise { |
1190 | sub normalise { |
1179 | my ($path, $base) = @_; |
1191 | my ($path, $base) = @_; |
1180 | |
1192 | |
|
|
1193 | $path = "$path"; # make sure its a string |
|
|
1194 | |
|
|
1195 | $path =~ s/\.map$//; |
|
|
1196 | |
1181 | # map plan: |
1197 | # map plan: |
1182 | # |
1198 | # |
1183 | # /! non-realised random map exit (special hack!) |
1199 | # /! non-realised random map exit (special hack!) |
1184 | # {... are special paths that are not being touched |
1200 | # {... are special paths that are not being touched |
1185 | # ?xxx/... are special absolute paths |
1201 | # ?xxx/... are special absolute paths |
… | |
… | |
1221 | $self->init; # pass $1 etc. |
1237 | $self->init; # pass $1 etc. |
1222 | return $self; |
1238 | return $self; |
1223 | } |
1239 | } |
1224 | } |
1240 | } |
1225 | |
1241 | |
1226 | Carp::carp "unable to resolve path '$path'."; |
1242 | Carp::carp "unable to resolve path '$path' (base '$base')."; |
1227 | () |
1243 | () |
1228 | } |
1244 | } |
1229 | |
1245 | |
1230 | sub init { |
1246 | sub init { |
1231 | my ($self) = @_; |
1247 | my ($self) = @_; |
… | |
… | |
1246 | |
1262 | |
1247 | # the original (read-only) location |
1263 | # the original (read-only) location |
1248 | sub load_path { |
1264 | sub load_path { |
1249 | my ($self) = @_; |
1265 | my ($self) = @_; |
1250 | |
1266 | |
1251 | sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} |
1267 | sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} |
1252 | } |
1268 | } |
1253 | |
1269 | |
1254 | # the temporary/swap location |
1270 | # the temporary/swap location |
1255 | sub save_path { |
1271 | sub save_path { |
1256 | my ($self) = @_; |
1272 | my ($self) = @_; |
1257 | |
1273 | |
1258 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; |
1274 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; |
1259 | sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path |
1275 | sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path |
1260 | } |
1276 | } |
1261 | |
1277 | |
1262 | # the unique path, undef == no special unique path |
1278 | # the unique path, undef == no special unique path |
1263 | sub uniq_path { |
1279 | sub uniq_path { |
1264 | my ($self) = @_; |
1280 | my ($self) = @_; |
… | |
… | |
1280 | my ($self) = @_; |
1296 | my ($self) = @_; |
1281 | |
1297 | |
1282 | utf8::encode (my $save = $self->save_path); |
1298 | utf8::encode (my $save = $self->save_path); |
1283 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1299 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; |
1284 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; |
1300 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; |
|
|
1301 | |
|
|
1302 | #d#TODO remove .map and also nuke |
|
|
1303 | $save =~ s/\.map// or return;#d# |
|
|
1304 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d# |
|
|
1305 | IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d# |
1285 | } |
1306 | } |
1286 | |
1307 | |
1287 | sub load_header_from($) { |
1308 | sub load_header_from($) { |
1288 | my ($self, $path) = @_; |
1309 | my ($self, $path) = @_; |
1289 | |
1310 | |
1290 | utf8::encode $path; |
1311 | utf8::encode $path; |
1291 | aio_open $path, O_RDONLY, 0 |
1312 | #aio_open $path, O_RDONLY, 0 |
1292 | or return; |
1313 | # or return; |
1293 | |
1314 | |
1294 | $self->_load_header ($path) |
1315 | $self->_load_header ($path) |
1295 | or return; |
1316 | or return; |
1296 | |
1317 | |
1297 | $self->{load_path} = $path; |
1318 | $self->{load_path} = $path; |
… | |
… | |
1360 | $map->{last_save} = $cf::RUNTIME; |
1381 | $map->{last_save} = $cf::RUNTIME; |
1361 | |
1382 | |
1362 | $map->load_header |
1383 | $map->load_header |
1363 | or return; |
1384 | or return; |
1364 | |
1385 | |
1365 | if ($map->should_reset) { |
1386 | if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) |
1366 | # doing this can freeze the server in a sync job, obviously |
1387 | # doing this can freeze the server in a sync job, obviously |
1367 | #$cf::WAIT_FOR_TICK->wait; |
1388 | #$cf::WAIT_FOR_TICK->wait; |
1368 | $map->reset; |
1389 | $map->reset; |
1369 | undef $guard; |
1390 | undef $guard; |
1370 | $map = find $path |
1391 | return find $path; |
1371 | or return; |
|
|
1372 | } |
1392 | } |
1373 | |
1393 | |
1374 | $cf::MAP{$path} = $map |
1394 | $cf::MAP{$path} = $map |
1375 | } |
1395 | } |
1376 | } |
1396 | } |
… | |
… | |
1378 | sub pre_load { } |
1398 | sub pre_load { } |
1379 | sub post_load { } |
1399 | sub post_load { } |
1380 | |
1400 | |
1381 | sub load { |
1401 | sub load { |
1382 | my ($self) = @_; |
1402 | my ($self) = @_; |
|
|
1403 | |
|
|
1404 | local $self->{deny_reset} = 1; # loading can take a long time |
1383 | |
1405 | |
1384 | my $path = $self->{path}; |
1406 | my $path = $self->{path}; |
1385 | my $guard = cf::lock_acquire "map_load:$path"; |
1407 | my $guard = cf::lock_acquire "map_load:$path"; |
1386 | |
1408 | |
1387 | return if $self->in_memory != cf::MAP_SWAPPED; |
1409 | return if $self->in_memory != cf::MAP_SWAPPED; |
… | |
… | |
1496 | delete $MAP_PREFETCH{$path}; |
1518 | delete $MAP_PREFETCH{$path}; |
1497 | } |
1519 | } |
1498 | } |
1520 | } |
1499 | undef $MAP_PREFETCHER; |
1521 | undef $MAP_PREFETCHER; |
1500 | }; |
1522 | }; |
|
|
1523 | $MAP_PREFETCHER->prio (6); |
1501 | |
1524 | |
1502 | () |
1525 | () |
1503 | } |
1526 | } |
1504 | |
1527 | |
1505 | sub save { |
1528 | sub save { |
… | |
… | |
1624 | for (@$files) { |
1647 | for (@$files) { |
1625 | utf8::decode $_; |
1648 | utf8::decode $_; |
1626 | next if /\.pst$/; |
1649 | next if /\.pst$/; |
1627 | next unless /^$PATH_SEP/o; |
1650 | next unless /^$PATH_SEP/o; |
1628 | |
1651 | |
1629 | s/\.map$//; |
1652 | push @paths, cf::map::normalise $_; |
1630 | push @paths, $_; |
|
|
1631 | } |
1653 | } |
1632 | |
1654 | |
1633 | \@paths |
1655 | \@paths |
1634 | } |
1656 | } |
1635 | |
1657 | |
… | |
… | |
1729 | =cut |
1751 | =cut |
1730 | |
1752 | |
1731 | sub link_map { |
1753 | sub link_map { |
1732 | unless ($LINK_MAP) { |
1754 | unless ($LINK_MAP) { |
1733 | $LINK_MAP = cf::map::find "{link}" |
1755 | $LINK_MAP = cf::map::find "{link}" |
1734 | or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; |
1756 | or cf::cleanup "FATAL: unable to provide {link} map, exiting."; |
1735 | $LINK_MAP->load; |
1757 | $LINK_MAP->load; |
1736 | } |
1758 | } |
1737 | |
1759 | |
1738 | $LINK_MAP |
1760 | $LINK_MAP |
1739 | } |
1761 | } |
… | |
… | |
1746 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1768 | return if UNIVERSAL::isa $self->map, "ext::map_link"; |
1747 | |
1769 | |
1748 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1770 | $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] |
1749 | if $self->map; |
1771 | if $self->map; |
1750 | |
1772 | |
1751 | $self->enter_map ($LINK_MAP || link_map, 20, 20); |
1773 | $self->enter_map ($LINK_MAP || link_map, 10, 10); |
1752 | } |
1774 | } |
1753 | |
1775 | |
1754 | sub cf::object::player::leave_link { |
1776 | sub cf::object::player::leave_link { |
1755 | my ($self, $map, $x, $y) = @_; |
1777 | my ($self, $map, $x, $y) = @_; |
1756 | |
1778 | |
… | |
… | |
1823 | my ($self, $path, $x, $y) = @_; |
1845 | my ($self, $path, $x, $y) = @_; |
1824 | |
1846 | |
1825 | $self->enter_link; |
1847 | $self->enter_link; |
1826 | |
1848 | |
1827 | (async { |
1849 | (async { |
|
|
1850 | my $map = eval { |
1828 | my $map = cf::map::find $path; |
1851 | my $map = cf::map::find $path; |
1829 | $map = $map->customise_for ($self) if $map; |
1852 | $map = $map->customise_for ($self) if $map; |
1830 | |
1853 | $map |
1831 | # warn "entering ", $map->path, " at ($x, $y)\n" |
1854 | } or |
1832 | # if $map; |
|
|
1833 | |
|
|
1834 | $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
1855 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
1835 | |
1856 | |
1836 | $self->leave_link ($map, $x, $y); |
1857 | $self->leave_link ($map, $x, $y); |
1837 | })->prio (1); |
1858 | })->prio (1); |
1838 | } |
1859 | } |
1839 | |
1860 | |
… | |
… | |
1870 | # that depends on the exit object |
1891 | # that depends on the exit object |
1871 | |
1892 | |
1872 | my $rmp = parse_random_map_params $exit->msg; |
1893 | my $rmp = parse_random_map_params $exit->msg; |
1873 | |
1894 | |
1874 | if ($exit->map) { |
1895 | if ($exit->map) { |
1875 | $rmp->{region} = $exit->map->region_name; |
1896 | $rmp->{region} = $exit->region->name; |
1876 | $rmp->{origin_map} = $exit->map->path; |
1897 | $rmp->{origin_map} = $exit->map->path; |
1877 | $rmp->{origin_x} = $exit->x; |
1898 | $rmp->{origin_x} = $exit->x; |
1878 | $rmp->{origin_y} = $exit->y; |
1899 | $rmp->{origin_y} = $exit->y; |
1879 | } |
1900 | } |
1880 | |
1901 | |
… | |
… | |
1897 | sub cf::object::player::enter_exit { |
1918 | sub cf::object::player::enter_exit { |
1898 | my ($self, $exit) = @_; |
1919 | my ($self, $exit) = @_; |
1899 | |
1920 | |
1900 | return unless $self->type == cf::PLAYER; |
1921 | return unless $self->type == cf::PLAYER; |
1901 | |
1922 | |
|
|
1923 | if ($exit->slaying eq "/!") { |
|
|
1924 | #TODO: this should de-fi-ni-te-ly not be a sync-job |
|
|
1925 | cf::sync_job { prepare_random_map $exit }; |
|
|
1926 | } |
|
|
1927 | |
|
|
1928 | my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; |
|
|
1929 | my $hp = $exit->stats->hp; |
|
|
1930 | my $sp = $exit->stats->sp; |
|
|
1931 | |
1902 | $self->enter_link; |
1932 | $self->enter_link; |
1903 | |
1933 | |
1904 | (async { |
1934 | (async { |
1905 | $self->deactivate_recursive; # just to be sure |
1935 | $self->deactivate_recursive; # just to be sure |
1906 | unless (eval { |
1936 | unless (eval { |
1907 | prepare_random_map $exit |
1937 | $self->goto ($slaying, $hp, $sp); |
1908 | if $exit->slaying eq "/!"; |
|
|
1909 | |
|
|
1910 | my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path; |
|
|
1911 | $self->goto ($path, $exit->stats->hp, $exit->stats->sp); |
|
|
1912 | |
1938 | |
1913 | 1; |
1939 | 1; |
1914 | }) { |
1940 | }) { |
1915 | $self->message ("Something went wrong deep within the crossfire server. " |
1941 | $self->message ("Something went wrong deep within the crossfire server. " |
1916 | . "I'll try to bring you back to the map you were before. " |
1942 | . "I'll try to bring you back to the map you were before. " |
… | |
… | |
2205 | sub db_sync() { |
2231 | sub db_sync() { |
2206 | db_save if $dirty; |
2232 | db_save if $dirty; |
2207 | undef $dirty; |
2233 | undef $dirty; |
2208 | } |
2234 | } |
2209 | |
2235 | |
2210 | my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { |
2236 | my $idle = Event->idle ( |
2211 | db_sync; |
2237 | reentrant => 0, |
|
|
2238 | min => 10, |
|
|
2239 | max => 20, |
|
|
2240 | repeat => 0, |
|
|
2241 | data => WF_AUTOCANCEL, |
|
|
2242 | cb => \&db_sync, |
2212 | }); |
2243 | ); |
2213 | |
2244 | |
2214 | sub db_dirty() { |
2245 | sub db_dirty() { |
2215 | $dirty = 1; |
2246 | $dirty = 1; |
2216 | $idle->start; |
2247 | $idle->start; |
2217 | } |
2248 | } |
… | |
… | |
2285 | |
2316 | |
2286 | # install some emergency cleanup handlers |
2317 | # install some emergency cleanup handlers |
2287 | BEGIN { |
2318 | BEGIN { |
2288 | for my $signal (qw(INT HUP TERM)) { |
2319 | for my $signal (qw(INT HUP TERM)) { |
2289 | Event->signal ( |
2320 | Event->signal ( |
|
|
2321 | reentrant => 0, |
2290 | data => WF_AUTOCANCEL, |
2322 | data => WF_AUTOCANCEL, |
2291 | signal => $signal, |
2323 | signal => $signal, |
|
|
2324 | prio => 0, |
2292 | cb => sub { |
2325 | cb => sub { |
2293 | cf::cleanup "SIG$signal"; |
2326 | cf::cleanup "SIG$signal"; |
2294 | }, |
2327 | }, |
2295 | ); |
2328 | ); |
2296 | } |
2329 | } |
2297 | } |
2330 | } |
… | |
… | |
2452 | $who->message ("reloading server."); |
2485 | $who->message ("reloading server."); |
2453 | |
2486 | |
2454 | # doing reload synchronously and two reloads happen back-to-back, |
2487 | # doing reload synchronously and two reloads happen back-to-back, |
2455 | # coro crashes during coro_state_free->destroy here. |
2488 | # coro crashes during coro_state_free->destroy here. |
2456 | |
2489 | |
2457 | $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { |
2490 | $RELOAD_WATCHER ||= Event->timer ( |
|
|
2491 | reentrant => 0, |
|
|
2492 | after => 0, |
|
|
2493 | data => WF_AUTOCANCEL, |
|
|
2494 | cb => sub { |
2458 | reload; |
2495 | reload; |
2459 | undef $RELOAD_WATCHER; |
2496 | undef $RELOAD_WATCHER; |
|
|
2497 | }, |
2460 | }); |
2498 | ); |
2461 | } |
2499 | } |
2462 | }; |
2500 | }; |
2463 | |
2501 | |
2464 | unshift @INC, $LIBDIR; |
2502 | unshift @INC, $LIBDIR; |
2465 | |
2503 | |
… | |
… | |
2485 | $NEXT_TICK += $TICK; |
2523 | $NEXT_TICK += $TICK; |
2486 | |
2524 | |
2487 | $WAIT_FOR_TICK->broadcast; |
2525 | $WAIT_FOR_TICK->broadcast; |
2488 | $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; |
2526 | $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; |
2489 | |
2527 | |
|
|
2528 | Event::sweep; |
|
|
2529 | Coro::cede_notself; |
|
|
2530 | |
|
|
2531 | # my $AFTER = Event::time; |
|
|
2532 | # warn $AFTER - $NOW;#d# |
|
|
2533 | |
2490 | # if we are delayed by four ticks or more, skip them all |
2534 | # if we are delayed by four ticks or more, skip them all |
2491 | $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; |
2535 | $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; |
2492 | |
2536 | |
2493 | $TICK_WATCHER->at ($NEXT_TICK); |
2537 | $TICK_WATCHER->at ($NEXT_TICK); |
2494 | $TICK_WATCHER->start; |
2538 | $TICK_WATCHER->start; |
2495 | }, |
2539 | }, |
2496 | ); |
2540 | ); |
2497 | |
2541 | |
2498 | IO::AIO::max_poll_time $TICK * 0.2; |
2542 | IO::AIO::max_poll_time $TICK * 0.1; |
2499 | |
2543 | |
|
|
2544 | undef $Coro::AIO::WATCHER; |
2500 | $AIO_POLL_WATCHER = Event->io ( |
2545 | $AIO_POLL_WATCHER = Event->io ( |
|
|
2546 | reentrant => 0, |
2501 | fd => IO::AIO::poll_fileno, |
2547 | fd => IO::AIO::poll_fileno, |
2502 | poll => 'r', |
2548 | poll => 'r', |
2503 | prio => 5, |
2549 | prio => 6, |
2504 | data => WF_AUTOCANCEL, |
2550 | data => WF_AUTOCANCEL, |
2505 | cb => \&IO::AIO::poll_cb, |
2551 | cb => \&IO::AIO::poll_cb, |
2506 | ); |
2552 | ); |
2507 | |
2553 | |
2508 | $WRITE_RUNTIME_WATCHER = Event->timer ( |
2554 | $WRITE_RUNTIME_WATCHER = Event->timer ( |
|
|
2555 | reentrant => 0, |
2509 | data => WF_AUTOCANCEL, |
2556 | data => WF_AUTOCANCEL, |
2510 | after => 1, |
2557 | after => 1, |
2511 | interval => 10, |
2558 | interval => 10, |
2512 | prio => 6, # keep it lowest so it acts like a watchdog |
2559 | prio => 6, # keep it lowest so it acts like a watchdog |
2513 | cb => Coro::unblock_sub { |
2560 | cb => Coro::unblock_sub { |
2514 | write_runtime |
2561 | write_runtime |
2515 | or warn "ERROR: unable to write runtime file: $!"; |
2562 | or warn "ERROR: unable to write runtime file: $!"; |
2516 | }, |
2563 | }, |
2517 | ); |
2564 | ); |
2518 | |
2565 | |