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.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
… …
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
… …
1399sub expand_cfpod { 1463sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1401 1465
1402 # escape & and < 1466 # escape & and <
1403 s/&/&amp;/g; 1467 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1405 1469
1406 # 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
1407 1471
1408 1 while 1472 1 while
1409 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413 # replace G<male|female> tags 1478 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1416 }ge 1481 }ge
1417 # replace H<hint text> 1482 # replace H<hint text>
… …
1438sub hintmode { 1503sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1505 $_[0]{hintmode}
1441} 1506}
1442 1507
1443=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1444 1509
1445Sends an ext reply to the player. 1510Sends an ext reply to the player.
1446 1511
1447=cut 1512=cut
1448 1513
1449sub ext_reply($$%) { 1514sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1451 1516
1452 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1518}
1455 1519
1456=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1457 1521
1458Sends an ext event to the client. 1522Sends an ext event to the client.
1459 1523
1460=cut 1524=cut
1461 1525
1462sub ext_event($$%) { 1526sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1464 1528
1465 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1466} 1530}
1467 1531
1468=head3 cf::region 1532=head3 cf::region
1469 1533
1470=over 4 1534=over 4
… …
1483 my ($path) = @_; 1547 my ($path) = @_;
1484 1548
1485 my ($match, $specificity); 1549 my ($match, $specificity);
1486 1550
1487 for my $region (list) { 1551 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1552 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1553 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1554 if $region->specificity > $specificity;
1491 } 1555 }
1492 } 1556 }
1493 1557
… …
1613 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1614 return $self; 1678 return $self;
1615 } 1679 }
1616 } 1680 }
1617 1681
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1683 ()
1620} 1684}
1621 1685
1622sub init { 1686sub init {
1623 my ($self) = @_; 1687 my ($self) = @_;
… …
1789 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1790 1854
1791 my $path = $self->{path}; 1855 my $path = $self->{path};
1792 1856
1793 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1794 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1795 1860
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1797 1862
1798 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1799 1864
1800 $self->alloc; 1865 $self->alloc;
1801 1866
1802 $self->pre_load; 1867 $self->pre_load;
1803 Coro::cede; 1868 cf::cede_to_tick;
1804 1869
1805 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1806 or return; 1871 or return;
1807 1872
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1814 $self->clear_unique_items; 1879 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1816 } 1881 }
1817 } 1882 }
1818 1883
1819 Coro::cede; 1884 cf::cede_to_tick;
1820 # now do the right thing for maps 1885 # now do the right thing for maps
1821 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 1888 unless $self->difficulty;
1824 Coro::cede; 1889 cf::cede_to_tick;
1825 1890
1826 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 1892 $self->decay_objects;
1828 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1829 $self->update_buttons; 1894 $self->update_buttons;
1830 Coro::cede; 1895 cf::cede_to_tick;
1831 $self->set_darkness_map; 1896 $self->set_darkness_map;
1832 Coro::cede; 1897 cf::cede_to_tick;
1833 $self->activate; 1898 $self->activate;
1834 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1835 1903
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1905 }
1838 1906
1839 $self->post_load; 1907 $self->post_load;
… …
1850 1918
1851 $self 1919 $self
1852} 1920}
1853 1921
1854# 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
1855sub load_diag { 1923sub load_neighbours {
1856 my ($map) = @_; 1924 my ($map) = @_;
1857 1925
1858 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1859 1927
1860 for (0 .. 3) { 1928 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1862 or next; 1930 or next;
1863 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1864 or next; 1932 or next;
1865 $neigh->load; 1933 $neigh->load;
1866 1934
1935 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 1938 }
1870 1939
1871 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1873 or next; 1943 or next;
1874 $neigh->load; 1944 $neigh->load;
1875 } 1945 }
1876} 1946}
1877 1947
… …
1882} 1952}
1883 1953
1884sub do_load_sync { 1954sub do_load_sync {
1885 my ($map) = @_; 1955 my ($map) = @_;
1886 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1887 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1888} 1961}
1889 1962
1890our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1892 1965
1893sub find_async { 1966sub find_async {
1894 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1895 1968
1896 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1897 1970
1898 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 1973 }
1901 1974
1902 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1903 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 1980 if (my $map = find $k) {
1907 or next;
1908 $map->load; 1981 $map->load if $v;
1982 }
1909 1983
1910 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1911 } 1985 }
1912 } 1986 }
1913 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1914 }; 1988 };
1915 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1918} 1992}
1919 1993
1920sub save { 1994sub save {
1921 my ($self) = @_; 1995 my ($self) = @_;
1922 1996
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 1998
1925 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1926 2000
1927 return unless $self->dirty; 2001 return unless $self->dirty;
1928 2002
… …
1951 my ($self) = @_; 2025 my ($self) = @_;
1952 2026
1953 # save first because save cedes 2027 # save first because save cedes
1954 $self->save; 2028 $self->save;
1955 2029
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2031
1958 return if $self->players; 2032 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1961 2035
… …
2013my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2014 2088
2015sub nuke { 2089sub nuke {
2016 my ($self) = @_; 2090 my ($self) = @_;
2017 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2018 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2019 2096
2020 $self->unlink_save; 2097 $self->unlink_save;
2021 2098
2022 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2104
2028 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2029 2107
2030 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2031} 2109}
2032 2110
2033=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2140 2218
2141 } else { 2219 } else {
2142 my $pl = $self->contr; 2220 my $pl = $self->contr;
2143 2221
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2224 $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 2225
2153 } else { 2226 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2156 } 2229 }
2157 } 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 (@_);
2158} 2241}
2159 2242
2160=item $player_object->may ("access") 2243=item $player_object->may ("access")
2161 2244
2162Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2244 2327
2245 $map->load; 2328 $map->load;
2246 $map->load_diag; 2329 $map->load_neighbours;
2247 2330
2248 return unless $self->contr->active; 2331 return unless $self->contr->active;
2249 $self->activate_recursive; 2332 $self->activate_recursive;
2250 2333
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
2253} 2336}
2254 2337
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2339
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2341her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2345
2262=cut 2346=cut
2263 2347
2264our $GOTOGEN; 2348our $GOTOGEN;
2265 2349
2266sub cf::object::player::goto { 2350sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2352
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2355
2272 $self->enter_link; 2356 $self->enter_link;
… …
2292 2376
2293 if ($gen == $self->{_goto_generation}) { 2377 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2378 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2296 } 2380 }
2381
2382 $done->() if $done;
2297 })->prio (1); 2383 })->prio (1);
2298} 2384}
2299 2385
2300=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
2301 2387
… …
2410 2496
2411 utf8::encode $text; 2497 utf8::encode $text;
2412 $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);
2413} 2499}
2414 2500
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2502
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2421 2507
2422=cut 2508=cut
2423 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
2424sub cf::client::send_msg { 2525sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2527
2427 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2546 return unless @extra || length $msg;
2430 2547
2431 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
2432 $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]));
2433 } else { 2555 } 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) { 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
2445 if (0 && $msg =~ /\[/) { 2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2574 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2576 $self->send_packet ("drawinfo $color $msg")
2450 } 2577 }
2451 } 2578 }
2452 } 2579 }
2453} 2580}
2454 2581
2455=item $client->ext_event ($type, %msg) 2582=item $client->ext_msg ($type, @msg)
2456 2583
2457Sends an ext event to the client. 2584Sends an ext event to the client.
2458 2585
2459=cut 2586=cut
2460 2587
2461sub cf::client::ext_event($$%) { 2588sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2589 my ($self, $type, @msg) = @_;
2463 2590
2591 if ($self->extcmd == 2) {
2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2594 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 2615}
2467 2616
2468=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
2469 2618
2470Queues a query to the client, calling the given callback with 2619Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2674 my ($ns, $buf) = @_;
2526 2675
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2676 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2677
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2686 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2687 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2536 } else { 2693 } else {
2537 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";
2538 } 2695 }
2539 2696
2540 cf::override; 2697 cf::override;
… …
2587our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
2589 2746
2590$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
2591 2748
2592$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));
2593 2754
2594# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
2595 2756
2596=pod 2757=pod
2597 2758
2598The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2599 2760
2600 cf::object 2761 cf::object
2601 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
2602 insert remove 2763 insert remove name archname title slaying race decrease_ob_nr
2603 2764
2604 cf::object::player 2765 cf::object::player
2605 player 2766 player
2606 2767
2607 cf::player 2768 cf::player
… …
2612 2773
2613=cut 2774=cut
2614 2775
2615for ( 2776for (
2616 ["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
2617 insert remove)], 2779 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2621) { 2783) {
2622 no strict 'refs'; 2784 no strict 'refs';
… …
2698# the server's init and main functions 2860# the server's init and main functions
2699 2861
2700sub load_facedata($) { 2862sub load_facedata($) {
2701 my ($path) = @_; 2863 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2704 2872
2705 my $facedata; 2873 my $facedata;
2706 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2875 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 2877 $facedata = Coro::Storable::thaw $facedata;
2710 2878
2711 $facedata->{version} == 2 2879 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 2889 {
2715 my $faces = $facedata->{faceinfo}; 2890 my $faces = $facedata->{faceinfo};
2716 2891
2717 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2895 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 2898
2899 cf::cede_to_tick;
2723 } 2900 }
2724 2901
2725 while (my ($face, $info) = each %$faces) { 2902 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2903 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2904 my $idx = cf::face::find $face
2728 or next; 2905 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2906 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2909 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2910 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2911 }
2734 Coro::cede; 2912
2913 cf::cede_to_tick;
2735 } 2914 }
2736 } 2915 }
2737 2916
2738 { 2917 {
2739 my $anims = $facedata->{animinfo}; 2918 my $anims = $facedata->{animinfo};
2740 2919
2741 while (my ($anim, $info) = each %$anims) { 2920 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2921 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2922 cf::cede_to_tick;
2744 } 2923 }
2745 2924
2746 cf::anim::invalidate_all; # d'oh 2925 cf::anim::invalidate_all; # d'oh
2747 } 2926 }
2748 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
2749 1 2977 1
2750} 2978}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2754 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 }
2755} 3000}
2756 3001
2757sub reload_facedata { 3002sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3003 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3004 or die "unable to load facedata\n";
… …
2788 3033
2789sub init { 3034sub init {
2790 reload_resources; 3035 reload_resources;
2791} 3036}
2792 3037
2793sub cfg_load { 3038sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3040 or return;
2796 3041
2797 local $/; 3042 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
2818 (async { 3063 (async {
2819 Event::one_event; 3064 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
2821 }; 3066 };
2822 3067
2823 cfg_load; 3068 reload_config;
2824 db_init; 3069 db_init;
2825 load_extensions; 3070 load_extensions;
2826 3071
2827 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
2828 Event::loop; 3073 Event::loop;
… …
3021 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
3022 require cf; 3267 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3269
3025 warn "loading config and database again"; 3270 warn "loading config and database again";
3026 cf::cfg_load; 3271 cf::reload_config;
3027 3272
3028 warn "loading extensions"; 3273 warn "loading extensions";
3029 cf::load_extensions; 3274 cf::load_extensions;
3030 3275
3031 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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