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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.352 by root, Sun Sep 2 04:57:14 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 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 489 reset_signals;
435 local $SIG{__WARN__}; 490 &$cb
436 local $SIG{__DIE__}; 491 }, @args;
437 eval {
438 close $fh1;
439 492
440 my @res = eval { $cb->(@args) }; 493 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 494}
448 495
449=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
450 497
451Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
531 if (1) { 578 if (1) {
532 $md5 = 579 $md5 =
533 join "\x00", 580 join "\x00",
534 $processversion, 581 $processversion,
535 map { 582 map {
536 Coro::cede; 583 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 585 } 0.. $#$src;
539 586
540 587
541 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
847 "; 894 ";
848 die if $@; 895 die if $@;
849} 896}
850 897
851our $override; 898our $override;
852our @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?
853 900
854sub override { 901sub override {
855 $override = 1; 902 $override = 1;
856 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
857} 904}
858 905
859sub do_invoke { 906sub do_invoke {
860 my $event = shift; 907 my $event = shift;
861 my $callbacks = shift; 908 my $callbacks = shift;
862 909
863 @invoke_results = (); 910 @INVOKE_RESULTS = ();
864 911
865 local $override; 912 local $override;
866 913
867 for (@$callbacks) { 914 for (@$callbacks) {
868 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
885 932
886Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
887 934
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 938
892=back 939=back
893 940
894=cut 941=cut
895 942
896############################################################################# 943#############################################################################
897# 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}
898 956
899sub reattach { 957sub reattach {
900 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 959 my ($obj) = @_;
902 960
… …
1089 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1090 1148
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1150
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1099 } else { 1166 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1168 }
1102 1169
1103 cf::override; 1170 cf::override;
… …
1258 1325
1259 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1261 1328
1262 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1263 Coro::cede; 1330 cf::cede_to_tick;
1264} 1331}
1265 1332
1266sub new($) { 1333sub new($) {
1267 my ($login) = @_; 1334 my ($login) = @_;
1268 1335
… …
1272 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1273 1340
1274 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1275 1342
1276 $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 (@_);
1277} 1354}
1278 1355
1279=item $pl->quit_character 1356=item $pl->quit_character
1280 1357
1281Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1386sub expand_cfpod { 1463sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1388 1465
1389 # escape & and < 1466 # escape & and <
1390 s/&/&amp;/g; 1467 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1392 1469
1393 # 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
1394 1471
1395 1 while 1472 1 while
1396 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400 # replace G<male|female> tags 1478 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1403 }ge 1481 }ge
1404 # replace H<hint text> 1482 # replace H<hint text>
… …
1412 1490
1413 # create single paragraphs (very hackish) 1491 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1492 s/(?<=\S)\n(?=\w)/ /g;
1415 1493
1416 # compress some whitespace 1494 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1418 1499
1419 $_ 1500 $_
1420} 1501}
1421 1502
1422sub hintmode { 1503sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1505 $_[0]{hintmode}
1426} 1506}
1427 1507
1428=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1429 1509
1430Sends an ext reply to the player. 1510Sends an ext reply to the player.
1431 1511
1432=cut 1512=cut
1433 1513
1434sub ext_reply($$%) { 1514sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1436 1516
1437 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1518}
1440 1519
1441=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1442 1521
1443Sends an ext event to the client. 1522Sends an ext event to the client.
1444 1523
1445=cut 1524=cut
1446 1525
1447sub ext_event($$%) { 1526sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1449 1528
1450 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1451} 1530}
1452 1531
1453=head3 cf::region 1532=head3 cf::region
1454 1533
1455=over 4 1534=over 4
… …
1468 my ($path) = @_; 1547 my ($path) = @_;
1469 1548
1470 my ($match, $specificity); 1549 my ($match, $specificity);
1471 1550
1472 for my $region (list) { 1551 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1552 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1553 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1554 if $region->specificity > $specificity;
1476 } 1555 }
1477 } 1556 }
1478 1557
… …
1598 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1599 return $self; 1678 return $self;
1600 } 1679 }
1601 } 1680 }
1602 1681
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1683 ()
1605} 1684}
1606 1685
1607sub init { 1686sub init {
1608 my ($self) = @_; 1687 my ($self) = @_;
… …
1774 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1775 1854
1776 my $path = $self->{path}; 1855 my $path = $self->{path};
1777 1856
1778 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1779 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1780 1860
1781 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1782 1862
1783 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1784 1864
1785 $self->alloc; 1865 $self->alloc;
1786 1866
1787 $self->pre_load; 1867 $self->pre_load;
1788 Coro::cede; 1868 cf::cede_to_tick;
1789 1869
1790 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1791 or return; 1871 or return;
1792 1872
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1799 $self->clear_unique_items; 1879 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1801 } 1881 }
1802 } 1882 }
1803 1883
1804 Coro::cede; 1884 cf::cede_to_tick;
1805 # now do the right thing for maps 1885 # now do the right thing for maps
1806 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 1888 unless $self->difficulty;
1809 Coro::cede; 1889 cf::cede_to_tick;
1810 1890
1811 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 1892 $self->decay_objects;
1813 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1814 $self->update_buttons; 1894 $self->update_buttons;
1815 Coro::cede; 1895 cf::cede_to_tick;
1816 $self->set_darkness_map; 1896 $self->set_darkness_map;
1817 Coro::cede; 1897 cf::cede_to_tick;
1818 $self->activate; 1898 $self->activate;
1819 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1820 1903
1821 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 1905 }
1823 1906
1824 $self->post_load; 1907 $self->post_load;
… …
1835 1918
1836 $self 1919 $self
1837} 1920}
1838 1921
1839# 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
1840sub load_diag { 1923sub load_neighbours {
1841 my ($map) = @_; 1924 my ($map) = @_;
1842 1925
1843 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1844 1927
1845 for (0 .. 3) { 1928 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1847 or next; 1930 or next;
1848 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1849 or next; 1932 or next;
1850 $neigh->load; 1933 $neigh->load;
1851 1934
1935 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 1938 }
1855 1939
1856 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1858 or next; 1943 or next;
1859 $neigh->load; 1944 $neigh->load;
1860 } 1945 }
1861} 1946}
1862 1947
… …
1867} 1952}
1868 1953
1869sub do_load_sync { 1954sub do_load_sync {
1870 my ($map) = @_; 1955 my ($map) = @_;
1871 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1872 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1873} 1961}
1874 1962
1875our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1877 1965
1878sub find_async { 1966sub find_async {
1879 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1880 1968
1881 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1882 1970
1883 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 1973 }
1886 1974
1887 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1888 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1889 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 1980 if (my $map = find $k) {
1892 or next;
1893 $map->load; 1981 $map->load if $v;
1982 }
1894 1983
1895 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1896 } 1985 }
1897 } 1986 }
1898 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1899 }; 1988 };
1900 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1903} 1992}
1904 1993
1905sub save { 1994sub save {
1906 my ($self) = @_; 1995 my ($self) = @_;
1907 1996
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 1998
1910 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1911 2000
1912 return unless $self->dirty; 2001 return unless $self->dirty;
1913 2002
… …
1936 my ($self) = @_; 2025 my ($self) = @_;
1937 2026
1938 # save first because save cedes 2027 # save first because save cedes
1939 $self->save; 2028 $self->save;
1940 2029
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2031
1943 return if $self->players; 2032 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1946 2035
… …
1998my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1999 2088
2000sub nuke { 2089sub nuke {
2001 my ($self) = @_; 2090 my ($self) = @_;
2002 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2003 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2004 2096
2005 $self->unlink_save; 2097 $self->unlink_save;
2006 2098
2007 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2104
2013 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2014 2107
2015 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2016} 2109}
2017 2110
2018=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2125 2218
2126 } else { 2219 } else {
2127 my $pl = $self->contr; 2220 my $pl = $self->contr;
2128 2221
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2225
2138 } else { 2226 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2141 } 2229 }
2142 } 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 (@_);
2143} 2241}
2144 2242
2145=item $player_object->may ("access") 2243=item $player_object->may ("access")
2146 2244
2147Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2226 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2229 2327
2230 $map->load; 2328 $map->load;
2231 $map->load_diag; 2329 $map->load_neighbours;
2232 2330
2233 return unless $self->contr->active; 2331 return unless $self->contr->active;
2234 $self->activate_recursive; 2332 $self->activate_recursive;
2235 2333
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
2238} 2336}
2239 2337
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2339
2242Moves 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
2243her, loading and preparing them map, calling the provided $check callback 2341her, loading and preparing them map, calling the provided $check callback
2244that 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
2245the 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.
2246 2345
2247=cut 2346=cut
2248 2347
2249our $GOTOGEN; 2348our $GOTOGEN;
2250 2349
2251sub cf::object::player::goto { 2350sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2352
2254 # 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
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2355
2257 $self->enter_link; 2356 $self->enter_link;
… …
2277 2376
2278 if ($gen == $self->{_goto_generation}) { 2377 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2378 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2281 } 2380 }
2381
2382 $done->() if $done;
2282 })->prio (1); 2383 })->prio (1);
2283} 2384}
2284 2385
2285=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
2286 2387
… …
2355 my $hp = $exit->stats->hp; 2456 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2457 my $sp = $exit->stats->sp;
2357 2458
2358 $self->enter_link; 2459 $self->enter_link;
2359 2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2464
2360 (async { 2465 (async {
2361 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2467 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2468 $self->goto ($slaying, $hp, $sp);
2364 2469
… …
2391 2496
2392 utf8::encode $text; 2497 utf8::encode $text;
2393 $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);
2394} 2499}
2395 2500
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2502
2398Send 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
2399client 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
2400the 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
2401the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2402 2507
2403=cut 2508=cut
2404 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
2405sub cf::client::send_msg { 2525sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2527
2408 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2409 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 }
2541
2542 $channel = $channel->{id};
2543 }
2544
2545 return unless @extra || length $msg;
2546
2410 if ($self->can_msg) { 2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2411 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412 } else { 2554 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 if ($color >= 0) { 2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2424 if (0 && $msg =~ /\[/) { 2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2573 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2575 $self->send_packet ("drawinfo $color $msg")
2429 } 2576 }
2430 } 2577 }
2431 } 2578 }
2432} 2579}
2433 2580
2434=item $client->ext_event ($type, %msg) 2581=item $client->ext_msg ($type, @msg)
2435 2582
2436Sends an ext event to the client. 2583Sends an ext event to the client.
2437 2584
2438=cut 2585=cut
2439 2586
2440sub cf::client::ext_event($$%) { 2587sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2588 my ($self, $type, @msg) = @_;
2442 2589
2590 if ($self->extcmd == 2) {
2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2593 push @msg, msgtype => "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 }
2445} 2614}
2446 2615
2447=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
2448 2617
2449Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
… …
2504 my ($ns, $buf) = @_; 2673 my ($ns, $buf) = @_;
2505 2674
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2676
2508 if (ref $msg) { 2677 if (ref $msg) {
2678 my ($type, $reply, @payload) =
2679 "ARRAY" eq ref $msg
2680 ? @$msg
2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2682
2683 my @reply;
2684
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2685 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 2686 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2515 } else { 2692 } else {
2516 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517 } 2694 }
2518 2695
2519 cf::override; 2696 cf::override;
… …
2566our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2568 2745
2569$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2570 2747
2571$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
2572 2753
2573# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2574 2755
2575=pod 2756=pod
2576 2757
2577The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2578 2759
2579 cf::object contr pay_amount pay_player map 2760 cf::object
2761 contr pay_amount pay_player map x y force_find force_add
2762 insert remove name archname title slaying race decrease_ob_nr
2763
2580 cf::object::player player 2764 cf::object::player
2581 cf::player peaceful 2765 player
2582 cf::map trigger 2766
2767 cf::player
2768 peaceful
2769
2770 cf::map
2771 trigger
2583 2772
2584=cut 2773=cut
2585 2774
2586for ( 2775for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2778 decrease_ob_nr)],
2588 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2591) { 2782) {
2592 no strict 'refs'; 2783 no strict 'refs';
… …
2668# the server's init and main functions 2859# the server's init and main functions
2669 2860
2670sub load_facedata($) { 2861sub load_facedata($) {
2671 my ($path) = @_; 2862 my ($path) = @_;
2672 2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2869
2673 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2674 2871
2675 my $facedata; 2872 my $facedata;
2676 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 2874 or die "$path: $!";
… …
2679 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2680 2877
2681 $facedata->{version} == 2 2878 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2887
2684 { 2888 {
2685 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2686 2890
2687 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 2897
2898 cf::cede_to_tick;
2693 } 2899 }
2694 2900
2695 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 2902 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 2903 my $idx = cf::face::find $face
2698 or next; 2904 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 2905 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 2908 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2909 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 2910 }
2704 Coro::cede; 2911
2912 cf::cede_to_tick;
2705 } 2913 }
2706 } 2914 }
2707 2915
2708 { 2916 {
2709 my $anims = $facedata->{animinfo}; 2917 my $anims = $facedata->{animinfo};
2710 2918
2711 while (my ($anim, $info) = each %$anims) { 2919 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2920 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 2921 cf::cede_to_tick;
2714 } 2922 }
2715 2923
2716 cf::anim::invalidate_all; # d'oh 2924 cf::anim::invalidate_all; # d'oh
2717 } 2925 }
2718 2926
2927 {
2928 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource};
2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2937
2938 if ($info->{type} & 1) {
2939 # prepend meta info
2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2947 } else {
2948 $data = $info->{data};
2949 }
2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick;
2955 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 }
2975
2719 1 2976 1
2720} 2977}
2721 2978
2979register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_;
2981
2982 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v);
2984 }
2985};
2986
2722sub reload_regions { 2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2723 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2724 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2994
2995 for (cf::region::list) {
2996 $_->{match} = qr/$_->{match}/
2997 if exists $_->{match};
2998 }
2725} 2999}
2726 3000
2727sub reload_facedata { 3001sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3002 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3003 or die "unable to load facedata\n";
… …
2758 3032
2759sub init { 3033sub init {
2760 reload_resources; 3034 reload_resources;
2761} 3035}
2762 3036
2763sub cfg_load { 3037sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3039 or return;
2766 3040
2767 local $/; 3041 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
… …
2788 (async { 3062 (async {
2789 Event::one_event; 3063 Event::one_event;
2790 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2791 }; 3065 };
2792 3066
2793 cfg_load; 3067 reload_config;
2794 db_init; 3068 db_init;
2795 load_extensions; 3069 load_extensions;
2796 3070
2797 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
2798 Event::loop; 3072 Event::loop;
… …
2991 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
2992 require cf; 3266 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3268
2995 warn "loading config and database again"; 3269 warn "loading config and database again";
2996 cf::cfg_load; 3270 cf::reload_config;
2997 3271
2998 warn "loading extensions"; 3272 warn "loading extensions";
2999 cf::load_extensions; 3273 cf::load_extensions;
3000 3274
3001 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

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