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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.357 by root, Tue Sep 4 08:42:58 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
86our %CFG; 87our %CFG;
87 88
88our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 90our $RUNTIME;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
… …
271Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
… …
322 }; 326 };
323 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
324 $guard 328 $guard
325} 329}
326 330
327=item cf::get_slot $time[, $priority] 331=item cf::get_slot $time[, $priority[, $name]]
328 332
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 333Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 334This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 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.
332 339
333Useful for short background jobs. 340Useful for short background jobs.
334 341
335=cut 342=cut
336 343
… …
363 Coro::schedule; 370 Coro::schedule;
364 } 371 }
365 } 372 }
366}; 373};
367 374
368sub get_slot($;$) { 375sub get_slot($;$$) {
369 my ($time, $pri) = @_; 376 my ($time, $pri, $name) = @_;
370 377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 383 $SLOT_QUEUE->ready;
374 $sig->wait; 384 $sig->wait;
375} 385}
376 386
… …
466Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
468 478
469=cut 479=cut
470 480
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 481sub fork_call(&@) {
481 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
482 483
483# 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,
484# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 487
488 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 489 reset_signals;
502 local $SIG{__WARN__}; 490 &$cb
503 local $SIG{__DIE__}; 491 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 492
510 eval { 493 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 494}
523 495
524=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
525 497
526Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
606 if (1) { 578 if (1) {
607 $md5 = 579 $md5 =
608 join "\x00", 580 join "\x00",
609 $processversion, 581 $processversion,
610 map { 582 map {
611 Coro::cede; 583 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 585 } 0.. $#$src;
614 586
615 587
616 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1032 }, 1004 },
1033); 1005);
1034 1006
1035sub object_freezer_save { 1007sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
1037 1011
1038 sync_job { 1012 sync_job {
1039 if (length $$rdata) { 1013 if (length $$rdata) {
1040 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
1065 } 1039 }
1066 } else { 1040 } else {
1067 aio_unlink $filename; 1041 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
1069 } 1043 }
1070 } 1044 };
1045
1046 undef $guard;
1071} 1047}
1072 1048
1073sub object_freezer_as_string { 1049sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
1075 1051
… …
1080 1056
1081sub object_thawer_load { 1057sub object_thawer_load {
1082 my ($filename) = @_; 1058 my ($filename) = @_;
1083 1059
1084 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1085 1063
1086 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
1087 or return; 1065 or return;
1088 1066
1089 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1069 or return;
1070
1071 undef $guard;
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1093 } 1073 }
1094 1074
1095 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1097 return ($data, $av); 1078 ($data, $av)
1098} 1079}
1099 1080
1100=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1101 1082
1102=over 4 1083=over 4
… …
1175 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
1176 1157
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1159
1179 if (ref $msg) { 1160 if (ref $msg) {
1161 my ($type, $reply, @payload) =
1162 "ARRAY" eq ref $msg
1163 ? @$msg
1164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1165
1166 my @reply;
1167
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
1185 } else { 1175 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1177 }
1188 1178
1189 cf::override; 1179 cf::override;
… …
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1317
1328 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1319 or return;
1320
1321 $f->next;
1322 my $pl = cf::player::load_pl $f
1323 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1331 } 1327 }
1332 } 1328 }
1333} 1329}
1334 1330
… …
1344 1340
1345 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1347 1343
1348 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1349 Coro::cede; 1345 cf::cede_to_tick;
1350} 1346}
1351 1347
1352sub new($) { 1348sub new($) {
1353 my ($login) = @_; 1349 my ($login) = @_;
1354 1350
… …
1358 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1359 1355
1360 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1361 1357
1362 $self 1358 $self
1359}
1360
1361=item $player->send_msg ($channel, $msg, $color, [extra...])
1362
1363=cut
1364
1365sub send_msg {
1366 my $ns = shift->ns
1367 or return;
1368 $ns->send_msg (@_);
1363} 1369}
1364 1370
1365=item $pl->quit_character 1371=item $pl->quit_character
1366 1372
1367Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
… …
1422 or return []; 1428 or return [];
1423 1429
1424 my @logins; 1430 my @logins;
1425 1431
1426 for my $login (@$dirs) { 1432 for my $login (@$dirs) {
1433 my $path = path $login;
1434
1435 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1430 1441
1431 utf8::decode $login; 1442 utf8::decode $login;
1432 push @logins, $login; 1443 push @logins, $login;
1433 } 1444 }
1434 1445
… …
1472sub expand_cfpod { 1483sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1474 1485
1475 # escape & and < 1486 # escape & and <
1476 s/&/&amp;/g; 1487 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1478 1489
1479 # this is buggy, it needs to properly take care of nested <'s 1490 # this is buggy, it needs to properly take care of nested <'s
1480 1491
1481 1 while 1492 1 while
1482 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1498 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1489 }ge 1501 }ge
1490 # replace H<hint text> 1502 # replace H<hint text>
… …
1511sub hintmode { 1523sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1525 $_[0]{hintmode}
1514} 1526}
1515 1527
1516=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1517 1529
1518Sends an ext reply to the player. 1530Sends an ext reply to the player.
1519 1531
1520=cut 1532=cut
1521 1533
1522sub ext_reply($$%) { 1534sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1524 1536
1525 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1538}
1528 1539
1529=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1530 1541
1531Sends an ext event to the client. 1542Sends an ext event to the client.
1532 1543
1533=cut 1544=cut
1534 1545
1535sub ext_event($$%) { 1546sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1537 1548
1538 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1539} 1550}
1540 1551
1541=head3 cf::region 1552=head3 cf::region
1542 1553
1543=over 4 1554=over 4
… …
1759 1770
1760sub load_header_from($) { 1771sub load_header_from($) {
1761 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1762 1773
1763 utf8::encode $path; 1774 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1776 or return;
1777
1778 $self->_load_header ($f)
1779 or return;
1780
1781 local $MAP_LOADING{$self->{path}} = $self;
1782 $f->resolve_delayed_derefs;
1769 1783
1770 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1771 1785
1772 1 1786 1
1773} 1787}
… …
1862 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1863 1877
1864 my $path = $self->{path}; 1878 my $path = $self->{path};
1865 1879
1866 { 1880 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1881 my $guard = cf::lock_acquire "map_data:$path";
1868 1882
1883 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1870 1885
1871 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1872 1887
1873 $self->alloc; 1888 $self->alloc;
1874 1889
1875 $self->pre_load; 1890 $self->pre_load;
1876 Coro::cede; 1891 cf::cede_to_tick;
1877 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1879 or return; 1896 or return;
1880 1897
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1883 1900
1884 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1902 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1905 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1889 } 1909 }
1890 } 1910 }
1891 1911
1892 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1893 # now do the right thing for maps 1915 # now do the right thing for maps
1894 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1918 unless $self->difficulty;
1897 Coro::cede; 1919 cf::cede_to_tick;
1898 1920
1899 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1922 $self->decay_objects;
1901 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1902 $self->update_buttons; 1924 $self->update_buttons;
1903 Coro::cede; 1925 cf::cede_to_tick;
1904 $self->set_darkness_map; 1926 $self->set_darkness_map;
1905 Coro::cede; 1927 cf::cede_to_tick;
1906 $self->activate; 1928 $self->activate;
1907 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1908 1933
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1935 }
1911 1936
1912 $self->post_load; 1937 $self->post_load;
… …
1923 1948
1924 $self 1949 $self
1925} 1950}
1926 1951
1927# find and load all maps in the 3x3 area around a map 1952# find and load all maps in the 3x3 area around a map
1928sub load_diag { 1953sub load_neighbours {
1929 my ($map) = @_; 1954 my ($map) = @_;
1930 1955
1931 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1932 1957
1933 for (0 .. 3) { 1958 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1935 or next; 1960 or next;
1936 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1937 or next; 1962 or next;
1938 $neigh->load; 1963 $neigh->load;
1939 1964
1965 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 1968 }
1943 1969
1944 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1946 or next; 1973 or next;
1947 $neigh->load; 1974 $neigh->load;
1948 } 1975 }
1949} 1976}
1950 1977
… …
1955} 1982}
1956 1983
1957sub do_load_sync { 1984sub do_load_sync {
1958 my ($map) = @_; 1985 my ($map) = @_;
1959 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1960 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1961} 1991}
1962 1992
1963our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1965 1995
1966sub find_async { 1996sub find_async {
1967 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1968 1998
1969 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1970 2000
1971 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2003 }
1974 2004
1975 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1976 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1977 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2010 if (my $map = find $k) {
1980 $map->load; 2011 $map->load if $v;
1981 } 2012 }
1982 2013
1983 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1984 } 2015 }
1985 } 2016 }
1986 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1987 }; 2018 };
1988 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
1991} 2022}
1992 2023
1993sub save { 2024sub save {
1994 my ($self) = @_; 2025 my ($self) = @_;
1995 2026
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2028
1998 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1999 2030
2000 return unless $self->dirty; 2031 return unless $self->dirty;
2001 2032
… …
2024 my ($self) = @_; 2055 my ($self) = @_;
2025 2056
2026 # save first because save cedes 2057 # save first because save cedes
2027 $self->save; 2058 $self->save;
2028 2059
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2061
2031 return if $self->players; 2062 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2064 return if $self->{deny_save};
2034 2065
… …
2086my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
2087 2118
2088sub nuke { 2119sub nuke {
2089 my ($self) = @_; 2120 my ($self) = @_;
2090 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2091 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
2092 2126
2093 $self->unlink_save; 2127 $self->unlink_save;
2094 2128
2095 bless $self, "cf::map"; 2129 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2134
2101 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2102 2137
2103 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2104} 2139}
2105 2140
2106=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2182 2217
2183sub inv_recursive { 2218sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2185} 2220}
2186 2221
2222=item $ref = $ob->ref
2223
2224creates and returns a persistent reference to an objetc that can be stored as a string.
2225
2226=item $ob = cf::object::deref ($refstring)
2227
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block.
2230
2231=cut
2232
2233sub deref {
2234 my ($ref) = @_;
2235
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return;
2243 $pl->ob->uuid eq $uuid
2244 or return;
2245
2246 $pl->ob
2247 } else {
2248 warn "$ref: cannot resolve object reference\n";
2249 undef
2250 }
2251}
2252
2187package cf; 2253package cf;
2188 2254
2189=back 2255=back
2190 2256
2191=head3 cf::object::player 2257=head3 cf::object::player
… …
2213 2279
2214 } else { 2280 } else {
2215 my $pl = $self->contr; 2281 my $pl = $self->contr;
2216 2282
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2284 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2286
2226 } else { 2287 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2229 } 2290 }
2230 } 2291 }
2292}
2293
2294=item $object->send_msg ($channel, $msg, $color, [extra...])
2295
2296=cut
2297
2298sub cf::object::send_msg {
2299 my $pl = shift->contr
2300 or return;
2301 $pl->send_msg (@_);
2231} 2302}
2232 2303
2233=item $player_object->may ("access") 2304=item $player_object->may ("access")
2234 2305
2235Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
… …
2314 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2317 2388
2318 $map->load; 2389 $map->load;
2319 $map->load_diag; 2390 $map->load_neighbours;
2320 2391
2321 return unless $self->contr->active; 2392 return unless $self->contr->active;
2322 $self->activate_recursive; 2393 $self->activate_recursive;
2323 2394
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2566the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2497 2568
2498=cut 2569=cut
2499 2570
2571our %CHANNEL = (
2572 "c/identify" => {
2573 id => "identify",
2574 title => "Identify",
2575 reply => undef,
2576 tooltip => "Items recently identified",
2577 },
2578 "c/examine" => {
2579 id => "examine",
2580 title => "Examine",
2581 reply => undef,
2582 tooltip => "Signs and other items you examined",
2583 },
2584);
2585
2500sub cf::client::send_msg { 2586sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2588
2503 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2504 2590
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2591 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592
2593 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2506 2595
2507 if (ref $channel) { 2596 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2597 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2598 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2599 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2512 } 2602 }
2513 2603
2514 $channel = $channel->{id}; 2604 $channel = $channel->{id};
2515 } 2605 }
2516 2606
2517 return unless @extra || length $msg; 2607 return unless @extra || length $msg;
2518 2608
2519 if ($self->can_msg) { 2609 if ($self->can_msg) {
2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2616 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627
2628 $color &= cf::NDI_COLOR_MASK;
2629
2630 utf8::encode $msg;
2631
2533 if (0 && $msg =~ /\[/) { 2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2635 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2637 $self->send_packet ("drawinfo $color $msg")
2538 } 2638 }
2539 } 2639 }
2540 } 2640 }
2541} 2641}
2542 2642
2543=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2544 2644
2545Sends an ext event to the client. 2645Sends an ext event to the client.
2546 2646
2547=cut 2647=cut
2548 2648
2549sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2551 2651
2552 return unless $self->extcmd; 2652 if ($self->extcmd == 2) {
2553 2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2656 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2657 }
2658}
2659
2660=item $client->ext_reply ($msgid, @msg)
2661
2662Sends an ext reply to the client.
2663
2664=cut
2665
2666sub cf::client::ext_reply($$@) {
2667 my ($self, $id, @msg) = @_;
2668
2669 if ($self->extcmd == 2) {
2670 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2671 } elsif ($self->extcmd == 1) {
2672 #TODO: version 1, remove
2673 unshift @msg, msgtype => "reply", msgid => $id;
2674 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2675 }
2556} 2676}
2557 2677
2558=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2559 2679
2560Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
… …
2615 my ($ns, $buf) = @_; 2735 my ($ns, $buf) = @_;
2616 2736
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2738
2619 if (ref $msg) { 2739 if (ref $msg) {
2740 my ($type, $reply, @payload) =
2741 "ARRAY" eq ref $msg
2742 ? @$msg
2743 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2744
2745 my @reply;
2746
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2747 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2748 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2626 } else { 2754 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2755 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2756 }
2629 2757
2630 cf::override; 2758 cf::override;
… …
2677our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2679 2807
2680$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2681 2809
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2810$safe->permit_only (Opcode::opset qw(
2811 :base_core :base_mem :base_orig :base_math
2812 grepstart grepwhile mapstart mapwhile
2813 sort time
2814));
2683 2815
2684# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2685 2817
2686=pod 2818=pod
2687 2819
2688The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2689 2821
2690 cf::object 2822 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2823 contr pay_amount pay_player map x y force_find force_add
2692 insert remove 2824 insert remove name archname title slaying race decrease_ob_nr
2693 2825
2694 cf::object::player 2826 cf::object::player
2695 player 2827 player
2696 2828
2697 cf::player 2829 cf::player
… …
2702 2834
2703=cut 2835=cut
2704 2836
2705for ( 2837for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race
2707 insert remove)], 2840 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2711) { 2844) {
2712 no strict 'refs'; 2845 no strict 'refs';
… …
2788# the server's init and main functions 2921# the server's init and main functions
2789 2922
2790sub load_facedata($) { 2923sub load_facedata($) {
2791 my ($path) = @_; 2924 my ($path) = @_;
2792 2925
2926 # HACK to clear player env face cache, we need some signal framework
2927 # for this (global event?)
2928 %ext::player_env::MUSIC_FACE_CACHE = ();
2929
2930 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2931
2793 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2794 2933
2795 my $facedata; 2934 my $facedata;
2796 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 2936 or die "$path: $!";
2798 2937
2799 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2800 2939
2801 $facedata->{version} == 2 2940 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2942
2943 # patch in the exptable
2944 $facedata->{resource}{"res/exp_table"} = {
2945 type => FT_RSRC,
2946 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2947 };
2948 cf::cede_to_tick;
2803 2949
2804 { 2950 {
2805 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2806 2952
2807 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 2956 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 2959
2814 cf::cede_to_tick; 2960 cf::cede_to_tick;
2815 } 2961 }
2816 2962
2817 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
… …
2842 2988
2843 { 2989 {
2844 # TODO: for gcfclient pleasure, we should give resources 2990 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 2991 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 2992 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2848 2995
2849 while (my ($name, $info) = each %$res) { 2996 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2857 2999
2858 if ($name =~ /\.jpg$/) { 3000 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3001 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3009 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3010 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3011 }
2868 3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
2869 cf::cede_to_tick; 3016 cf::cede_to_tick;
2870 } 3017 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
2871 } 3036 }
2872 3037
2873 1 3038 1
2874} 3039}
2875 3040
3041register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_;
3043
3044 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v);
3046 }
3047};
3048
2876sub reload_regions { 3049sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = ();
3053
2877 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
2879 3056
2880 for (cf::region::list) { 3057 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3058 $_->{match} = qr/$_->{match}/
… …
2917 3094
2918sub init { 3095sub init {
2919 reload_resources; 3096 reload_resources;
2920} 3097}
2921 3098
2922sub cfg_load { 3099sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3101 or return;
2925 3102
2926 local $/; 3103 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
2947 (async { 3124 (async {
2948 Event::one_event; 3125 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2950 }; 3127 };
2951 3128
2952 cfg_load; 3129 reload_config;
2953 db_init; 3130 db_init;
2954 load_extensions; 3131 load_extensions;
2955 3132
2956 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2957 Event::loop; 3134 Event::loop;
… …
3150 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
3151 require cf; 3328 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3330
3154 warn "loading config and database again"; 3331 warn "loading config and database again";
3155 cf::cfg_load; 3332 cf::reload_config;
3156 3333
3157 warn "loading extensions"; 3334 warn "loading extensions";
3158 cf::load_extensions; 3335 cf::load_extensions;
3159 3336
3160 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3253 or die; 3430 or die;
3254 3431
3255 $map->width (50); 3432 $map->width (50);
3256 $map->height (50); 3433 $map->height (50);
3257 $map->alloc; 3434 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3259 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3260 3437
3261 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3262 if ($t < $min) { 3439 if ($t < $min) {
3263 $min = $t; 3440 $min = $t;

Diff Legend

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