ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.316 by root, Mon Jul 23 21:02:50 2007 UTC vs.
Revision 1.360 by root, Sun Sep 9 06:25:46 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
86our %CFG; 87our %CFG;
87 88
88our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 90our $RUNTIME;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
… …
271Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
281Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
282 286
283=cut 287=cut
284 288
285our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
286 291
287sub lock_wait($) { 292sub lock_wait($) {
288 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
289 299
290 # wait for lock, if any 300 # wait for lock, if any
291 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 303 Coro::schedule;
… …
299 309
300 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
301 lock_wait $key; 311 lock_wait $key;
302 312
303 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
304 315
305 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
308 } 320 }
309} 321}
310 322
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 484Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 485never block itself or use any form of Event handling.
474 486
475=cut 487=cut
476 488
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 489sub fork_call(&@) {
487 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
488 491
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 492 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 495
494 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 497 reset_signals;
508 local $SIG{__WARN__}; 498 &$cb
509 local $SIG{__DIE__}; 499 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 500
516 eval { 501 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 502}
529 503
530=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
531 505
532Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
612 if (1) { 586 if (1) {
613 $md5 = 587 $md5 =
614 join "\x00", 588 join "\x00",
615 $processversion, 589 $processversion,
616 map { 590 map {
617 Coro::cede; 591 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 593 } 0.. $#$src;
620 594
621 595
622 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
1038 }, 1012 },
1039); 1013);
1040 1014
1041sub object_freezer_save { 1015sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
1043 1019
1044 sync_job { 1020 sync_job {
1045 if (length $$rdata) { 1021 if (length $$rdata) {
1046 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1071 } 1047 }
1072 } else { 1048 } else {
1073 aio_unlink $filename; 1049 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1075 } 1051 }
1076 } 1052 };
1053
1054 undef $guard;
1077} 1055}
1078 1056
1079sub object_freezer_as_string { 1057sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1081 1059
… …
1086 1064
1087sub object_thawer_load { 1065sub object_thawer_load {
1088 my ($filename) = @_; 1066 my ($filename) = @_;
1089 1067
1090 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1091 1071
1092 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1093 or return; 1073 or return;
1094 1074
1095 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1077 or return;
1078
1079 undef $guard;
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1081 }
1100 1082
1101 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1103 return ($data, $av); 1086 ($data, $av)
1104} 1087}
1105 1088
1106=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1107 1090
1108=over 4 1091=over 4
… …
1186 my ($type, $reply, @payload) = 1169 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1170 "ARRAY" eq ref $msg
1188 ? @$msg 1171 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1173
1174 my @reply;
1175
1191 if (my $cb = $EXTCMD{$type}) { 1176 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1177 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1197 } else { 1183 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1185 }
1200 1186
1201 cf::override; 1187 cf::override;
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1325
1340 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1343 } 1335 }
1344 } 1336 }
1345} 1337}
1346 1338
… …
1356 1348
1357 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1359 1351
1360 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1361 Coro::cede; 1353 cf::cede_to_tick;
1362} 1354}
1363 1355
1364sub new($) { 1356sub new($) {
1365 my ($login) = @_; 1357 my ($login) = @_;
1366 1358
… …
1370 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1371 1363
1372 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1373 1365
1374 $self 1366 $self
1367}
1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1375} 1377}
1376 1378
1377=item $pl->quit_character 1379=item $pl->quit_character
1378 1380
1379Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1436 or return [];
1435 1437
1436 my @logins; 1438 my @logins;
1437 1439
1438 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1442 1449
1443 utf8::decode $login; 1450 utf8::decode $login;
1444 push @logins, $login; 1451 push @logins, $login;
1445 } 1452 }
1446 1453
… …
1484sub expand_cfpod { 1491sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1486 1493
1487 # escape & and < 1494 # escape & and <
1488 s/&/&amp;/g; 1495 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1490 1497
1491 # this is buggy, it needs to properly take care of nested <'s 1498 # this is buggy, it needs to properly take care of nested <'s
1492 1499
1493 1 while 1500 1 while
1494 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1506 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1501 }ge 1509 }ge
1502 # replace H<hint text> 1510 # replace H<hint text>
… …
1532=cut 1540=cut
1533 1541
1534sub ext_reply($$@) { 1542sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1543 my ($self, $id, @msg) = @_;
1536 1544
1537 if ($self->ns->extcmd == 2) { 1545 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1546}
1545 1547
1546=item $player->ext_msg ($type, @msg) 1548=item $player->ext_msg ($type, @msg)
1547 1549
1548Sends an ext event to the client. 1550Sends an ext event to the client.
… …
1776 1778
1777sub load_header_from($) { 1779sub load_header_from($) {
1778 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1779 1781
1780 utf8::encode $path; 1782 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1784 or return;
1785
1786 $self->_load_header ($f)
1787 or return;
1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1786 1791
1787 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1788 1793
1789 1 1794 1
1790} 1795}
… …
1844sub find { 1849sub find {
1845 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1846 1851
1847 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1848 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1850 1856
1851 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1853 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1854 or return; 1862 or return;
1855 1863
1856 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1857 1865
… …
1859 or return; 1867 or return;
1860 1868
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1864 $map->reset; 1874 $map->reset;
1865 undef $guard;
1866 return find $path; 1875 return find $path;
1867 } 1876 }
1868 1877
1869 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1870 } 1879 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1880 1889
1881 my $path = $self->{path}; 1890 my $path = $self->{path};
1882 1891
1883 { 1892 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1885 1894
1895 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1897
1888 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1889 1899
1890 $self->alloc; 1900 $self->alloc;
1891 1901
1892 $self->pre_load; 1902 $self->pre_load;
1893 Coro::cede; 1903 cf::cede_to_tick;
1894 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1896 or return; 1908 or return;
1897 1909
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1900 1912
1901 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1914 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1917 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1906 } 1921 }
1907 } 1922 }
1908 1923
1909 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1910 # now do the right thing for maps 1927 # now do the right thing for maps
1911 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1930 unless $self->difficulty;
1914 Coro::cede; 1931 cf::cede_to_tick;
1915 1932
1916 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1934 $self->decay_objects;
1918 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1919 $self->update_buttons; 1936 $self->update_buttons;
1920 Coro::cede; 1937 cf::cede_to_tick;
1921 $self->set_darkness_map; 1938 $self->set_darkness_map;
1922 Coro::cede; 1939 cf::cede_to_tick;
1923 $self->activate; 1940 $self->activate;
1924 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1925 1945
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1947 }
1928 1948
1929 $self->post_load; 1949 $self->post_load;
… …
1940 1960
1941 $self 1961 $self
1942} 1962}
1943 1963
1944# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1965sub load_neighbours {
1946 my ($map) = @_; 1966 my ($map) = @_;
1947 1967
1948 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1949 1969
1950 for (0 .. 3) { 1970 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1952 or next; 1972 or next;
1953 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1954 or next; 1974 or next;
1955 $neigh->load; 1975 $neigh->load;
1956 1976
1977 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1980 }
1960 1981
1961 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1963 or next; 1985 or next;
1964 $neigh->load; 1986 $neigh->load;
1965 } 1987 }
1966} 1988}
1967 1989
… …
1972} 1994}
1973 1995
1974sub do_load_sync { 1996sub do_load_sync {
1975 my ($map) = @_; 1997 my ($map) = @_;
1976 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1977 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1978} 2003}
1979 2004
1980our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1982 2007
1983sub find_async { 2008sub find_async {
1984 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1985 2010
1986 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1987 2012
1988 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 2015 }
1991 2016
1992 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1993 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2022 if (my $map = find $k) {
1997 $map->load; 2023 $map->load if $v;
1998 } 2024 }
1999 2025
2000 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
2001 } 2027 }
2002 } 2028 }
2003 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
2004 }; 2030 };
2005 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
2008} 2034}
2009 2035
2010sub save { 2036sub save {
2011 my ($self) = @_; 2037 my ($self) = @_;
2012 2038
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2040
2015 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2016 2042
2017 return unless $self->dirty; 2043 return unless $self->dirty;
2018 2044
… …
2041 my ($self) = @_; 2067 my ($self) = @_;
2042 2068
2043 # save first because save cedes 2069 # save first because save cedes
2044 $self->save; 2070 $self->save;
2045 2071
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2073
2048 return if $self->players; 2074 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2051 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2082 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2083}
2055 2084
2056sub reset_at { 2085sub reset_at {
2057 my ($self) = @_; 2086 my ($self) = @_;
2058 2087
… …
2090 if $uniq; 2119 if $uniq;
2091 } 2120 }
2092 2121
2093 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
2094 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2126 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2127
2099 $self->unlink_save; 2128 $self->unlink_save;
2100 $self->destroy; 2129 $self->destroy;
2101} 2130}
2102 2131
2103my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
2104 2133
2105sub nuke { 2134sub nuke {
2106 my ($self) = @_; 2135 my ($self) = @_;
2107 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
2108 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
2109 2141
2110 $self->unlink_save; 2142 $self->unlink_save;
2111 2143
2112 bless $self, "cf::map"; 2144 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2149
2118 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
2119 2152
2120 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2121} 2154}
2122 2155
2123=item $maps = cf::map::tmp_maps 2156=item $maps = cf::map::tmp_maps
… …
2199 2232
2200sub inv_recursive { 2233sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2202} 2235}
2203 2236
2237=item $ref = $ob->ref
2238
2239creates and returns a persistent reference to an objetc that can be stored as a string.
2240
2241=item $ob = cf::object::deref ($refstring)
2242
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block.
2245
2246=cut
2247
2248sub deref {
2249 my ($ref) = @_;
2250
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return;
2258 $pl->ob->uuid eq $uuid
2259 or return;
2260
2261 $pl->ob
2262 } else {
2263 warn "$ref: cannot resolve object reference\n";
2264 undef
2265 }
2266}
2267
2204package cf; 2268package cf;
2205 2269
2206=back 2270=back
2207 2271
2208=head3 cf::object::player 2272=head3 cf::object::player
… …
2240 $self->message ($msg, $flags); 2304 $self->message ($msg, $flags);
2241 } 2305 }
2242 } 2306 }
2243} 2307}
2244 2308
2309=item $object->send_msg ($channel, $msg, $color, [extra...])
2310
2311=cut
2312
2313sub cf::object::send_msg {
2314 my $pl = shift->contr
2315 or return;
2316 $pl->send_msg (@_);
2317}
2318
2245=item $player_object->may ("access") 2319=item $player_object->may ("access")
2246 2320
2247Returns wether the given player is authorized to access resource "access" 2321Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2322(e.g. "command_wizcast").
2249 2323
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2400 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2401 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2402 if $x <=0 && $y <= 0;
2329 2403
2330 $map->load; 2404 $map->load;
2331 $map->load_diag; 2405 $map->load_neighbours;
2332 2406
2333 return unless $self->contr->active; 2407 return unless $self->contr->active;
2334 $self->activate_recursive; 2408 $self->activate_recursive;
2335 2409
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2581the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2582the message unless the client supports the msg packet.
2509 2583
2510=cut 2584=cut
2511 2585
2586our %CHANNEL = (
2587 "c/identify" => {
2588 id => "identify",
2589 title => "Identify",
2590 reply => undef,
2591 tooltip => "Items recently identified",
2592 },
2593 "c/examine" => {
2594 id => "examine",
2595 title => "Examine",
2596 reply => undef,
2597 tooltip => "Signs and other items you examined",
2598 },
2599);
2600
2512sub cf::client::send_msg { 2601sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2602 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2603
2515 $msg = $self->pl->expand_cfpod ($msg); 2604 $msg = $self->pl->expand_cfpod ($msg);
2516 2605
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2606 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607
2608 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2518 2610
2519 if (ref $channel) { 2611 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2612 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2613 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2614 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel); 2615 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg;
2524 } 2617 }
2525 2618
2526 $channel = $channel->{id}; 2619 $channel = $channel->{id};
2527 } 2620 }
2528 2621
2529 return unless @extra || length $msg; 2622 return unless @extra || length $msg;
2530 2623
2531 if ($self->can_msg) { 2624 if ($self->can_msg) {
2625 # default colour, mask it out
2626 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2627 if $color & cf::NDI_DEF;
2628
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2629 $self->send_packet ("msg " . $self->{json_coder}->encode (
2630 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2631 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2632 if ($color >= 0) {
2633 # replace some tags by gcfclient-compatible ones
2634 for ($msg) {
2635 1 while
2636 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2637 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2638 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2639 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2640 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2641 }
2642
2643 $color &= cf::NDI_COLOR_MASK;
2644
2645 utf8::encode $msg;
2646
2545 if (0 && $msg =~ /\[/) { 2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2650 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2652 $self->send_packet ("drawinfo $color $msg")
2550 } 2653 }
2551 } 2654 }
… …
2559=cut 2662=cut
2560 2663
2561sub cf::client::ext_msg($$@) { 2664sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2665 my ($self, $type, @msg) = @_;
2563 2666
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2667 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2669 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2670 push @msg, msgtype => "event_$type";
2671 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2672 }
2673}
2674
2675=item $client->ext_reply ($msgid, @msg)
2676
2677Sends an ext reply to the client.
2678
2679=cut
2680
2681sub cf::client::ext_reply($$@) {
2682 my ($self, $id, @msg) = @_;
2683
2684 if ($self->extcmd == 2) {
2685 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2686 } elsif ($self->extcmd == 1) {
2687 #TODO: version 1, remove
2688 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2689 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2690 }
2572} 2691}
2573 2692
2574=item $success = $client->query ($flags, "text", \&cb) 2693=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2755 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2756 "ARRAY" eq ref $msg
2638 ? @$msg 2757 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2758 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2759
2760 my @reply;
2761
2641 if (my $cb = $EXTICMD{$type}) { 2762 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2763 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2764 }
2765
2766 $ns->ext_reply ($reply, @reply)
2767 if $reply;
2768
2647 } else { 2769 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2770 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2771 }
2650 2772
2651 cf::override; 2773 cf::override;
… …
2698our $safe = new Safe "safe"; 2820our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2821our $safe_hole = new Safe::Hole;
2700 2822
2701$SIG{FPE} = 'IGNORE'; 2823$SIG{FPE} = 'IGNORE';
2702 2824
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2825$safe->permit_only (Opcode::opset qw(
2826 :base_core :base_mem :base_orig :base_math
2827 grepstart grepwhile mapstart mapwhile
2828 sort time
2829));
2704 2830
2705# here we export the classes and methods available to script code 2831# here we export the classes and methods available to script code
2706 2832
2707=pod 2833=pod
2708 2834
2709The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2710 2836
2711 cf::object 2837 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2838 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2839 insert remove name archname title slaying race decrease_ob_nr
2714 2840
2715 cf::object::player 2841 cf::object::player
2716 player 2842 player
2717 2843
2718 cf::player 2844 cf::player
… …
2723 2849
2724=cut 2850=cut
2725 2851
2726for ( 2852for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race
2728 insert remove)], 2855 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2732) { 2859) {
2733 no strict 'refs'; 2860 no strict 'refs';
… …
2809# the server's init and main functions 2936# the server's init and main functions
2810 2937
2811sub load_facedata($) { 2938sub load_facedata($) {
2812 my ($path) = @_; 2939 my ($path) = @_;
2813 2940
2941 # HACK to clear player env face cache, we need some signal framework
2942 # for this (global event?)
2943 %ext::player_env::MUSIC_FACE_CACHE = ();
2944
2945 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2946
2814 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2815 2948
2816 my $facedata; 2949 my $facedata;
2817 0 < aio_load $path, $facedata 2950 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2951 or die "$path: $!";
2819 2952
2820 $facedata = Coro::Storable::thaw $facedata; 2953 $facedata = Coro::Storable::thaw $facedata;
2821 2954
2822 $facedata->{version} == 2 2955 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2956 or cf::cleanup "$path: version mismatch, cannot proceed.";
2957
2958 # patch in the exptable
2959 $facedata->{resource}{"res/exp_table"} = {
2960 type => FT_RSRC,
2961 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2962 };
2963 cf::cede_to_tick;
2824 2964
2825 { 2965 {
2826 my $faces = $facedata->{faceinfo}; 2966 my $faces = $facedata->{faceinfo};
2827 2967
2828 while (my ($face, $info) = each %$faces) { 2968 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2969 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2970 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2971 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2974
2835 cf::cede_to_tick; 2975 cf::cede_to_tick;
2836 } 2976 }
2837 2977
2838 while (my ($face, $info) = each %$faces) { 2978 while (my ($face, $info) = each %$faces) {
… …
2863 3003
2864 { 3004 {
2865 # TODO: for gcfclient pleasure, we should give resources 3005 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3006 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3007 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical; 3008
3009 my $soundconf = delete $res->{"res/sound.conf"};
2869 3010
2870 while (my ($name, $info) = each %$res) { 3011 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({
2872 name => $name,
2873 type => $info->{type},
2874 copyright => $info->{copyright}, #TODO#
2875 });
2876
2877 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3012 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data;
2878 3014
2879 if ($name =~ /\.jpg$/) { 3015 if ($info->{type} & 1) {
2880 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3016 # prepend meta info
2881 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3017
3018 my $meta = $enc->encode ({
3019 name => $name,
3020 %{ $info->{meta} || {} },
3021 });
3022
3023 $data = pack "(w/a*)*", $meta, $info->{data};
2882 } else { 3024 } else {
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3025 $data = $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_type $idx, 1;
2887 cf::face::set_data $idx, 0, $data, $chk;
2888 } 3026 }
2889 3027
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
2890 cf::cede_to_tick; 3031 cf::cede_to_tick;
2891 } 3032 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
2892 } 3051 }
2893 3052
2894 1 3053 1
2895} 3054}
2896 3055
3056register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_;
3058
3059 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v);
3061 }
3062};
3063
2897sub reload_regions { 3064sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = ();
3068
2898 load_resource_file "$MAPDIR/regions" 3069 load_resource_file "$MAPDIR/regions"
2899 or die "unable to load regions file\n"; 3070 or die "unable to load regions file\n";
2900 3071
2901 for (cf::region::list) { 3072 for (cf::region::list) {
2902 $_->{match} = qr/$_->{match}/ 3073 $_->{match} = qr/$_->{match}/
… …
2938 3109
2939sub init { 3110sub init {
2940 reload_resources; 3111 reload_resources;
2941} 3112}
2942 3113
2943sub cfg_load { 3114sub reload_config {
2944 open my $fh, "<:utf8", "$CONFDIR/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
2945 or return; 3116 or return;
2946 3117
2947 local $/; 3118 local $/;
2948 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
… …
2968 (async { 3139 (async {
2969 Event::one_event; 3140 Event::one_event;
2970 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
2971 }; 3142 };
2972 3143
2973 cfg_load; 3144 reload_config;
2974 db_init; 3145 db_init;
2975 load_extensions; 3146 load_extensions;
2976 3147
2977 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
2978 Event::loop; 3149 Event::loop;
… …
3171 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
3172 require cf; 3343 require cf;
3173 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3174 3345
3175 warn "loading config and database again"; 3346 warn "loading config and database again";
3176 cf::cfg_load; 3347 cf::reload_config;
3177 3348
3178 warn "loading extensions"; 3349 warn "loading extensions";
3179 cf::load_extensions; 3350 cf::load_extensions;
3180 3351
3181 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
… …
3274 or die; 3445 or die;
3275 3446
3276 $map->width (50); 3447 $map->width (50);
3277 $map->height (50); 3448 $map->height (50);
3278 $map->alloc; 3449 $map->alloc;
3279 $map->_load_objects ("/tmp/x.map", 1); 3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3280 my $t = Event::time - $t; 3451 my $t = Event::time - $t;
3281 3452
3282 #next unless $t < 0.0013;#d# 3453 #next unless $t < 0.0013;#d#
3283 if ($t < $min) { 3454 if ($t < $min) {
3284 $min = $t; 3455 $min = $t;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines