ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.290 by root, Mon Jul 2 03:15:30 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 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 489 reset_signals;
435 local $SIG{__WARN__}; 490 &$cb
436 local $SIG{__DIE__}; 491 }, @args;
437 eval {
438 close $fh1;
439 492
440 my @res = eval { $cb->(@args) }; 493 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 494}
448 495
449=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
450 497
451Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
531 if (1) { 578 if (1) {
532 $md5 = 579 $md5 =
533 join "\x00", 580 join "\x00",
534 $processversion, 581 $processversion,
535 map { 582 map {
536 Coro::cede; 583 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 585 } 0.. $#$src;
539 586
540 587
541 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
847 "; 894 ";
848 die if $@; 895 die if $@;
849} 896}
850 897
851our $override; 898our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 900
854sub override { 901sub override {
855 $override = 1; 902 $override = 1;
856 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
857} 904}
858 905
859sub do_invoke { 906sub do_invoke {
860 my $event = shift; 907 my $event = shift;
861 my $callbacks = shift; 908 my $callbacks = shift;
862 909
863 @invoke_results = (); 910 @INVOKE_RESULTS = ();
864 911
865 local $override; 912 local $override;
866 913
867 for (@$callbacks) { 914 for (@$callbacks) {
868 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
885 932
886Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
887 934
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 938
892=back 939=back
893 940
894=cut 941=cut
895 942
896############################################################################# 943#############################################################################
897# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
898 956
899sub reattach { 957sub reattach {
900 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 959 my ($obj) = @_;
902 960
… …
946 }, 1004 },
947); 1005);
948 1006
949sub object_freezer_save { 1007sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
951 1011
952 sync_job { 1012 sync_job {
953 if (length $$rdata) { 1013 if (length $$rdata) {
954 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
979 } 1039 }
980 } else { 1040 } else {
981 aio_unlink $filename; 1041 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
983 } 1043 }
984 } 1044 };
1045
1046 undef $guard;
985} 1047}
986 1048
987sub object_freezer_as_string { 1049sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
989 1051
… …
994 1056
995sub object_thawer_load { 1057sub object_thawer_load {
996 my ($filename) = @_; 1058 my ($filename) = @_;
997 1059
998 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
999 1063
1000 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
1001 or return; 1065 or return;
1002 1066
1003 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1069 or return;
1070
1071 undef $guard;
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1007 } 1073 }
1008 1074
1009 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1011 return ($data, $av); 1078 ($data, $av)
1012} 1079}
1013 1080
1014=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1015 1082
1016=over 4 1083=over 4
… …
1089 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
1090 1157
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1159
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
1099 } else { 1175 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1177 }
1102 1178
1103 cf::override; 1179 cf::override;
… …
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1317
1242 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1245 } 1327 }
1246 } 1328 }
1247} 1329}
1248 1330
… …
1258 1340
1259 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1261 1343
1262 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1263 Coro::cede; 1345 cf::cede_to_tick;
1264} 1346}
1265 1347
1266sub new($) { 1348sub new($) {
1267 my ($login) = @_; 1349 my ($login) = @_;
1268 1350
… …
1272 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1273 1355
1274 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1275 1357
1276 $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 (@_);
1277} 1369}
1278 1370
1279=item $pl->quit_character 1371=item $pl->quit_character
1280 1372
1281Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
… …
1336 or return []; 1428 or return [];
1337 1429
1338 my @logins; 1430 my @logins;
1339 1431
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1344 1441
1345 utf8::decode $login; 1442 utf8::decode $login;
1346 push @logins, $login; 1443 push @logins, $login;
1347 } 1444 }
1348 1445
… …
1386sub expand_cfpod { 1483sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1388 1485
1389 # escape & and < 1486 # escape & and <
1390 s/&/&amp;/g; 1487 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1392 1489
1393 # 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
1394 1491
1395 1 while 1492 1 while
1396 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400 # replace G<male|female> tags 1498 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1403 }ge 1501 }ge
1404 # replace H<hint text> 1502 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1406 1510
1407 # create single paragraphs (very hackish) 1511 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1512 s/(?<=\S)\n(?=\w)/ /g;
1409 1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1410 $_ 1520 $_
1411} 1521}
1412 1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1413=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1414 1529
1415Sends an ext reply to the player. 1530Sends an ext reply to the player.
1416 1531
1417=cut 1532=cut
1418 1533
1419sub ext_reply($$%) { 1534sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1421 1536
1422 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424} 1538}
1425 1539
1426=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1427 1541
1428Sends an ext event to the client. 1542Sends an ext event to the client.
1429 1543
1430=cut 1544=cut
1431 1545
1432sub ext_event($$%) { 1546sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1434 1548
1435 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1436} 1550}
1437 1551
1438=head3 cf::region 1552=head3 cf::region
1439 1553
1440=over 4 1554=over 4
… …
1453 my ($path) = @_; 1567 my ($path) = @_;
1454 1568
1455 my ($match, $specificity); 1569 my ($match, $specificity);
1456 1570
1457 for my $region (list) { 1571 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1572 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1573 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1574 if $region->specificity > $specificity;
1461 } 1575 }
1462 } 1576 }
1463 1577
… …
1583 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1584 return $self; 1698 return $self;
1585 } 1699 }
1586 } 1700 }
1587 1701
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1703 ()
1590} 1704}
1591 1705
1592sub init { 1706sub init {
1593 my ($self) = @_; 1707 my ($self) = @_;
… …
1656 1770
1657sub load_header_from($) { 1771sub load_header_from($) {
1658 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1659 1773
1660 utf8::encode $path; 1774 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 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;
1666 1783
1667 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1668 1785
1669 1 1786 1
1670} 1787}
… …
1759 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1760 1877
1761 my $path = $self->{path}; 1878 my $path = $self->{path};
1762 1879
1763 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1764 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1765 1883
1766 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1767 1885
1768 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1769 1887
1770 $self->alloc; 1888 $self->alloc;
1771 1889
1772 $self->pre_load; 1890 $self->pre_load;
1773 Coro::cede; 1891 cf::cede_to_tick;
1774 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1776 or return; 1896 or return;
1777 1897
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1780 1900
1781 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 1902 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 1905 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1786 } 1909 }
1787 } 1910 }
1788 1911
1789 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1790 # now do the right thing for maps 1915 # now do the right thing for maps
1791 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 1918 unless $self->difficulty;
1794 Coro::cede; 1919 cf::cede_to_tick;
1795 1920
1796 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 1922 $self->decay_objects;
1798 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1799 $self->update_buttons; 1924 $self->update_buttons;
1800 Coro::cede; 1925 cf::cede_to_tick;
1801 $self->set_darkness_map; 1926 $self->set_darkness_map;
1802 Coro::cede; 1927 cf::cede_to_tick;
1803 $self->activate; 1928 $self->activate;
1804 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1805 1933
1806 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1807 } 1935 }
1808 1936
1809 $self->post_load; 1937 $self->post_load;
… …
1820 1948
1821 $self 1949 $self
1822} 1950}
1823 1951
1824# 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
1825sub load_diag { 1953sub load_neighbours {
1826 my ($map) = @_; 1954 my ($map) = @_;
1827 1955
1828 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1829 1957
1830 for (0 .. 3) { 1958 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1832 or next; 1960 or next;
1833 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1834 or next; 1962 or next;
1835 $neigh->load; 1963 $neigh->load;
1836 1964
1965 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 1968 }
1840 1969
1841 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1843 or next; 1973 or next;
1844 $neigh->load; 1974 $neigh->load;
1845 } 1975 }
1846} 1976}
1847 1977
… …
1852} 1982}
1853 1983
1854sub do_load_sync { 1984sub do_load_sync {
1855 my ($map) = @_; 1985 my ($map) = @_;
1856 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1857 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1858} 1991}
1859 1992
1860our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1862 1995
1863sub find_async { 1996sub find_async {
1864 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1865 1998
1866 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1867 2000
1868 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1870 } 2003 }
1871 2004
1872 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1873 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1874 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2010 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2011 $map->load if $v;
2012 }
1879 2013
1880 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1881 } 2015 }
1882 } 2016 }
1883 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1884 }; 2018 };
1885 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
1888} 2022}
1889 2023
1890sub save { 2024sub save {
1891 my ($self) = @_; 2025 my ($self) = @_;
1892 2026
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 2028
1895 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1896 2030
1897 return unless $self->dirty; 2031 return unless $self->dirty;
1898 2032
… …
1921 my ($self) = @_; 2055 my ($self) = @_;
1922 2056
1923 # save first because save cedes 2057 # save first because save cedes
1924 $self->save; 2058 $self->save;
1925 2059
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2061
1928 return if $self->players; 2062 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1930 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1931 2065
… …
1983my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1984 2118
1985sub nuke { 2119sub nuke {
1986 my ($self) = @_; 2120 my ($self) = @_;
1987 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
1988 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
1989 2126
1990 $self->unlink_save; 2127 $self->unlink_save;
1991 2128
1992 bless $self, "cf::map"; 2129 bless $self, "cf::map";
1993 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2134
1998 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
1999 2137
2000 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2001} 2139}
2002 2140
2003=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2079 2217
2080sub inv_recursive { 2218sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2082} 2220}
2083 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
2084package cf; 2253package cf;
2085 2254
2086=back 2255=back
2087 2256
2088=head3 cf::object::player 2257=head3 cf::object::player
… …
2110 2279
2111 } else { 2280 } else {
2112 my $pl = $self->contr; 2281 my $pl = $self->contr;
2113 2282
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2284 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2286
2123 } else { 2287 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2126 } 2290 }
2127 } 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 (@_);
2128} 2302}
2129 2303
2130=item $player_object->may ("access") 2304=item $player_object->may ("access")
2131 2305
2132Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
… …
2211 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2214 2388
2215 $map->load; 2389 $map->load;
2216 $map->load_diag; 2390 $map->load_neighbours;
2217 2391
2218 return unless $self->contr->active; 2392 return unless $self->contr->active;
2219 $self->activate_recursive; 2393 $self->activate_recursive;
2220 2394
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
2223} 2397}
2224 2398
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2400
2227Moves 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
2228her, loading and preparing them map, calling the provided $check callback 2402her, loading and preparing them map, calling the provided $check callback
2229that 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
2230the 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.
2231 2406
2232=cut 2407=cut
2233 2408
2234our $GOTOGEN; 2409our $GOTOGEN;
2235 2410
2236sub cf::object::player::goto { 2411sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2413
2239 # 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
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2416
2242 $self->enter_link; 2417 $self->enter_link;
… …
2262 2437
2263 if ($gen == $self->{_goto_generation}) { 2438 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2439 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2266 } 2441 }
2442
2443 $done->() if $done;
2267 })->prio (1); 2444 })->prio (1);
2268} 2445}
2269 2446
2270=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
2271 2448
… …
2340 my $hp = $exit->stats->hp; 2517 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2518 my $sp = $exit->stats->sp;
2342 2519
2343 $self->enter_link; 2520 $self->enter_link;
2344 2521
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
2525
2345 (async { 2526 (async {
2346 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2528 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2529 $self->goto ($slaying, $hp, $sp);
2349 2530
… …
2376 2557
2377 utf8::encode $text; 2558 utf8::encode $text;
2378 $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);
2379} 2560}
2380 2561
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2563
2383Send 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
2384client 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
2385the 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
2386the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2387 2568
2388=cut 2569=cut
2389 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
2390sub cf::client::send_msg { 2586sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2588
2393 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2394 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
2607 return unless @extra || length $msg;
2608
2395 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
2396 $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]));
2397 } else { 2616 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 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
2409 if (0 && $msg =~ /\[/) { 2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2635 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2637 $self->send_packet ("drawinfo $color $msg")
2414 } 2638 }
2415 } 2639 }
2416 } 2640 }
2417} 2641}
2418 2642
2419=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2420 2644
2421Sends an ext event to the client. 2645Sends an ext event to the client.
2422 2646
2423=cut 2647=cut
2424 2648
2425sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2427 2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2429 $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 }
2430} 2676}
2431 2677
2432=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2433 2679
2434Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
… …
2489 my ($ns, $buf) = @_; 2735 my ($ns, $buf) = @_;
2490 2736
2491 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2492 2738
2493 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
2494 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2747 if (my $cb = $EXTICMD{$type}) {
2495 if (my %reply = $cb->($ns, $msg)) { 2748 @reply = $cb->($ns, @payload);
2496 $reply{msgid} = $msg->{msgid};
2497 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2498 }
2499 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2500 } else { 2754 } else {
2501 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";
2502 } 2756 }
2503 2757
2504 cf::override; 2758 cf::override;
… …
2551our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2552our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2553 2807
2554$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2555 2809
2556$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));
2557 2815
2558# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2559 2817
2560=pod 2818=pod
2561 2819
2562The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2563 2821
2564 cf::object contr pay_amount pay_player map 2822 cf::object
2823 contr pay_amount pay_player map x y force_find force_add
2824 insert remove name archname title slaying race decrease_ob_nr
2825
2565 cf::object::player player 2826 cf::object::player
2566 cf::player peaceful 2827 player
2567 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2568 2834
2569=cut 2835=cut
2570 2836
2571for ( 2837for (
2572 ["cf::object" => qw(contr pay_amount pay_player map)], 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
2840 decrease_ob_nr)],
2573 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2574 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2575 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2576) { 2844) {
2577 no strict 'refs'; 2845 no strict 'refs';
… …
2653# the server's init and main functions 2921# the server's init and main functions
2654 2922
2655sub load_facedata($) { 2923sub load_facedata($) {
2656 my ($path) = @_; 2924 my ($path) = @_;
2657 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
2658 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2659 2933
2660 my $facedata; 2934 my $facedata;
2661 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2662 or die "$path: $!"; 2936 or die "$path: $!";
… …
2664 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2665 2939
2666 $facedata->{version} == 2 2940 $facedata->{version} == 2
2667 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2668 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
2669 { 2950 {
2670 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2671 2952
2672 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2673 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2674 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2675 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2676 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2677 Coro::cede; 2959
2960 cf::cede_to_tick;
2678 } 2961 }
2679 2962
2680 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2681 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2682 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2683 or next; 2966 or next;
2684 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2685 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2686 } else { 2970 } else {
2687 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2688 } 2972 }
2689 Coro::cede; 2973
2974 cf::cede_to_tick;
2690 } 2975 }
2691 } 2976 }
2692 2977
2693 { 2978 {
2694 my $anims = $facedata->{animinfo}; 2979 my $anims = $facedata->{animinfo};
2695 2980
2696 while (my ($anim, $info) = each %$anims) { 2981 while (my ($anim, $info) = each %$anims) {
2697 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2698 Coro::cede; 2983 cf::cede_to_tick;
2699 } 2984 }
2700 2985
2701 cf::anim::invalidate_all; # d'oh 2986 cf::anim::invalidate_all; # d'oh
2702 } 2987 }
2703 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
2704 1 3038 1
2705} 3039}
2706 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
2707sub 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
2708 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2709 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 }
2710} 3061}
2711 3062
2712sub reload_facedata { 3063sub reload_facedata {
2713 load_facedata "$DATADIR/facedata" 3064 load_facedata "$DATADIR/facedata"
2714 or die "unable to load facedata\n"; 3065 or die "unable to load facedata\n";
… …
2743 3094
2744sub init { 3095sub init {
2745 reload_resources; 3096 reload_resources;
2746} 3097}
2747 3098
2748sub cfg_load { 3099sub reload_config {
2749 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2750 or return; 3101 or return;
2751 3102
2752 local $/; 3103 local $/;
2753 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
2773 (async { 3124 (async {
2774 Event::one_event; 3125 Event::one_event;
2775 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2776 }; 3127 };
2777 3128
2778 cfg_load; 3129 reload_config;
2779 db_init; 3130 db_init;
2780 load_extensions; 3131 load_extensions;
2781 3132
2782 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2783 Event::loop; 3134 Event::loop;
… …
2976 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2977 require cf; 3328 require cf;
2978 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2979 3330
2980 warn "loading config and database again"; 3331 warn "loading config and database again";
2981 cf::cfg_load; 3332 cf::reload_config;
2982 3333
2983 warn "loading extensions"; 3334 warn "loading extensions";
2984 cf::load_extensions; 3335 cf::load_extensions;
2985 3336
2986 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3079 or die; 3430 or die;
3080 3431
3081 $map->width (50); 3432 $map->width (50);
3082 $map->height (50); 3433 $map->height (50);
3083 $map->alloc; 3434 $map->alloc;
3084 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3085 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3086 3437
3087 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3088 if ($t < $min) { 3439 if ($t < $min) {
3089 $min = $t; 3440 $min = $t;

Diff Legend

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