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.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43: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 ();
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
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
411 478
412=cut 479=cut
413 480
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 481sub fork_call(&@) {
424 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
425 483
426# 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,
427# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
429 or die "pipe: $!";
430 487
431 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 489 reset_signals;
445 local $SIG{__WARN__}; 490 &$cb
446 local $SIG{__DIE__}; 491 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 492
453 eval { 493 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 494}
466 495
467=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
468 497
469Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
549 if (1) { 578 if (1) {
550 $md5 = 579 $md5 =
551 join "\x00", 580 join "\x00",
552 $processversion, 581 $processversion,
553 map { 582 map {
554 Coro::cede; 583 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 585 } 0.. $#$src;
557 586
558 587
559 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
865 "; 894 ";
866 die if $@; 895 die if $@;
867} 896}
868 897
869our $override; 898our $override;
870our @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?
871 900
872sub override { 901sub override {
873 $override = 1; 902 $override = 1;
874 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
875} 904}
876 905
877sub do_invoke { 906sub do_invoke {
878 my $event = shift; 907 my $event = shift;
879 my $callbacks = shift; 908 my $callbacks = shift;
880 909
881 @invoke_results = (); 910 @INVOKE_RESULTS = ();
882 911
883 local $override; 912 local $override;
884 913
885 for (@$callbacks) { 914 for (@$callbacks) {
886 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
903 932
904Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
905 934
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 938
910=back 939=back
911 940
912=cut 941=cut
913 942
914############################################################################# 943#############################################################################
915# 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}
916 956
917sub reattach { 957sub reattach {
918 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 959 my ($obj) = @_;
920 960
… …
1107 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1108 1148
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1150
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1117 } else { 1166 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1168 }
1120 1169
1121 cf::override; 1170 cf::override;
… …
1276 1325
1277 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1279 1328
1280 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1281 Coro::cede; 1330 cf::cede_to_tick;
1282} 1331}
1283 1332
1284sub new($) { 1333sub new($) {
1285 my ($login) = @_; 1334 my ($login) = @_;
1286 1335
… …
1290 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1291 1340
1292 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1293 1342
1294 $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 (@_);
1295} 1354}
1296 1355
1297=item $pl->quit_character 1356=item $pl->quit_character
1298 1357
1299Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1404sub expand_cfpod { 1463sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1406 1465
1407 # escape & and < 1466 # escape & and <
1408 s/&/&amp;/g; 1467 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1410 1469
1411 # this is buggy, it needs to properly take care of nested <'s 1470 # this is buggy, it needs to properly take care of nested <'s
1412 1471
1413 1 while 1472 1 while
1414 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418 # replace G<male|female> tags 1478 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1421 }ge 1481 }ge
1422 # replace H<hint text> 1482 # replace H<hint text>
… …
1443sub hintmode { 1503sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1; 1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode} 1505 $_[0]{hintmode}
1446} 1506}
1447 1507
1448=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1449 1509
1450Sends an ext reply to the player. 1510Sends an ext reply to the player.
1451 1511
1452=cut 1512=cut
1453 1513
1454sub ext_reply($$%) { 1514sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1456 1516
1457 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1518}
1460 1519
1461=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1462 1521
1463Sends an ext event to the client. 1522Sends an ext event to the client.
1464 1523
1465=cut 1524=cut
1466 1525
1467sub ext_event($$%) { 1526sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1469 1528
1470 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1471} 1530}
1472 1531
1473=head3 cf::region 1532=head3 cf::region
1474 1533
1475=over 4 1534=over 4
… …
1488 my ($path) = @_; 1547 my ($path) = @_;
1489 1548
1490 my ($match, $specificity); 1549 my ($match, $specificity);
1491 1550
1492 for my $region (list) { 1551 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1552 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1553 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1554 if $region->specificity > $specificity;
1496 } 1555 }
1497 } 1556 }
1498 1557
… …
1618 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1619 return $self; 1678 return $self;
1620 } 1679 }
1621 } 1680 }
1622 1681
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1683 ()
1625} 1684}
1626 1685
1627sub init { 1686sub init {
1628 my ($self) = @_; 1687 my ($self) = @_;
… …
1794 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1795 1854
1796 my $path = $self->{path}; 1855 my $path = $self->{path};
1797 1856
1798 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1799 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1800 1860
1801 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1802 1862
1803 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1804 1864
1805 $self->alloc; 1865 $self->alloc;
1806 1866
1807 $self->pre_load; 1867 $self->pre_load;
1808 Coro::cede; 1868 cf::cede_to_tick;
1809 1869
1810 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1811 or return; 1871 or return;
1812 1872
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1819 $self->clear_unique_items; 1879 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1821 } 1881 }
1822 } 1882 }
1823 1883
1824 Coro::cede; 1884 cf::cede_to_tick;
1825 # now do the right thing for maps 1885 # now do the right thing for maps
1826 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 1888 unless $self->difficulty;
1829 Coro::cede; 1889 cf::cede_to_tick;
1830 1890
1831 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 1892 $self->decay_objects;
1833 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1834 $self->update_buttons; 1894 $self->update_buttons;
1835 Coro::cede; 1895 cf::cede_to_tick;
1836 $self->set_darkness_map; 1896 $self->set_darkness_map;
1837 Coro::cede; 1897 cf::cede_to_tick;
1838 $self->activate; 1898 $self->activate;
1839 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1840 1903
1841 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1842 } 1905 }
1843 1906
1844 $self->post_load; 1907 $self->post_load;
… …
1855 1918
1856 $self 1919 $self
1857} 1920}
1858 1921
1859# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1860sub load_diag { 1923sub load_neighbours {
1861 my ($map) = @_; 1924 my ($map) = @_;
1862 1925
1863 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1864 1927
1865 for (0 .. 3) { 1928 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1867 or next; 1930 or next;
1868 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1869 or next; 1932 or next;
1870 $neigh->load; 1933 $neigh->load;
1871 1934
1935 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 1938 }
1875 1939
1876 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1878 or next; 1943 or next;
1879 $neigh->load; 1944 $neigh->load;
1880 } 1945 }
1881} 1946}
1882 1947
… …
1887} 1952}
1888 1953
1889sub do_load_sync { 1954sub do_load_sync {
1890 my ($map) = @_; 1955 my ($map) = @_;
1891 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1892 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1893} 1961}
1894 1962
1895our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1897 1965
1898sub find_async { 1966sub find_async {
1899 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1900 1968
1901 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1902 1970
1903 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1905 } 1973 }
1906 1974
1907 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1908 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1909 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 1980 if (my $map = find $k) {
1912 or next;
1913 $map->load; 1981 $map->load if $v;
1982 }
1914 1983
1915 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1916 } 1985 }
1917 } 1986 }
1918 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1919 }; 1988 };
1920 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1923} 1992}
1924 1993
1925sub save { 1994sub save {
1926 my ($self) = @_; 1995 my ($self) = @_;
1927 1996
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 1998
1930 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1931 2000
1932 return unless $self->dirty; 2001 return unless $self->dirty;
1933 2002
… …
1956 my ($self) = @_; 2025 my ($self) = @_;
1957 2026
1958 # save first because save cedes 2027 # save first because save cedes
1959 $self->save; 2028 $self->save;
1960 2029
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2031
1963 return if $self->players; 2032 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1965 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1966 2035
… …
2018my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2019 2088
2020sub nuke { 2089sub nuke {
2021 my ($self) = @_; 2090 my ($self) = @_;
2022 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2023 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2024 2096
2025 $self->unlink_save; 2097 $self->unlink_save;
2026 2098
2027 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2104
2033 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2034 2107
2035 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2036} 2109}
2037 2110
2038=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2145 2218
2146 } else { 2219 } else {
2147 my $pl = $self->contr; 2220 my $pl = $self->contr;
2148 2221
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2225
2158 } else { 2226 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2161 } 2229 }
2162 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
2163} 2241}
2164 2242
2165=item $player_object->may ("access") 2243=item $player_object->may ("access")
2166 2244
2167Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2246 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2249 2327
2250 $map->load; 2328 $map->load;
2251 $map->load_diag; 2329 $map->load_neighbours;
2252 2330
2253 return unless $self->contr->active; 2331 return unless $self->contr->active;
2254 $self->activate_recursive; 2332 $self->activate_recursive;
2255 2333
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
2258} 2336}
2259 2337
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2339
2262Moves the player to the given map-path and coordinates by first freezing 2340Moves the player to the given map-path and coordinates by first freezing
2263her, loading and preparing them map, calling the provided $check callback 2341her, loading and preparing them map, calling the provided $check callback
2264that has to return the map if sucecssful, and then unfreezes the player on 2342that has to return the map if sucecssful, and then unfreezes the player on
2265the new (success) or old (failed) map position. 2343the new (success) or old (failed) map position. In either case, $done will
2344be called at the end of this process.
2266 2345
2267=cut 2346=cut
2268 2347
2269our $GOTOGEN; 2348our $GOTOGEN;
2270 2349
2271sub cf::object::player::goto { 2350sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2352
2274 # do generation counting so two concurrent goto's will be executed in-order 2353 # do generation counting so two concurrent goto's will be executed in-order
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2355
2277 $self->enter_link; 2356 $self->enter_link;
… …
2297 2376
2298 if ($gen == $self->{_goto_generation}) { 2377 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2378 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2301 } 2380 }
2381
2382 $done->() if $done;
2302 })->prio (1); 2383 })->prio (1);
2303} 2384}
2304 2385
2305=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
2306 2387
… …
2415 2496
2416 utf8::encode $text; 2497 utf8::encode $text;
2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2418} 2499}
2419 2500
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2502
2422Send a drawinfo or msg packet to the client, formatting the msg for the 2503Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of 2504client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2426 2507
2427=cut 2508=cut
2428 2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2429sub cf::client::send_msg { 2525sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2527
2432 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2433 2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2541 }
2542
2543 $channel = $channel->{id};
2544 }
2545
2434 return unless @extra || length $msg; 2546 return unless @extra || length $msg;
2435 2547
2436 if ($self->can_msg) { 2548 if ($self->can_msg) {
2549 # default colour, mask it out
2550 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2551 if $color & cf::NDI_DEF;
2552
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2553 $self->send_packet ("msg " . $self->{json_coder}->encode (
2554 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2438 } else { 2555 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) { 2556 if ($color >= 0) {
2557 # replace some tags by gcfclient-compatible ones
2558 for ($msg) {
2559 1 while
2560 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2561 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2562 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2563 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2565 }
2566
2567 $color &= cf::NDI_COLOR_MASK;
2568
2569 utf8::encode $msg;
2570
2450 if (0 && $msg =~ /\[/) { 2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2574 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2576 $self->send_packet ("drawinfo $color $msg")
2455 } 2577 }
2456 } 2578 }
2457 } 2579 }
2458} 2580}
2459 2581
2460=item $client->ext_event ($type, %msg) 2582=item $client->ext_msg ($type, @msg)
2461 2583
2462Sends an ext event to the client. 2584Sends an ext event to the client.
2463 2585
2464=cut 2586=cut
2465 2587
2466sub cf::client::ext_event($$%) { 2588sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2589 my ($self, $type, @msg) = @_;
2468 2590
2591 if ($self->extcmd == 2) {
2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 2594 push @msg, msgtype => "event_$type";
2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2614 }
2471} 2615}
2472 2616
2473=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
2474 2618
2475Queues a query to the client, calling the given callback with 2619Queues a query to the client, calling the given callback with
… …
2530 my ($ns, $buf) = @_; 2674 my ($ns, $buf) = @_;
2531 2675
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2676 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2677
2534 if (ref $msg) { 2678 if (ref $msg) {
2679 my ($type, $reply, @payload) =
2680 "ARRAY" eq ref $msg
2681 ? @$msg
2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2683
2684 my @reply;
2685
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2686 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2687 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2541 } else { 2693 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 } 2695 }
2544 2696
2545 cf::override; 2697 cf::override;
… …
2592our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
2594 2746
2595$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
2596 2748
2597$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2749$safe->permit_only (Opcode::opset qw(
2750 :base_core :base_mem :base_orig :base_math
2751 grepstart grepwhile mapstart mapwhile
2752 sort time
2753));
2598 2754
2599# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
2600 2756
2601=pod 2757=pod
2602 2758
2603The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2604 2760
2605 cf::object 2761 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 2762 contr pay_amount pay_player map x y force_find force_add
2607 insert remove 2763 insert remove name archname title slaying race decrease_ob_nr
2608 2764
2609 cf::object::player 2765 cf::object::player
2610 player 2766 player
2611 2767
2612 cf::player 2768 cf::player
… …
2617 2773
2618=cut 2774=cut
2619 2775
2620for ( 2776for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race
2622 insert remove)], 2779 decrease_ob_nr)],
2623 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2626) { 2783) {
2627 no strict 'refs'; 2784 no strict 'refs';
… …
2703# the server's init and main functions 2860# the server's init and main functions
2704 2861
2705sub load_facedata($) { 2862sub load_facedata($) {
2706 my ($path) = @_; 2863 my ($path) = @_;
2707 2864
2865 # HACK to clear player env face cache, we need some signal framework
2866 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2868
2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2870
2708 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2709 2872
2710 my $facedata; 2873 my $facedata;
2711 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 2875 or die "$path: $!";
… …
2714 $facedata = Coro::Storable::thaw $facedata; 2877 $facedata = Coro::Storable::thaw $facedata;
2715 2878
2716 $facedata->{version} == 2 2879 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 2881
2882 # patch in the exptable
2883 $facedata->{resource}{"res/exp_table"} = {
2884 type => FT_RSRC,
2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2886 };
2887 cf::cede_to_tick;
2888
2719 { 2889 {
2720 my $faces = $facedata->{faceinfo}; 2890 my $faces = $facedata->{faceinfo};
2721 2891
2722 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2895 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 2898
2899 cf::cede_to_tick;
2728 } 2900 }
2729 2901
2730 while (my ($face, $info) = each %$faces) { 2902 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 2903 next unless $info->{smooth};
2732 my $idx = cf::face::find $face 2904 my $idx = cf::face::find $face
2733 or next; 2905 or next;
2734 if (my $smooth = cf::face::find $info->{smooth}) { 2906 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 2909 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2910 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 2911 }
2739 Coro::cede; 2912
2913 cf::cede_to_tick;
2740 } 2914 }
2741 } 2915 }
2742 2916
2743 { 2917 {
2744 my $anims = $facedata->{animinfo}; 2918 my $anims = $facedata->{animinfo};
2745 2919
2746 while (my ($anim, $info) = each %$anims) { 2920 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2921 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 2922 cf::cede_to_tick;
2749 } 2923 }
2750 2924
2751 cf::anim::invalidate_all; # d'oh 2925 cf::anim::invalidate_all; # d'oh
2752 } 2926 }
2753 2927
2928 {
2929 # TODO: for gcfclient pleasure, we should give resources
2930 # that gcfclient doesn't grok a >10000 face index.
2931 my $res = $facedata->{resource};
2932
2933 my $soundconf = delete $res->{"res/sound.conf"};
2934
2935 while (my ($name, $info) = each %$res) {
2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2938
2939 if ($info->{type} & 1) {
2940 # prepend meta info
2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2947 $data = pack "(w/a*)*", $meta, $info->{data};
2948 } else {
2949 $data = $info->{data};
2950 }
2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2955 cf::cede_to_tick;
2956 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2975 }
2976
2754 1 2977 1
2755} 2978}
2756 2979
2980register_exticmd fx_want => sub {
2981 my ($ns, $want) = @_;
2982
2983 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v);
2985 }
2986};
2987
2757sub reload_regions { 2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2758 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2759 or die "unable to load regions file\n"; 2994 or die "unable to load regions file\n";
2995
2996 for (cf::region::list) {
2997 $_->{match} = qr/$_->{match}/
2998 if exists $_->{match};
2999 }
2760} 3000}
2761 3001
2762sub reload_facedata { 3002sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3003 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3004 or die "unable to load facedata\n";
… …
2793 3033
2794sub init { 3034sub init {
2795 reload_resources; 3035 reload_resources;
2796} 3036}
2797 3037
2798sub cfg_load { 3038sub reload_config {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3040 or return;
2801 3041
2802 local $/; 3042 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
2823 (async { 3063 (async {
2824 Event::one_event; 3064 Event::one_event;
2825 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
2826 }; 3066 };
2827 3067
2828 cfg_load; 3068 reload_config;
2829 db_init; 3069 db_init;
2830 load_extensions; 3070 load_extensions;
2831 3071
2832 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
2833 Event::loop; 3073 Event::loop;
… …
3026 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
3027 require cf; 3267 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029 3269
3030 warn "loading config and database again"; 3270 warn "loading config and database again";
3031 cf::cfg_load; 3271 cf::reload_config;
3032 3272
3033 warn "loading extensions"; 3273 warn "loading extensions";
3034 cf::load_extensions; 3274 cf::load_extensions;
3035 3275
3036 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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