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.356 by root, Tue Sep 4 05:43:21 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
… …
85our %CFG; 87our %CFG;
86 88
87our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 90our $RUNTIME;
89 91
90our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
93 95
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 98
… …
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 (likely 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
… …
959 }, 1004 },
960); 1005);
961 1006
962sub object_freezer_save { 1007sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
964 1011
965 sync_job { 1012 sync_job {
966 if (length $$rdata) { 1013 if (length $$rdata) {
967 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
992 } 1039 }
993 } else { 1040 } else {
994 aio_unlink $filename; 1041 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
996 } 1043 }
997 } 1044 };
1045
1046 undef $guard;
998} 1047}
999 1048
1000sub object_freezer_as_string { 1049sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
1002 1051
… …
1007 1056
1008sub object_thawer_load { 1057sub object_thawer_load {
1009 my ($filename) = @_; 1058 my ($filename) = @_;
1010 1059
1011 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1012 1063
1013 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
1014 or return; 1065 or return;
1015 1066
1016 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1069 or return;
1070
1071 undef $guard;
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1020 } 1073 }
1021 1074
1022 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1024 return ($data, $av); 1078 ($data, $av)
1025} 1079}
1026 1080
1027=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1028 1082
1029=over 4 1083=over 4
… …
1102 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
1103 1157
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1159
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
1112 } else { 1175 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1177 }
1115 1178
1116 cf::override; 1179 cf::override;
… …
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1317
1255 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1258 } 1327 }
1259 } 1328 }
1260} 1329}
1261 1330
… …
1271 1340
1272 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1274 1343
1275 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1276 Coro::cede; 1345 cf::cede_to_tick;
1277} 1346}
1278 1347
1279sub new($) { 1348sub new($) {
1280 my ($login) = @_; 1349 my ($login) = @_;
1281 1350
… …
1285 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1286 1355
1287 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1288 1357
1289 $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 (@_);
1290} 1369}
1291 1370
1292=item $pl->quit_character 1371=item $pl->quit_character
1293 1372
1294Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
… …
1349 or return []; 1428 or return [];
1350 1429
1351 my @logins; 1430 my @logins;
1352 1431
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1357 1441
1358 utf8::decode $login; 1442 utf8::decode $login;
1359 push @logins, $login; 1443 push @logins, $login;
1360 } 1444 }
1361 1445
… …
1399sub expand_cfpod { 1483sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1401 1485
1402 # escape & and < 1486 # escape & and <
1403 s/&/&amp;/g; 1487 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1405 1489
1406 # 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
1407 1491
1408 1 while 1492 1 while
1409 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413 # replace G<male|female> tags 1498 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1416 }ge 1501 }ge
1417 # replace H<hint text> 1502 # replace H<hint text>
… …
1438sub hintmode { 1523sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1525 $_[0]{hintmode}
1441} 1526}
1442 1527
1443=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1444 1529
1445Sends an ext reply to the player. 1530Sends an ext reply to the player.
1446 1531
1447=cut 1532=cut
1448 1533
1449sub ext_reply($$%) { 1534sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1451 1536
1452 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1538}
1455 1539
1456=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1457 1541
1458Sends an ext event to the client. 1542Sends an ext event to the client.
1459 1543
1460=cut 1544=cut
1461 1545
1462sub ext_event($$%) { 1546sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1464 1548
1465 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1466} 1550}
1467 1551
1468=head3 cf::region 1552=head3 cf::region
1469 1553
1470=over 4 1554=over 4
… …
1483 my ($path) = @_; 1567 my ($path) = @_;
1484 1568
1485 my ($match, $specificity); 1569 my ($match, $specificity);
1486 1570
1487 for my $region (list) { 1571 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1572 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1573 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1574 if $region->specificity > $specificity;
1491 } 1575 }
1492 } 1576 }
1493 1577
… …
1613 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1614 return $self; 1698 return $self;
1615 } 1699 }
1616 } 1700 }
1617 1701
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1703 ()
1620} 1704}
1621 1705
1622sub init { 1706sub init {
1623 my ($self) = @_; 1707 my ($self) = @_;
… …
1686 1770
1687sub load_header_from($) { 1771sub load_header_from($) {
1688 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1689 1773
1690 utf8::encode $path; 1774 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 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;
1696 1783
1697 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1698 1785
1699 1 1786 1
1700} 1787}
… …
1789 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1790 1877
1791 my $path = $self->{path}; 1878 my $path = $self->{path};
1792 1879
1793 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1794 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1795 1883
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1797 1885
1798 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1799 1887
1800 $self->alloc; 1888 $self->alloc;
1801 1889
1802 $self->pre_load; 1890 $self->pre_load;
1803 Coro::cede; 1891 cf::cede_to_tick;
1804 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1806 or return; 1896 or return;
1807 1897
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1810 1900
1811 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 1902 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 1905 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1816 } 1909 }
1817 } 1910 }
1818 1911
1819 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1820 # now do the right thing for maps 1915 # now do the right thing for maps
1821 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 1918 unless $self->difficulty;
1824 Coro::cede; 1919 cf::cede_to_tick;
1825 1920
1826 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 1922 $self->decay_objects;
1828 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1829 $self->update_buttons; 1924 $self->update_buttons;
1830 Coro::cede; 1925 cf::cede_to_tick;
1831 $self->set_darkness_map; 1926 $self->set_darkness_map;
1832 Coro::cede; 1927 cf::cede_to_tick;
1833 $self->activate; 1928 $self->activate;
1834 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1835 1933
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1935 }
1838 1936
1839 $self->post_load; 1937 $self->post_load;
… …
1850 1948
1851 $self 1949 $self
1852} 1950}
1853 1951
1854# 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
1855sub load_diag { 1953sub load_neighbours {
1856 my ($map) = @_; 1954 my ($map) = @_;
1857 1955
1858 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1859 1957
1860 for (0 .. 3) { 1958 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1862 or next; 1960 or next;
1863 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1864 or next; 1962 or next;
1865 $neigh->load; 1963 $neigh->load;
1866 1964
1965 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 1968 }
1870 1969
1871 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1873 or next; 1973 or next;
1874 $neigh->load; 1974 $neigh->load;
1875 } 1975 }
1876} 1976}
1877 1977
… …
1882} 1982}
1883 1983
1884sub do_load_sync { 1984sub do_load_sync {
1885 my ($map) = @_; 1985 my ($map) = @_;
1886 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1887 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1888} 1991}
1889 1992
1890our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1892 1995
1893sub find_async { 1996sub find_async {
1894 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1895 1998
1896 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1897 2000
1898 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2003 }
1901 2004
1902 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1903 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2010 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2011 $map->load if $v;
2012 }
1909 2013
1910 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1911 } 2015 }
1912 } 2016 }
1913 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1914 }; 2018 };
1915 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
1918} 2022}
1919 2023
1920sub save { 2024sub save {
1921 my ($self) = @_; 2025 my ($self) = @_;
1922 2026
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2028
1925 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1926 2030
1927 return unless $self->dirty; 2031 return unless $self->dirty;
1928 2032
… …
1951 my ($self) = @_; 2055 my ($self) = @_;
1952 2056
1953 # save first because save cedes 2057 # save first because save cedes
1954 $self->save; 2058 $self->save;
1955 2059
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2061
1958 return if $self->players; 2062 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1961 2065
… …
2013my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
2014 2118
2015sub nuke { 2119sub nuke {
2016 my ($self) = @_; 2120 my ($self) = @_;
2017 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
2018 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
2019 2126
2020 $self->unlink_save; 2127 $self->unlink_save;
2021 2128
2022 bless $self, "cf::map"; 2129 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2134
2028 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2029 2137
2030 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2031} 2139}
2032 2140
2033=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2109 2217
2110sub inv_recursive { 2218sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2112} 2220}
2113 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
2114package cf; 2253package cf;
2115 2254
2116=back 2255=back
2117 2256
2118=head3 cf::object::player 2257=head3 cf::object::player
… …
2140 2279
2141 } else { 2280 } else {
2142 my $pl = $self->contr; 2281 my $pl = $self->contr;
2143 2282
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2284 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2285 $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 2286
2153 } else { 2287 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2156 } 2290 }
2157 } 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 (@_);
2158} 2302}
2159 2303
2160=item $player_object->may ("access") 2304=item $player_object->may ("access")
2161 2305
2162Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2244 2388
2245 $map->load; 2389 $map->load;
2246 $map->load_diag; 2390 $map->load_neighbours;
2247 2391
2248 return unless $self->contr->active; 2392 return unless $self->contr->active;
2249 $self->activate_recursive; 2393 $self->activate_recursive;
2250 2394
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
2253} 2397}
2254 2398
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2400
2257Moves the player to the given map-path and coordinates by first freezing 2401Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2402her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2403that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2404the new (success) or old (failed) map position. In either case, $done will
2405be called at the end of this process.
2261 2406
2262=cut 2407=cut
2263 2408
2264our $GOTOGEN; 2409our $GOTOGEN;
2265 2410
2266sub cf::object::player::goto { 2411sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2413
2269 # do generation counting so two concurrent goto's will be executed in-order 2414 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2416
2272 $self->enter_link; 2417 $self->enter_link;
… …
2292 2437
2293 if ($gen == $self->{_goto_generation}) { 2438 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2439 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2296 } 2441 }
2442
2443 $done->() if $done;
2297 })->prio (1); 2444 })->prio (1);
2298} 2445}
2299 2446
2300=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
2301 2448
… …
2410 2557
2411 utf8::encode $text; 2558 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2559 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2560}
2414 2561
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2563
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2564Send 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 2565client 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 2566the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2421 2568
2422=cut 2569=cut
2423 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
2424sub cf::client::send_msg { 2586sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2588
2427 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2428 2590
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};
2595
2596 if (ref $channel) {
2597 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg;
2602 }
2603
2604 $channel = $channel->{id};
2605 }
2606
2429 return unless @extra || length $msg; 2607 return unless @extra || length $msg;
2430 2608
2431 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
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2616 } 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) { 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
2445 if (0 && $msg =~ /\[/) { 2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2635 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2637 $self->send_packet ("drawinfo $color $msg")
2450 } 2638 }
2451 } 2639 }
2452 } 2640 }
2453} 2641}
2454 2642
2455=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2456 2644
2457Sends an ext event to the client. 2645Sends an ext event to the client.
2458 2646
2459=cut 2647=cut
2460 2648
2461sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2463 2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 2676}
2467 2677
2468=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2469 2679
2470Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2735 my ($ns, $buf) = @_;
2526 2736
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2738
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2747 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2748 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2536 } else { 2754 } else {
2537 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";
2538 } 2756 }
2539 2757
2540 cf::override; 2758 cf::override;
… …
2587our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2589 2807
2590$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2591 2809
2592$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));
2593 2815
2594# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2595 2817
2596=pod 2818=pod
2597 2819
2598The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2599 2821
2600 cf::object 2822 cf::object
2601 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
2602 insert remove 2824 insert remove name archname title slaying race decrease_ob_nr
2603 2825
2604 cf::object::player 2826 cf::object::player
2605 player 2827 player
2606 2828
2607 cf::player 2829 cf::player
… …
2612 2834
2613=cut 2835=cut
2614 2836
2615for ( 2837for (
2616 ["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
2617 insert remove)], 2840 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2621) { 2844) {
2622 no strict 'refs'; 2845 no strict 'refs';
… …
2698# the server's init and main functions 2921# the server's init and main functions
2699 2922
2700sub load_facedata($) { 2923sub load_facedata($) {
2701 my ($path) = @_; 2924 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2704 2933
2705 my $facedata; 2934 my $facedata;
2706 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2936 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2710 2939
2711 $facedata->{version} == 2 2940 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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;
2949
2714 { 2950 {
2715 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2716 2952
2717 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 2959
2960 cf::cede_to_tick;
2723 } 2961 }
2724 2962
2725 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2728 or next; 2966 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2970 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2972 }
2734 Coro::cede; 2973
2974 cf::cede_to_tick;
2735 } 2975 }
2736 } 2976 }
2737 2977
2738 { 2978 {
2739 my $anims = $facedata->{animinfo}; 2979 my $anims = $facedata->{animinfo};
2740 2980
2741 while (my ($anim, $info) = each %$anims) { 2981 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2983 cf::cede_to_tick;
2744 } 2984 }
2745 2985
2746 cf::anim::invalidate_all; # d'oh 2986 cf::anim::invalidate_all; # d'oh
2747 } 2987 }
2748 2988
2989 {
2990 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource};
2993
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data;
2999
3000 if ($info->{type} & 1) {
3001 # prepend meta info
3002
3003 my $meta = $enc->encode ({
3004 name => $name,
3005 %{ $info->{meta} || {} },
3006 });
3007
3008 $data = pack "(w/a*)*", $meta, $info->{data};
3009 } else {
3010 $data = $info->{data};
3011 }
3012
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick;
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 }
3036 }
3037
2749 1 3038 1
2750} 3039}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3055 or die "unable to load regions file\n";
3056
3057 for (cf::region::list) {
3058 $_->{match} = qr/$_->{match}/
3059 if exists $_->{match};
3060 }
2755} 3061}
2756 3062
2757sub reload_facedata { 3063sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3064 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3065 or die "unable to load facedata\n";
… …
2788 3094
2789sub init { 3095sub init {
2790 reload_resources; 3096 reload_resources;
2791} 3097}
2792 3098
2793sub cfg_load { 3099sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3101 or return;
2796 3102
2797 local $/; 3103 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
2818 (async { 3124 (async {
2819 Event::one_event; 3125 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2821 }; 3127 };
2822 3128
2823 cfg_load; 3129 reload_config;
2824 db_init; 3130 db_init;
2825 load_extensions; 3131 load_extensions;
2826 3132
2827 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2828 Event::loop; 3134 Event::loop;
… …
3021 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
3022 require cf; 3328 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3330
3025 warn "loading config and database again"; 3331 warn "loading config and database again";
3026 cf::cfg_load; 3332 cf::reload_config;
3027 3333
3028 warn "loading extensions"; 3334 warn "loading extensions";
3029 cf::load_extensions; 3335 cf::load_extensions;
3030 3336
3031 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3124 or die; 3430 or die;
3125 3431
3126 $map->width (50); 3432 $map->width (50);
3127 $map->height (50); 3433 $map->height (50);
3128 $map->alloc; 3434 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3130 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3131 3437
3132 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3133 if ($t < $min) { 3439 if ($t < $min) {
3134 $min = $t; 3440 $min = $t;

Diff Legend

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