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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.354 by root, Sun Sep 2 12:26:54 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 ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
170 178
171=back 179=back
172 180
173=cut 181=cut
174 182
… …
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
267returned. 275returned.
268 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
269Lock 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
270uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
271 282
272=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
273 284
… …
313 my $guard = Coro::guard { 324 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
315 }; 326 };
316 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
317 $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;
318} 385}
319 386
320=item cf::async { BLOCK } 387=item cf::async { BLOCK }
321 388
322Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
412=cut 479=cut
413 480
414sub fork_call(&@) { 481sub fork_call(&@) {
415 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
416 483
417# 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,
418# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
420 or die "pipe: $!";
421 487
422 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 489 reset_signals;
436 local $SIG{__WARN__}; 490 &$cb
437 local $SIG{__DIE__}; 491 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 492
443 my @res = eval { $cb->(@args) }; 493 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 494}
461 495
462=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
463 497
464Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
544 if (1) { 578 if (1) {
545 $md5 = 579 $md5 =
546 join "\x00", 580 join "\x00",
547 $processversion, 581 $processversion,
548 map { 582 map {
549 Coro::cede; 583 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 585 } 0.. $#$src;
552 586
553 587
554 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
860 "; 894 ";
861 die if $@; 895 die if $@;
862} 896}
863 897
864our $override; 898our $override;
865our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
866 900
867sub override { 901sub override {
868 $override = 1; 902 $override = 1;
869 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
870} 904}
871 905
872sub do_invoke { 906sub do_invoke {
873 my $event = shift; 907 my $event = shift;
874 my $callbacks = shift; 908 my $callbacks = shift;
875 909
876 @invoke_results = (); 910 @INVOKE_RESULTS = ();
877 911
878 local $override; 912 local $override;
879 913
880 for (@$callbacks) { 914 for (@$callbacks) {
881 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
898 932
899Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
900 934
901This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
902removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
903results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 938
905=back 939=back
906 940
907=cut 941=cut
908 942
909############################################################################# 943#############################################################################
910# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
911 956
912sub reattach { 957sub reattach {
913 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 959 my ($obj) = @_;
915 960
… …
1102 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1103 1148
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1150
1106 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1112 } else { 1166 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1168 }
1115 1169
1116 cf::override; 1170 cf::override;
… …
1271 1325
1272 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1274 1328
1275 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1276 Coro::cede; 1330 cf::cede_to_tick;
1277} 1331}
1278 1332
1279sub new($) { 1333sub new($) {
1280 my ($login) = @_; 1334 my ($login) = @_;
1281 1335
… …
1285 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1286 1340
1287 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1288 1342
1289 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1290} 1354}
1291 1355
1292=item $pl->quit_character 1356=item $pl->quit_character
1293 1357
1294Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1349 or return []; 1413 or return [];
1350 1414
1351 my @logins; 1415 my @logins;
1352 1416
1353 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1418 my $path = path $login;
1419
1420 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1357 1426
1358 utf8::decode $login; 1427 utf8::decode $login;
1359 push @logins, $login; 1428 push @logins, $login;
1360 } 1429 }
1361 1430
… …
1399sub expand_cfpod { 1468sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1469 ((my $self), (local $_)) = @_;
1401 1470
1402 # escape & and < 1471 # escape & and <
1403 s/&/&amp;/g; 1472 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g; 1473 s/(?<![BIUGHT])</&lt;/g;
1405 1474
1406 # this is buggy, it needs to properly take care of nested <'s 1475 # this is buggy, it needs to properly take care of nested <'s
1407 1476
1408 1 while 1477 1 while
1409 # replace B<>, I<>, U<> etc. 1478 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1479 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413 # replace G<male|female> tags 1483 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1484 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1 1485 $self->gender ? $2 : $1
1416 }ge 1486 }ge
1417 # replace H<hint text> 1487 # replace H<hint text>
… …
1438sub hintmode { 1508sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1509 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1510 $_[0]{hintmode}
1441} 1511}
1442 1512
1443=item $player->ext_reply ($msgid, %msg) 1513=item $player->ext_reply ($msgid, @msg)
1444 1514
1445Sends an ext reply to the player. 1515Sends an ext reply to the player.
1446 1516
1447=cut 1517=cut
1448 1518
1449sub ext_reply($$%) { 1519sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1520 my ($self, $id, @msg) = @_;
1451 1521
1452 $msg{msgid} = $id; 1522 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1523}
1455 1524
1456=item $player->ext_event ($type, %msg) 1525=item $player->ext_msg ($type, @msg)
1457 1526
1458Sends an ext event to the client. 1527Sends an ext event to the client.
1459 1528
1460=cut 1529=cut
1461 1530
1462sub ext_event($$%) { 1531sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1532 my ($self, $type, @msg) = @_;
1464 1533
1465 $self->ns->ext_event ($type, %msg); 1534 $self->ns->ext_msg ($type, @msg);
1466} 1535}
1467 1536
1468=head3 cf::region 1537=head3 cf::region
1469 1538
1470=over 4 1539=over 4
… …
1483 my ($path) = @_; 1552 my ($path) = @_;
1484 1553
1485 my ($match, $specificity); 1554 my ($match, $specificity);
1486 1555
1487 for my $region (list) { 1556 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1557 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1558 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1559 if $region->specificity > $specificity;
1491 } 1560 }
1492 } 1561 }
1493 1562
… …
1613 $self->init; # pass $1 etc. 1682 $self->init; # pass $1 etc.
1614 return $self; 1683 return $self;
1615 } 1684 }
1616 } 1685 }
1617 1686
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1687 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1688 ()
1620} 1689}
1621 1690
1622sub init { 1691sub init {
1623 my ($self) = @_; 1692 my ($self) = @_;
… …
1789 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1790 1859
1791 my $path = $self->{path}; 1860 my $path = $self->{path};
1792 1861
1793 { 1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1794 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1795 1865
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1797 1867
1798 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1799 1869
1800 $self->alloc; 1870 $self->alloc;
1801 1871
1802 $self->pre_load; 1872 $self->pre_load;
1803 Coro::cede; 1873 cf::cede_to_tick;
1804 1874
1805 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1806 or return; 1876 or return;
1807 1877
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1814 $self->clear_unique_items; 1884 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1816 } 1886 }
1817 } 1887 }
1818 1888
1819 Coro::cede; 1889 cf::cede_to_tick;
1820 # now do the right thing for maps 1890 # now do the right thing for maps
1821 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 1893 unless $self->difficulty;
1824 Coro::cede; 1894 cf::cede_to_tick;
1825 1895
1826 unless ($self->{deny_activate}) { 1896 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 1897 $self->decay_objects;
1828 $self->fix_auto_apply; 1898 $self->fix_auto_apply;
1829 $self->update_buttons; 1899 $self->update_buttons;
1830 Coro::cede; 1900 cf::cede_to_tick;
1831 $self->set_darkness_map; 1901 $self->set_darkness_map;
1832 Coro::cede; 1902 cf::cede_to_tick;
1833 $self->activate; 1903 $self->activate;
1834 } 1904 }
1905
1906 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME);
1835 1908
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1909 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1910 }
1838 1911
1839 $self->post_load; 1912 $self->post_load;
… …
1850 1923
1851 $self 1924 $self
1852} 1925}
1853 1926
1854# find and load all maps in the 3x3 area around a map 1927# find and load all maps in the 3x3 area around a map
1855sub load_diag { 1928sub load_neighbours {
1856 my ($map) = @_; 1929 my ($map) = @_;
1857 1930
1858 my @diag; # diagonal neighbours 1931 my @neigh; # diagonal neighbours
1859 1932
1860 for (0 .. 3) { 1933 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1934 my $neigh = $map->tile_path ($_)
1862 or next; 1935 or next;
1863 $neigh = find $neigh, $map 1936 $neigh = find $neigh, $map
1864 or next; 1937 or next;
1865 $neigh->load; 1938 $neigh->load;
1866 1939
1940 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1941 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1942 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 1943 }
1870 1944
1871 for (@diag) { 1945 for (grep defined $_->[0], @neigh) {
1946 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 1947 my $neigh = find $path, $origin
1873 or next; 1948 or next;
1874 $neigh->load; 1949 $neigh->load;
1875 } 1950 }
1876} 1951}
1877 1952
… …
1882} 1957}
1883 1958
1884sub do_load_sync { 1959sub do_load_sync {
1885 my ($map) = @_; 1960 my ($map) = @_;
1886 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1887 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1888} 1966}
1889 1967
1890our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1892 1970
1893sub find_async { 1971sub find_async {
1894 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1895 1973
1896 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1897 1975
1898 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 1978 }
1901 1979
1902 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1903 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 1985 if (my $map = find $k) {
1907 or next;
1908 $map->load; 1986 $map->load if $v;
1987 }
1909 1988
1910 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
1911 } 1990 }
1912 } 1991 }
1913 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
1914 }; 1993 };
1915 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
… …
1918} 1997}
1919 1998
1920sub save { 1999sub save {
1921 my ($self) = @_; 2000 my ($self) = @_;
1922 2001
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2003
1925 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1926 2005
1927 return unless $self->dirty; 2006 return unless $self->dirty;
1928 2007
… …
1951 my ($self) = @_; 2030 my ($self) = @_;
1952 2031
1953 # save first because save cedes 2032 # save first because save cedes
1954 $self->save; 2033 $self->save;
1955 2034
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2036
1958 return if $self->players; 2037 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2039 return if $self->{deny_save};
1961 2040
… …
2013my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
2014 2093
2015sub nuke { 2094sub nuke {
2016 my ($self) = @_; 2095 my ($self) = @_;
2017 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2018 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2019 2101
2020 $self->unlink_save; 2102 $self->unlink_save;
2021 2103
2022 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2109
2028 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2029 2112
2030 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2031} 2114}
2032 2115
2033=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2140 2223
2141 } else { 2224 } else {
2142 my $pl = $self->contr; 2225 my $pl = $self->contr;
2143 2226
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2227 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2228 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2230
2153 } else { 2231 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2232 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2233 $self->message ($msg, $flags);
2156 } 2234 }
2157 } 2235 }
2236}
2237
2238=item $object->send_msg ($channel, $msg, $color, [extra...])
2239
2240=cut
2241
2242sub cf::object::send_msg {
2243 my $pl = shift->contr
2244 or return;
2245 $pl->send_msg (@_);
2158} 2246}
2159 2247
2160=item $player_object->may ("access") 2248=item $player_object->may ("access")
2161 2249
2162Returns wether the given player is authorized to access resource "access" 2250Returns wether the given player is authorized to access resource "access"
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2329 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2330 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2331 if $x <=0 && $y <= 0;
2244 2332
2245 $map->load; 2333 $map->load;
2246 $map->load_diag; 2334 $map->load_neighbours;
2247 2335
2248 return unless $self->contr->active; 2336 return unless $self->contr->active;
2249 $self->activate_recursive; 2337 $self->activate_recursive;
2250 2338
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2340 $self->enter_map ($map, $x, $y);
2253} 2341}
2254 2342
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2344
2257Moves the player to the given map-path and coordinates by first freezing 2345Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2346her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2347that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2348the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process.
2261 2350
2262=cut 2351=cut
2263 2352
2264our $GOTOGEN; 2353our $GOTOGEN;
2265 2354
2266sub cf::object::player::goto { 2355sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2356 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2357
2269 # do generation counting so two concurrent goto's will be executed in-order 2358 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2360
2272 $self->enter_link; 2361 $self->enter_link;
… …
2292 2381
2293 if ($gen == $self->{_goto_generation}) { 2382 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2383 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2384 $self->leave_link ($map, $x, $y);
2296 } 2385 }
2386
2387 $done->() if $done;
2297 })->prio (1); 2388 })->prio (1);
2298} 2389}
2299 2390
2300=item $player_object->enter_exit ($exit_object) 2391=item $player_object->enter_exit ($exit_object)
2301 2392
… …
2410 2501
2411 utf8::encode $text; 2502 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2504}
2414 2505
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2506=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2507
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2508Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2509client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2510the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2421 2512
2422=cut 2513=cut
2423 2514
2515our %CHANNEL = (
2516 "c/identify" => {
2517 id => "identify",
2518 title => "Identify",
2519 reply => undef,
2520 tooltip => "Items recently identified",
2521 },
2522 "c/examine" => {
2523 id => "examine",
2524 title => "Examine",
2525 reply => undef,
2526 tooltip => "Signs and other items you examined",
2527 },
2528);
2529
2424sub cf::client::send_msg { 2530sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2532
2427 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2428 2534
2535 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536
2537 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2539
2540 if (ref $channel) {
2541 # send meta info to client, if not yet sent
2542 unless (exists $self->{channel}{$channel->{id}}) {
2543 $self->{channel}{$channel->{id}} = $channel;
2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2546 }
2547
2548 $channel = $channel->{id};
2549 }
2550
2429 return unless @extra || length $msg; 2551 return unless @extra || length $msg;
2430 2552
2431 if ($self->can_msg) { 2553 if ($self->can_msg) {
2554 # default colour, mask it out
2555 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2556 if $color & cf::NDI_DEF;
2557
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2558 $self->send_packet ("msg " . $self->{json_coder}->encode (
2559 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2560 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2561 if ($color >= 0) {
2562 # replace some tags by gcfclient-compatible ones
2563 for ($msg) {
2564 1 while
2565 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2566 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2567 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2568 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2569 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2570 }
2571
2572 $color &= cf::NDI_COLOR_MASK;
2573
2574 utf8::encode $msg;
2575
2445 if (0 && $msg =~ /\[/) { 2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2579 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2450 } 2582 }
2451 } 2583 }
2452 } 2584 }
2453} 2585}
2454 2586
2455=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2456 2588
2457Sends an ext event to the client. 2589Sends an ext event to the client.
2458 2590
2459=cut 2591=cut
2460 2592
2461sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2463 2595
2596 if ($self->extcmd == 2) {
2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2598 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2599 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2600 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2601 }
2602}
2603
2604=item $client->ext_reply ($msgid, @msg)
2605
2606Sends an ext reply to the client.
2607
2608=cut
2609
2610sub cf::client::ext_reply($$@) {
2611 my ($self, $id, @msg) = @_;
2612
2613 if ($self->extcmd == 2) {
2614 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2615 } elsif ($self->extcmd == 1) {
2616 #TODO: version 1, remove
2617 unshift @msg, msgtype => "reply", msgid => $id;
2618 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2619 }
2466} 2620}
2467 2621
2468=item $success = $client->query ($flags, "text", \&cb) 2622=item $success = $client->query ($flags, "text", \&cb)
2469 2623
2470Queues a query to the client, calling the given callback with 2624Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2679 my ($ns, $buf) = @_;
2526 2680
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2681 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2682
2529 if (ref $msg) { 2683 if (ref $msg) {
2684 my ($type, $reply, @payload) =
2685 "ARRAY" eq ref $msg
2686 ? @$msg
2687 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2688
2689 my @reply;
2690
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2691 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2692 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2693 }
2694
2695 $ns->ext_reply ($reply, @reply)
2696 if $reply;
2697
2536 } else { 2698 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2699 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2700 }
2539 2701
2540 cf::override; 2702 cf::override;
… …
2587our $safe = new Safe "safe"; 2749our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2750our $safe_hole = new Safe::Hole;
2589 2751
2590$SIG{FPE} = 'IGNORE'; 2752$SIG{FPE} = 'IGNORE';
2591 2753
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2754$safe->permit_only (Opcode::opset qw(
2755 :base_core :base_mem :base_orig :base_math
2756 grepstart grepwhile mapstart mapwhile
2757 sort time
2758));
2593 2759
2594# here we export the classes and methods available to script code 2760# here we export the classes and methods available to script code
2595 2761
2596=pod 2762=pod
2597 2763
2598The following functions and methods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2599 2765
2600 cf::object 2766 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 2767 contr pay_amount pay_player map x y force_find force_add
2602 insert remove 2768 insert remove name archname title slaying race decrease_ob_nr
2603 2769
2604 cf::object::player 2770 cf::object::player
2605 player 2771 player
2606 2772
2607 cf::player 2773 cf::player
… …
2612 2778
2613=cut 2779=cut
2614 2780
2615for ( 2781for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race
2617 insert remove)], 2784 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2621) { 2788) {
2622 no strict 'refs'; 2789 no strict 'refs';
… …
2698# the server's init and main functions 2865# the server's init and main functions
2699 2866
2700sub load_facedata($) { 2867sub load_facedata($) {
2701 my ($path) = @_; 2868 my ($path) = @_;
2702 2869
2870 # HACK to clear player env face cache, we need some signal framework
2871 # for this (global event?)
2872 %ext::player_env::MUSIC_FACE_CACHE = ();
2873
2874 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2875
2703 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2704 2877
2705 my $facedata; 2878 my $facedata;
2706 0 < aio_load $path, $facedata 2879 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2880 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 2882 $facedata = Coro::Storable::thaw $facedata;
2710 2883
2711 $facedata->{version} == 2 2884 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2885 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 2886
2887 # patch in the exptable
2888 $facedata->{resource}{"res/exp_table"} = {
2889 type => FT_RSRC,
2890 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2891 };
2892 cf::cede_to_tick;
2893
2714 { 2894 {
2715 my $faces = $facedata->{faceinfo}; 2895 my $faces = $facedata->{faceinfo};
2716 2896
2717 while (my ($face, $info) = each %$faces) { 2897 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2898 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2899 cf::face::set_visibility $idx, $info->{visibility};
2900 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 2903
2904 cf::cede_to_tick;
2723 } 2905 }
2724 2906
2725 while (my ($face, $info) = each %$faces) { 2907 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2908 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2909 my $idx = cf::face::find $face
2728 or next; 2910 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2911 if (my $smooth = cf::face::find $info->{smooth}) {
2912 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2913 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2914 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2915 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2916 }
2734 Coro::cede; 2917
2918 cf::cede_to_tick;
2735 } 2919 }
2736 } 2920 }
2737 2921
2738 { 2922 {
2739 my $anims = $facedata->{animinfo}; 2923 my $anims = $facedata->{animinfo};
2740 2924
2741 while (my ($anim, $info) = each %$anims) { 2925 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2926 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2927 cf::cede_to_tick;
2744 } 2928 }
2745 2929
2746 cf::anim::invalidate_all; # d'oh 2930 cf::anim::invalidate_all; # d'oh
2747 } 2931 }
2748 2932
2933 {
2934 # TODO: for gcfclient pleasure, we should give resources
2935 # that gcfclient doesn't grok a >10000 face index.
2936 my $res = $facedata->{resource};
2937
2938 my $soundconf = delete $res->{"res/sound.conf"};
2939
2940 while (my ($name, $info) = each %$res) {
2941 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data;
2943
2944 if ($info->{type} & 1) {
2945 # prepend meta info
2946
2947 my $meta = $enc->encode ({
2948 name => $name,
2949 %{ $info->{meta} || {} },
2950 });
2951
2952 $data = pack "(w/a*)*", $meta, $info->{data};
2953 } else {
2954 $data = $info->{data};
2955 }
2956
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2960 cf::cede_to_tick;
2961 }
2962
2963 if ($soundconf) {
2964 $soundconf = $enc->decode (delete $soundconf->{data});
2965
2966 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2967 my $sound = $soundconf->{compat}[$_]
2968 or next;
2969
2970 my $face = cf::face::find "sound/$sound->[1]";
2971 cf::sound::set $sound->[0] => $face;
2972 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2973 }
2974
2975 while (my ($k, $v) = each %{$soundconf->{event}}) {
2976 my $face = cf::face::find "sound/$v";
2977 cf::sound::set $k => $face;
2978 }
2979 }
2980 }
2981
2749 1 2982 1
2750} 2983}
2751 2984
2985register_exticmd fx_want => sub {
2986 my ($ns, $want) = @_;
2987
2988 while (my ($k, $v) = each %$want) {
2989 $ns->fx_want ($k, $v);
2990 }
2991};
2992
2752sub reload_regions { 2993sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = ();
2997
2753 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 2999 or die "unable to load regions file\n";
3000
3001 for (cf::region::list) {
3002 $_->{match} = qr/$_->{match}/
3003 if exists $_->{match};
3004 }
2755} 3005}
2756 3006
2757sub reload_facedata { 3007sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3008 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3009 or die "unable to load facedata\n";
… …
2788 3038
2789sub init { 3039sub init {
2790 reload_resources; 3040 reload_resources;
2791} 3041}
2792 3042
2793sub cfg_load { 3043sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3045 or return;
2796 3046
2797 local $/; 3047 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
… …
2818 (async { 3068 (async {
2819 Event::one_event; 3069 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
2821 }; 3071 };
2822 3072
2823 cfg_load; 3073 reload_config;
2824 db_init; 3074 db_init;
2825 load_extensions; 3075 load_extensions;
2826 3076
2827 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
2828 Event::loop; 3078 Event::loop;
… …
3021 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
3022 require cf; 3272 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3274
3025 warn "loading config and database again"; 3275 warn "loading config and database again";
3026 cf::cfg_load; 3276 cf::reload_config;
3027 3277
3028 warn "loading extensions"; 3278 warn "loading extensions";
3029 cf::load_extensions; 3279 cf::load_extensions;
3030 3280
3031 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";

Diff Legend

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