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.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.356 by root, Tue Sep 4 05:43:21 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
… …
320 my $guard = Coro::guard { 324 my $guard = Coro::guard {
321 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
322 }; 326 };
323 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
324 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
325} 385}
326 386
327=item cf::async { BLOCK } 387=item cf::async { BLOCK }
328 388
329Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
418 478
419=cut 479=cut
420 480
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 481sub fork_call(&@) {
431 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
432 483
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 484 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 487
438 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 489 reset_signals;
452 local $SIG{__WARN__}; 490 &$cb
453 local $SIG{__DIE__}; 491 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 492
460 eval { 493 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 494}
473 495
474=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
475 497
476Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
556 if (1) { 578 if (1) {
557 $md5 = 579 $md5 =
558 join "\x00", 580 join "\x00",
559 $processversion, 581 $processversion,
560 map { 582 map {
561 Coro::cede; 583 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 585 } 0.. $#$src;
564 586
565 587
566 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
982 }, 1004 },
983); 1005);
984 1006
985sub object_freezer_save { 1007sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
987 1011
988 sync_job { 1012 sync_job {
989 if (length $$rdata) { 1013 if (length $$rdata) {
990 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
1015 } 1039 }
1016 } else { 1040 } else {
1017 aio_unlink $filename; 1041 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
1019 } 1043 }
1020 } 1044 };
1045
1046 undef $guard;
1021} 1047}
1022 1048
1023sub object_freezer_as_string { 1049sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
1025 1051
… …
1030 1056
1031sub object_thawer_load { 1057sub object_thawer_load {
1032 my ($filename) = @_; 1058 my ($filename) = @_;
1033 1059
1034 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1035 1063
1036 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
1037 or return; 1065 or return;
1038 1066
1039 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1069 or return;
1070
1071 undef $guard;
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1043 } 1073 }
1044 1074
1045 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1047 return ($data, $av); 1078 ($data, $av)
1048} 1079}
1049 1080
1050=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1051 1082
1052=over 4 1083=over 4
… …
1125 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
1126 1157
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1159
1129 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
1135 } else { 1175 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1177 }
1138 1178
1139 cf::override; 1179 cf::override;
… …
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1317
1278 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1279 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1280 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1281 } 1327 }
1282 } 1328 }
1283} 1329}
1284 1330
… …
1294 1340
1295 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1297 1343
1298 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1299 Coro::cede; 1345 cf::cede_to_tick;
1300} 1346}
1301 1347
1302sub new($) { 1348sub new($) {
1303 my ($login) = @_; 1349 my ($login) = @_;
1304 1350
… …
1308 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1309 1355
1310 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1311 1357
1312 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1313} 1369}
1314 1370
1315=item $pl->quit_character 1371=item $pl->quit_character
1316 1372
1317Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
… …
1372 or return []; 1428 or return [];
1373 1429
1374 my @logins; 1430 my @logins;
1375 1431
1376 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1380 1441
1381 utf8::decode $login; 1442 utf8::decode $login;
1382 push @logins, $login; 1443 push @logins, $login;
1383 } 1444 }
1384 1445
… …
1422sub expand_cfpod { 1483sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1424 1485
1425 # escape & and < 1486 # escape & and <
1426 s/&/&amp;/g; 1487 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1428 1489
1429 # this is buggy, it needs to properly take care of nested <'s 1490 # this is buggy, it needs to properly take care of nested <'s
1430 1491
1431 1 while 1492 1 while
1432 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436 # replace G<male|female> tags 1498 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1439 }ge 1501 }ge
1440 # replace H<hint text> 1502 # replace H<hint text>
… …
1461sub hintmode { 1523sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1525 $_[0]{hintmode}
1464} 1526}
1465 1527
1466=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1467 1529
1468Sends an ext reply to the player. 1530Sends an ext reply to the player.
1469 1531
1470=cut 1532=cut
1471 1533
1472sub ext_reply($$%) { 1534sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1474 1536
1475 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1538}
1478 1539
1479=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1480 1541
1481Sends an ext event to the client. 1542Sends an ext event to the client.
1482 1543
1483=cut 1544=cut
1484 1545
1485sub ext_event($$%) { 1546sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1487 1548
1488 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1489} 1550}
1490 1551
1491=head3 cf::region 1552=head3 cf::region
1492 1553
1493=over 4 1554=over 4
… …
1709 1770
1710sub load_header_from($) { 1771sub load_header_from($) {
1711 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1712 1773
1713 utf8::encode $path; 1774 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1719 1783
1720 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1721 1785
1722 1 1786 1
1723} 1787}
… …
1812 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1813 1877
1814 my $path = $self->{path}; 1878 my $path = $self->{path};
1815 1879
1816 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1817 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1818 1883
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1820 1885
1821 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1822 1887
1823 $self->alloc; 1888 $self->alloc;
1824 1889
1825 $self->pre_load; 1890 $self->pre_load;
1826 Coro::cede; 1891 cf::cede_to_tick;
1827 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1829 or return; 1896 or return;
1830 1897
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1833 1900
1834 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 1902 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 1905 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1839 } 1909 }
1840 } 1910 }
1841 1911
1842 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1843 # now do the right thing for maps 1915 # now do the right thing for maps
1844 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1918 unless $self->difficulty;
1847 Coro::cede; 1919 cf::cede_to_tick;
1848 1920
1849 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1922 $self->decay_objects;
1851 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1852 $self->update_buttons; 1924 $self->update_buttons;
1853 Coro::cede; 1925 cf::cede_to_tick;
1854 $self->set_darkness_map; 1926 $self->set_darkness_map;
1855 Coro::cede; 1927 cf::cede_to_tick;
1856 $self->activate; 1928 $self->activate;
1857 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1858 1933
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1935 }
1861 1936
1862 $self->post_load; 1937 $self->post_load;
… …
1873 1948
1874 $self 1949 $self
1875} 1950}
1876 1951
1877# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1878sub load_diag { 1953sub load_neighbours {
1879 my ($map) = @_; 1954 my ($map) = @_;
1880 1955
1881 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1882 1957
1883 for (0 .. 3) { 1958 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1885 or next; 1960 or next;
1886 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1887 or next; 1962 or next;
1888 $neigh->load; 1963 $neigh->load;
1889 1964
1965 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 1968 }
1893 1969
1894 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1896 or next; 1973 or next;
1897 $neigh->load; 1974 $neigh->load;
1898 } 1975 }
1899} 1976}
1900 1977
… …
1905} 1982}
1906 1983
1907sub do_load_sync { 1984sub do_load_sync {
1908 my ($map) = @_; 1985 my ($map) = @_;
1909 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1910 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1911} 1991}
1912 1992
1913our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1915 1995
1916sub find_async { 1996sub find_async {
1917 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1918 1998
1919 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1920 2000
1921 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2003 }
1924 2004
1925 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1926 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1927 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2010 if (my $map = find $k) {
1930 $map->load; 2011 $map->load if $v;
1931 } 2012 }
1932 2013
1933 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1934 } 2015 }
1935 } 2016 }
1936 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1937 }; 2018 };
1938 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
1941} 2022}
1942 2023
1943sub save { 2024sub save {
1944 my ($self) = @_; 2025 my ($self) = @_;
1945 2026
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2028
1948 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1949 2030
1950 return unless $self->dirty; 2031 return unless $self->dirty;
1951 2032
… …
1974 my ($self) = @_; 2055 my ($self) = @_;
1975 2056
1976 # save first because save cedes 2057 # save first because save cedes
1977 $self->save; 2058 $self->save;
1978 2059
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2061
1981 return if $self->players; 2062 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1984 2065
… …
2036my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
2037 2118
2038sub nuke { 2119sub nuke {
2039 my ($self) = @_; 2120 my ($self) = @_;
2040 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2041 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
2042 2126
2043 $self->unlink_save; 2127 $self->unlink_save;
2044 2128
2045 bless $self, "cf::map"; 2129 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2134
2051 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2052 2137
2053 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2054} 2139}
2055 2140
2056=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2132 2217
2133sub inv_recursive { 2218sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2135} 2220}
2136 2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
2251}
2252
2137package cf; 2253package cf;
2138 2254
2139=back 2255=back
2140 2256
2141=head3 cf::object::player 2257=head3 cf::object::player
… …
2163 2279
2164 } else { 2280 } else {
2165 my $pl = $self->contr; 2281 my $pl = $self->contr;
2166 2282
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2284 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2286
2176 } else { 2287 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2179 } 2290 }
2180 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
2181} 2302}
2182 2303
2183=item $player_object->may ("access") 2304=item $player_object->may ("access")
2184 2305
2185Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
… …
2264 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2267 2388
2268 $map->load; 2389 $map->load;
2269 $map->load_diag; 2390 $map->load_neighbours;
2270 2391
2271 return unless $self->contr->active; 2392 return unless $self->contr->active;
2272 $self->activate_recursive; 2393 $self->activate_recursive;
2273 2394
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2566the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2447 2568
2448=cut 2569=cut
2449 2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2450sub cf::client::send_msg { 2586sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2588
2453 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2454 2590
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case... 2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2458 2595
2459 if (ref $channel) { 2596 if (ref $channel) {
2460 # send meta info to client, if not yet sent 2597 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) { 2598 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel; 2599 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel); 2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2464 } 2602 }
2465 2603
2466 $channel = $channel->{id}; 2604 $channel = $channel->{id};
2467 } 2605 }
2468 2606
2607 return unless @extra || length $msg;
2608
2469 if ($self->can_msg) { 2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2616 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2483 if (0 && $msg =~ /\[/) { 2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2635 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2637 $self->send_packet ("drawinfo $color $msg")
2488 } 2638 }
2489 } 2639 }
2490 } 2640 }
2491} 2641}
2492 2642
2493=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2494 2644
2495Sends an ext event to the client. 2645Sends an ext event to the client.
2496 2646
2497=cut 2647=cut
2498 2648
2499sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2501 2651
2502 return unless $self->extcmd; 2652 if ($self->extcmd == 2) {
2503 2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2506} 2676}
2507 2677
2508=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2509 2679
2510Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
… …
2565 my ($ns, $buf) = @_; 2735 my ($ns, $buf) = @_;
2566 2736
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2738
2569 if (ref $msg) { 2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2747 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2748 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2576 } else { 2754 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2756 }
2579 2757
2580 cf::override; 2758 cf::override;
… …
2627our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2629 2807
2630$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2631 2809
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2633 2815
2634# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2635 2817
2636=pod 2818=pod
2637 2819
2638The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2639 2821
2640 cf::object 2822 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2823 contr pay_amount pay_player map x y force_find force_add
2642 insert remove 2824 insert remove name archname title slaying race decrease_ob_nr
2643 2825
2644 cf::object::player 2826 cf::object::player
2645 player 2827 player
2646 2828
2647 cf::player 2829 cf::player
… …
2652 2834
2653=cut 2835=cut
2654 2836
2655for ( 2837for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2657 insert remove)], 2840 decrease_ob_nr)],
2658 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2661) { 2844) {
2662 no strict 'refs'; 2845 no strict 'refs';
… …
2738# the server's init and main functions 2921# the server's init and main functions
2739 2922
2740sub load_facedata($) { 2923sub load_facedata($) {
2741 my ($path) = @_; 2924 my ($path) = @_;
2742 2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2931
2743 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2744 2933
2745 my $facedata; 2934 my $facedata;
2746 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 2936 or die "$path: $!";
2748 2937
2749 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2750 2939
2751 $facedata->{version} == 2 2940 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2753 2949
2754 { 2950 {
2755 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2756 2952
2757 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 2956 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 2959
2764 cf::cede_to_tick; 2960 cf::cede_to_tick;
2765 } 2961 }
2766 2962
2767 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
… …
2792 2988
2793 { 2989 {
2794 # TODO: for gcfclient pleasure, we should give resources 2990 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 2991 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 2992 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2798 2995
2799 while (my ($name, $info) = each %$res) { 2996 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2807 2999
2808 if ($name =~ /\.jpg$/) { 3000 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3001 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 3009 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3010 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3011 }
2818 3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
2819 cf::cede_to_tick; 3016 cf::cede_to_tick;
2820 } 3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
2821 } 3036 }
2822 3037
2823 1 3038 1
2824} 3039}
2825 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
2826sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2827 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
2829 3056
2830 for (cf::region::list) { 3057 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3058 $_->{match} = qr/$_->{match}/
… …
2867 3094
2868sub init { 3095sub init {
2869 reload_resources; 3096 reload_resources;
2870} 3097}
2871 3098
2872sub cfg_load { 3099sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3101 or return;
2875 3102
2876 local $/; 3103 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
2897 (async { 3124 (async {
2898 Event::one_event; 3125 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2900 }; 3127 };
2901 3128
2902 cfg_load; 3129 reload_config;
2903 db_init; 3130 db_init;
2904 load_extensions; 3131 load_extensions;
2905 3132
2906 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2907 Event::loop; 3134 Event::loop;
… …
3100 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
3101 require cf; 3328 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3330
3104 warn "loading config and database again"; 3331 warn "loading config and database again";
3105 cf::cfg_load; 3332 cf::reload_config;
3106 3333
3107 warn "loading extensions"; 3334 warn "loading extensions";
3108 cf::load_extensions; 3335 cf::load_extensions;
3109 3336
3110 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3203 or die; 3430 or die;
3204 3431
3205 $map->width (50); 3432 $map->width (50);
3206 $map->height (50); 3433 $map->height (50);
3207 $map->alloc; 3434 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3209 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3210 3437
3211 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3212 if ($t < $min) { 3439 if ($t < $min) {
3213 $min = $t; 3440 $min = $t;

Diff Legend

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