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.287 by root, Mon Jun 25 05:43:45 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
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
… …
84our %CFG; 87our %CFG;
85 88
86our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 90our $RUNTIME;
88 91
89our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
92 95
93# 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 ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 98
… …
164=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
165 168
166These 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
167returns 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
168per 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.
169 178
170=back 179=back
171 180
172=cut 181=cut
173 182
… …
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 247 $d
239 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
240} 249}
241 250
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
245 252
246Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
247 254
248=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
249 256
250Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
251 258
252=cut 259=cut
253 260
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 262
256sub to_json ($) { $json_coder->encode ($_[0]) } 263sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 264sub from_json ($) { $json_coder->decode ($_[0]) }
258 265
259=item cf::lock_wait $string 266=item cf::lock_wait $string
… …
264 271
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
268returned. 275returned.
276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
269 279
270Lock 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
271uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
272 282
273=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
… …
314 my $guard = Coro::guard { 324 my $guard = Coro::guard {
315 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
316 }; 326 };
317 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
318 $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;
319} 385}
320 386
321=item cf::async { BLOCK } 387=item cf::async { BLOCK }
322 388
323Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
413=cut 479=cut
414 480
415sub fork_call(&@) { 481sub fork_call(&@) {
416 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
417 483
418# 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,
419# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 487
423 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$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 eval {
439 close $fh1;
440 492
441 my @res = eval { $cb->(@args) }; 493 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
447 }
448} 494}
449 495
450=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
451 497
452Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
532 if (1) { 578 if (1) {
533 $md5 = 579 $md5 =
534 join "\x00", 580 join "\x00",
535 $processversion, 581 $processversion,
536 map { 582 map {
537 Coro::cede; 583 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 585 } 0.. $#$src;
540 586
541 587
542 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
848 "; 894 ";
849 die if $@; 895 die if $@;
850} 896}
851 897
852our $override; 898our $override;
853our @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?
854 900
855sub override { 901sub override {
856 $override = 1; 902 $override = 1;
857 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
858} 904}
859 905
860sub do_invoke { 906sub do_invoke {
861 my $event = shift; 907 my $event = shift;
862 my $callbacks = shift; 908 my $callbacks = shift;
863 909
864 @invoke_results = (); 910 @INVOKE_RESULTS = ();
865 911
866 local $override; 912 local $override;
867 913
868 for (@$callbacks) { 914 for (@$callbacks) {
869 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
886 932
887Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
888 934
889This 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
890removed 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
891results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 938
893=back 939=back
894 940
895=cut 941=cut
896 942
897############################################################################# 943#############################################################################
898# 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}
899 956
900sub reattach { 957sub reattach {
901 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 959 my ($obj) = @_;
903 960
… …
947 }, 1004 },
948); 1005);
949 1006
950sub object_freezer_save { 1007sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1008 my ($filename, $rdata, $objs) = @_;
1009
1010 my $guard = cf::lock_acquire "io";
952 1011
953 sync_job { 1012 sync_job {
954 if (length $$rdata) { 1013 if (length $$rdata) {
955 warn sprintf "saving %s (%d,%d)\n", 1014 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1015 $filename, length $$rdata, scalar @$objs;
… …
980 } 1039 }
981 } else { 1040 } else {
982 aio_unlink $filename; 1041 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1042 aio_unlink "$filename.pst";
984 } 1043 }
985 } 1044 };
1045
1046 undef $guard;
986} 1047}
987 1048
988sub object_freezer_as_string { 1049sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1050 my ($rdata, $objs) = @_;
990 1051
… …
995 1056
996sub object_thawer_load { 1057sub object_thawer_load {
997 my ($filename) = @_; 1058 my ($filename) = @_;
998 1059
999 my ($data, $av); 1060 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1000 1063
1001 (aio_load $filename, $data) >= 0 1064 (aio_load $filename, $data) >= 0
1002 or return; 1065 or return;
1003 1066
1004 unless (aio_stat "$filename.pst") { 1067 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1068 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1069 or return;
1070
1071 undef $guard;
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1072 $av = eval { (Storable::thaw $av)->{objs} };
1008 } 1073 }
1009 1074
1010 warn sprintf "loading %s (%d)\n", 1075 warn sprintf "loading %s (%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1076 $filename, length $data, scalar @{$av || []};
1077
1012 return ($data, $av); 1078 ($data, $av)
1013} 1079}
1014 1080
1015=head2 COMMAND CALLBACKS 1081=head2 COMMAND CALLBACKS
1016 1082
1017=over 4 1083=over 4
… …
1087 cf::override; 1153 cf::override;
1088 }, 1154 },
1089 on_extcmd => sub { 1155 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1156 my ($pl, $buf) = @_;
1091 1157
1092 my $msg = eval { from_json $buf }; 1158 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1159
1094 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
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1168 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1169 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1170 }
1171
1172 $pl->ext_reply ($reply, @reply)
1173 if $reply;
1174
1100 } else { 1175 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1176 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1177 }
1103 1178
1104 cf::override; 1179 cf::override;
… …
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1313 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1314 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1315 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1316 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1317
1243 my $pl = load_pl path $login 1318 my $f = new_from_file cf::object::thawer path $login
1244 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;
1245 $cf::PLAYER{$login} = $pl 1326 $cf::PLAYER{$login} = $pl
1246 } 1327 }
1247 } 1328 }
1248} 1329}
1249 1330
… …
1259 1340
1260 aio_mkdir playerdir $pl, 0770; 1341 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1342 $pl->{last_save} = $cf::RUNTIME;
1262 1343
1263 $pl->save_pl ($path); 1344 $pl->save_pl ($path);
1264 Coro::cede; 1345 cf::cede_to_tick;
1265} 1346}
1266 1347
1267sub new($) { 1348sub new($) {
1268 my ($login) = @_; 1349 my ($login) = @_;
1269 1350
… …
1273 $self->{deny_save} = 1; 1354 $self->{deny_save} = 1;
1274 1355
1275 $cf::PLAYER{$login} = $self; 1356 $cf::PLAYER{$login} = $self;
1276 1357
1277 $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 (@_);
1278} 1369}
1279 1370
1280=item $pl->quit_character 1371=item $pl->quit_character
1281 1372
1282Nukes the player without looking back. If logged in, the connection will 1373Nukes the player without looking back. If logged in, the connection will
… …
1337 or return []; 1428 or return [];
1338 1429
1339 my @logins; 1430 my @logins;
1340 1431
1341 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") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1438 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1439 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 }
1345 1441
1346 utf8::decode $login; 1442 utf8::decode $login;
1347 push @logins, $login; 1443 push @logins, $login;
1348 } 1444 }
1349 1445
… …
1387sub expand_cfpod { 1483sub expand_cfpod {
1388 ((my $self), (local $_)) = @_; 1484 ((my $self), (local $_)) = @_;
1389 1485
1390 # escape & and < 1486 # escape & and <
1391 s/&/&amp;/g; 1487 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g; 1488 s/(?<![BIUGHT])</&lt;/g;
1393 1489
1394 # 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
1395 1491
1396 1 while 1492 1 while
1397 # replace B<>, I<>, U<> etc. 1493 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/ 1494 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/ 1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/ 1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401 # replace G<male|female> tags 1498 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1499 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1500 $self->gender ? $2 : $1
1404 }ge 1501 }ge
1405 # replace H<hint text> 1502 # replace H<hint text>
1406 || 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;
1407 1510
1408 # create single paragraphs (very hackish) 1511 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1512 s/(?<=\S)\n(?=\w)/ /g;
1410 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
1411 $_ 1520 $_
1412} 1521}
1413 1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1414=item $player->ext_reply ($msgid, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1415 1529
1416Sends an ext reply to the player. 1530Sends an ext reply to the player.
1417 1531
1418=cut 1532=cut
1419 1533
1420sub ext_reply($$%) { 1534sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1422 1536
1423 $msg{msgid} = $id; 1537 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1538}
1426 1539
1427=item $player->ext_event ($type, %msg) 1540=item $player->ext_msg ($type, @msg)
1428 1541
1429Sends an ext event to the client. 1542Sends an ext event to the client.
1430 1543
1431=cut 1544=cut
1432 1545
1433sub ext_event($$%) { 1546sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1547 my ($self, $type, @msg) = @_;
1435 1548
1436 $self->ns->ext_event ($type, %msg); 1549 $self->ns->ext_msg ($type, @msg);
1437} 1550}
1438 1551
1439=head3 cf::region 1552=head3 cf::region
1440 1553
1441=over 4 1554=over 4
… …
1454 my ($path) = @_; 1567 my ($path) = @_;
1455 1568
1456 my ($match, $specificity); 1569 my ($match, $specificity);
1457 1570
1458 for my $region (list) { 1571 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1572 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1573 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1574 if $region->specificity > $specificity;
1462 } 1575 }
1463 } 1576 }
1464 1577
… …
1584 $self->init; # pass $1 etc. 1697 $self->init; # pass $1 etc.
1585 return $self; 1698 return $self;
1586 } 1699 }
1587 } 1700 }
1588 1701
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1702 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1703 ()
1591} 1704}
1592 1705
1593sub init { 1706sub init {
1594 my ($self) = @_; 1707 my ($self) = @_;
… …
1657 1770
1658sub load_header_from($) { 1771sub load_header_from($) {
1659 my ($self, $path) = @_; 1772 my ($self, $path) = @_;
1660 1773
1661 utf8::encode $path; 1774 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1775 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 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;
1667 1783
1668 $self->{load_path} = $path; 1784 $self->{load_path} = $path;
1669 1785
1670 1 1786 1
1671} 1787}
… …
1760 local $self->{deny_reset} = 1; # loading can take a long time 1876 local $self->{deny_reset} = 1; # loading can take a long time
1761 1877
1762 my $path = $self->{path}; 1878 my $path = $self->{path};
1763 1879
1764 { 1880 {
1881 my $guard1 = cf::lock_acquire "map_data:$path";
1765 my $guard = cf::lock_acquire "map_load:$path"; 1882 my $guard2 = cf::lock_acquire "map_load:$path";
1766 1883
1767 return if $self->in_memory != cf::MAP_SWAPPED; 1884 return if $self->in_memory != cf::MAP_SWAPPED;
1768 1885
1769 $self->in_memory (cf::MAP_LOADING); 1886 $self->in_memory (cf::MAP_LOADING);
1770 1887
1771 $self->alloc; 1888 $self->alloc;
1772 1889
1773 $self->pre_load; 1890 $self->pre_load;
1774 Coro::cede; 1891 cf::cede_to_tick;
1775 1892
1893 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 1895 $self->_load_objects ($f)
1777 or return; 1896 or return;
1778 1897
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780 if delete $self->{load_original}; 1899 if delete $self->{load_original};
1781 1900
1782 if (my $uniq = $self->uniq_path) { 1901 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 1902 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 1903 unless (aio_stat $uniq) {
1904 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 1905 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 1906 $self->_load_objects ($f);
1907 $f->resolve_delayed_derefs;
1908 }
1787 } 1909 }
1788 } 1910 }
1789 1911
1790 Coro::cede; 1912 $f->resolve_delayed_derefs;
1913
1914 cf::cede_to_tick;
1791 # now do the right thing for maps 1915 # now do the right thing for maps
1792 $self->link_multipart_objects; 1916 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 1917 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 1918 unless $self->difficulty;
1795 Coro::cede; 1919 cf::cede_to_tick;
1796 1920
1797 unless ($self->{deny_activate}) { 1921 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 1922 $self->decay_objects;
1799 $self->fix_auto_apply; 1923 $self->fix_auto_apply;
1800 $self->update_buttons; 1924 $self->update_buttons;
1801 Coro::cede; 1925 cf::cede_to_tick;
1802 $self->set_darkness_map; 1926 $self->set_darkness_map;
1803 Coro::cede; 1927 cf::cede_to_tick;
1804 $self->activate; 1928 $self->activate;
1805 } 1929 }
1930
1931 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME);
1806 1933
1807 $self->in_memory (cf::MAP_IN_MEMORY); 1934 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 1935 }
1809 1936
1810 $self->post_load; 1937 $self->post_load;
… …
1821 1948
1822 $self 1949 $self
1823} 1950}
1824 1951
1825# 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
1826sub load_diag { 1953sub load_neighbours {
1827 my ($map) = @_; 1954 my ($map) = @_;
1828 1955
1829 my @diag; # diagonal neighbours 1956 my @neigh; # diagonal neighbours
1830 1957
1831 for (0 .. 3) { 1958 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 1959 my $neigh = $map->tile_path ($_)
1833 or next; 1960 or next;
1834 $neigh = find $neigh, $map 1961 $neigh = find $neigh, $map
1835 or next; 1962 or next;
1836 $neigh->load; 1963 $neigh->load;
1837 1964
1965 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1966 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1967 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 1968 }
1841 1969
1842 for (@diag) { 1970 for (grep defined $_->[0], @neigh) {
1971 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 1972 my $neigh = find $path, $origin
1844 or next; 1973 or next;
1845 $neigh->load; 1974 $neigh->load;
1846 } 1975 }
1847} 1976}
1848 1977
… …
1853} 1982}
1854 1983
1855sub do_load_sync { 1984sub do_load_sync {
1856 my ($map) = @_; 1985 my ($map) = @_;
1857 1986
1987 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1988 if $Coro::current == $Coro::main;
1989
1858 cf::sync_job { $map->load }; 1990 cf::sync_job { $map->load };
1859} 1991}
1860 1992
1861our %MAP_PREFETCH; 1993our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 1994our $MAP_PREFETCHER = undef;
1863 1995
1864sub find_async { 1996sub find_async {
1865 my ($path, $origin) = @_; 1997 my ($path, $origin, $load) = @_;
1866 1998
1867 $path = normalise $path, $origin && $origin->{path}; 1999 $path = normalise $path, $origin && $origin->{path};
1868 2000
1869 if (my $map = $cf::MAP{$path}) { 2001 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 2003 }
1872 2004
1873 undef $MAP_PREFETCH{$path}; 2005 $MAP_PREFETCH{$path} |= $load;
2006
1874 $MAP_PREFETCHER ||= cf::async { 2007 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 2008 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2009 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2010 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2011 $map->load if $v;
2012 }
1880 2013
1881 delete $MAP_PREFETCH{$path}; 2014 delete $MAP_PREFETCH{$k};
1882 } 2015 }
1883 } 2016 }
1884 undef $MAP_PREFETCHER; 2017 undef $MAP_PREFETCHER;
1885 }; 2018 };
1886 $MAP_PREFETCHER->prio (6); 2019 $MAP_PREFETCHER->prio (6);
… …
1889} 2022}
1890 2023
1891sub save { 2024sub save {
1892 my ($self) = @_; 2025 my ($self) = @_;
1893 2026
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2027 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2028
1896 $self->{last_save} = $cf::RUNTIME; 2029 $self->{last_save} = $cf::RUNTIME;
1897 2030
1898 return unless $self->dirty; 2031 return unless $self->dirty;
1899 2032
… …
1922 my ($self) = @_; 2055 my ($self) = @_;
1923 2056
1924 # save first because save cedes 2057 # save first because save cedes
1925 $self->save; 2058 $self->save;
1926 2059
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2061
1929 return if $self->players; 2062 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2063 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save}; 2064 return if $self->{deny_save};
1932 2065
… …
1984my $nuke_counter = "aaaa"; 2117my $nuke_counter = "aaaa";
1985 2118
1986sub nuke { 2119sub nuke {
1987 my ($self) = @_; 2120 my ($self) = @_;
1988 2121
2122 {
2123 my $lock = cf::lock_acquire "map_data:$self->{path}";
2124
1989 delete $cf::MAP{$self->path}; 2125 delete $cf::MAP{$self->path};
1990 2126
1991 $self->unlink_save; 2127 $self->unlink_save;
1992 2128
1993 bless $self, "cf::map"; 2129 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2130 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2131 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2132 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2133 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2134
1999 $cf::MAP{$self->path} = $self; 2135 $cf::MAP{$self->path} = $self;
2136 }
2000 2137
2001 $self->reset; # polite request, might not happen 2138 $self->reset; # polite request, might not happen
2002} 2139}
2003 2140
2004=item $maps = cf::map::tmp_maps 2141=item $maps = cf::map::tmp_maps
… …
2080 2217
2081sub inv_recursive { 2218sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2219 inv_recursive_ inv $_[0]
2083} 2220}
2084 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
2085package cf; 2253package cf;
2086 2254
2087=back 2255=back
2088 2256
2089=head3 cf::object::player 2257=head3 cf::object::player
… …
2111 2279
2112 } else { 2280 } else {
2113 my $pl = $self->contr; 2281 my $pl = $self->contr;
2114 2282
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2283 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2284 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2286
2124 } else { 2287 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2288 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2289 $self->message ($msg, $flags);
2127 } 2290 }
2128 } 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 (@_);
2129} 2302}
2130 2303
2131=item $player_object->may ("access") 2304=item $player_object->may ("access")
2132 2305
2133Returns wether the given player is authorized to access resource "access" 2306Returns wether the given player is authorized to access resource "access"
… …
2212 # use -1 or undef as default coordinates, not 0, 0 2385 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2386 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2387 if $x <=0 && $y <= 0;
2215 2388
2216 $map->load; 2389 $map->load;
2217 $map->load_diag; 2390 $map->load_neighbours;
2218 2391
2219 return unless $self->contr->active; 2392 return unless $self->contr->active;
2220 $self->activate_recursive; 2393 $self->activate_recursive;
2221 2394
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2396 $self->enter_map ($map, $x, $y);
2224} 2397}
2225 2398
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2399=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2400
2228Moves 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
2229her, loading and preparing them map, calling the provided $check callback 2402her, loading and preparing them map, calling the provided $check callback
2230that 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
2231the 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.
2232 2406
2233=cut 2407=cut
2234 2408
2235our $GOTOGEN; 2409our $GOTOGEN;
2236 2410
2237sub cf::object::player::goto { 2411sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2412 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2413
2240 # 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
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2416
2243 $self->enter_link; 2417 $self->enter_link;
… …
2263 2437
2264 if ($gen == $self->{_goto_generation}) { 2438 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2439 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2440 $self->leave_link ($map, $x, $y);
2267 } 2441 }
2442
2443 $done->() if $done;
2268 })->prio (1); 2444 })->prio (1);
2269} 2445}
2270 2446
2271=item $player_object->enter_exit ($exit_object) 2447=item $player_object->enter_exit ($exit_object)
2272 2448
… …
2341 my $hp = $exit->stats->hp; 2517 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2518 my $sp = $exit->stats->sp;
2343 2519
2344 $self->enter_link; 2520 $self->enter_link;
2345 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
2346 (async { 2526 (async {
2347 $self->deactivate_recursive; # just to be sure 2527 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2528 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2529 $self->goto ($slaying, $hp, $sp);
2350 2530
… …
2377 2557
2378 utf8::encode $text; 2558 utf8::encode $text;
2379 $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);
2380} 2560}
2381 2561
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2562=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2563
2384Send 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
2385client 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
2386the 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
2387the message unless the client supports the msg packet. 2567the message unless the client supports the msg packet.
2388 2568
2389=cut 2569=cut
2390 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
2391sub cf::client::send_msg { 2586sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2587 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2588
2394 $msg = $self->pl->expand_cfpod ($msg); 2589 $msg = $self->pl->expand_cfpod ($msg);
2395 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
2396 if ($self->can_msg) { 2609 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2610 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF;
2613
2614 $self->send_packet ("msg " . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2616 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 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
2410 if (0 && $msg =~ /\[/) { 2632 if (0 && $msg =~ /\[/) {
2633 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2635 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2637 $self->send_packet ("drawinfo $color $msg")
2415 } 2638 }
2416 } 2639 }
2417 } 2640 }
2418} 2641}
2419 2642
2420=item $client->ext_event ($type, %msg) 2643=item $client->ext_msg ($type, @msg)
2421 2644
2422Sends an ext event to the client. 2645Sends an ext event to the client.
2423 2646
2424=cut 2647=cut
2425 2648
2426sub cf::client::ext_event($$%) { 2649sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2650 my ($self, $type, @msg) = @_;
2428 2651
2652 if ($self->extcmd == 2) {
2653 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2654 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2655 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%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 }
2431} 2676}
2432 2677
2433=item $success = $client->query ($flags, "text", \&cb) 2678=item $success = $client->query ($flags, "text", \&cb)
2434 2679
2435Queues a query to the client, calling the given callback with 2680Queues a query to the client, calling the given callback with
… …
2458 2703
2459 1 2704 1
2460} 2705}
2461 2706
2462cf::client->attach ( 2707cf::client->attach (
2708 on_connect => sub {
2709 my ($ns) = @_;
2710
2711 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2712 },
2463 on_reply => sub { 2713 on_reply => sub {
2464 my ($ns, $msg) = @_; 2714 my ($ns, $msg) = @_;
2465 2715
2466 # this weird shuffling is so that direct followup queries 2716 # this weird shuffling is so that direct followup queries
2467 # get handled first 2717 # get handled first
… …
2482 } 2732 }
2483 }, 2733 },
2484 on_exticmd => sub { 2734 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2735 my ($ns, $buf) = @_;
2486 2736
2487 my $msg = eval { from_json $buf }; 2737 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2738
2489 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
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2747 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2748 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2749 }
2750
2751 $ns->ext_reply ($reply, @reply)
2752 if $reply;
2753
2496 } else { 2754 } else {
2497 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";
2498 } 2756 }
2499 2757
2500 cf::override; 2758 cf::override;
… …
2547our $safe = new Safe "safe"; 2805our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 2806our $safe_hole = new Safe::Hole;
2549 2807
2550$SIG{FPE} = 'IGNORE'; 2808$SIG{FPE} = 'IGNORE';
2551 2809
2552$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));
2553 2815
2554# here we export the classes and methods available to script code 2816# here we export the classes and methods available to script code
2555 2817
2556=pod 2818=pod
2557 2819
2558The following functions and methods are available within a safe environment: 2820The following functions and methods are available within a safe environment:
2559 2821
2560 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
2561 cf::object::player player 2826 cf::object::player
2562 cf::player peaceful 2827 player
2563 cf::map trigger 2828
2829 cf::player
2830 peaceful
2831
2832 cf::map
2833 trigger
2564 2834
2565=cut 2835=cut
2566 2836
2567for ( 2837for (
2568 ["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)],
2569 ["cf::object::player" => qw(player)], 2841 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2842 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2843 ["cf::map" => qw(trigger)],
2572) { 2844) {
2573 no strict 'refs'; 2845 no strict 'refs';
… …
2649# the server's init and main functions 2921# the server's init and main functions
2650 2922
2651sub load_facedata($) { 2923sub load_facedata($) {
2652 my ($path) = @_; 2924 my ($path) = @_;
2653 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
2654 warn "loading facedata from $path\n"; 2932 warn "loading facedata from $path\n";
2655 2933
2656 my $facedata; 2934 my $facedata;
2657 0 < aio_load $path, $facedata 2935 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 2936 or die "$path: $!";
… …
2660 $facedata = Coro::Storable::thaw $facedata; 2938 $facedata = Coro::Storable::thaw $facedata;
2661 2939
2662 $facedata->{version} == 2 2940 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 2941 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 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
2665 { 2950 {
2666 my $faces = $facedata->{faceinfo}; 2951 my $faces = $facedata->{faceinfo};
2667 2952
2668 while (my ($face, $info) = each %$faces) { 2953 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2954 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2955 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 2959
2960 cf::cede_to_tick;
2674 } 2961 }
2675 2962
2676 while (my ($face, $info) = each %$faces) { 2963 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2964 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2965 my $idx = cf::face::find $face
2679 or next; 2966 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2967 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2970 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2971 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2972 }
2685 Coro::cede; 2973
2974 cf::cede_to_tick;
2686 } 2975 }
2687 } 2976 }
2688 2977
2689 { 2978 {
2690 my $anims = $facedata->{animinfo}; 2979 my $anims = $facedata->{animinfo};
2691 2980
2692 while (my ($anim, $info) = each %$anims) { 2981 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2982 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2983 cf::cede_to_tick;
2695 } 2984 }
2696 2985
2697 cf::anim::invalidate_all; # d'oh 2986 cf::anim::invalidate_all; # d'oh
2698 } 2987 }
2699 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
2700 1 3038 1
2701} 3039}
2702 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
2703sub 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
2704 load_resource_file "$MAPDIR/regions" 3054 load_resource_file "$MAPDIR/regions"
2705 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 }
2706} 3061}
2707 3062
2708sub reload_facedata { 3063sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3064 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3065 or die "unable to load facedata\n";
2711} 3066}
2712 3067
2713sub reload_archetypes { 3068sub reload_archetypes {
3069 load_resource_file "$DATADIR/archetypes"
3070 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 3074 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 3075 or die "unable to load archetypes\n";
2716} 3076}
2717 3077
2718sub reload_treasures { 3078sub reload_treasures {
… …
2734 3094
2735sub init { 3095sub init {
2736 reload_resources; 3096 reload_resources;
2737} 3097}
2738 3098
2739sub cfg_load { 3099sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3100 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3101 or return;
2742 3102
2743 local $/; 3103 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3104 *CFG = YAML::Syck::Load <$fh>;
… …
2764 (async { 3124 (async {
2765 Event::one_event; 3125 Event::one_event;
2766 })->prio (Coro::PRIO_MAX); 3126 })->prio (Coro::PRIO_MAX);
2767 }; 3127 };
2768 3128
2769 cfg_load; 3129 reload_config;
2770 db_init; 3130 db_init;
2771 load_extensions; 3131 load_extensions;
2772 3132
2773 $TICK_WATCHER->start; 3133 $TICK_WATCHER->start;
2774 Event::loop; 3134 Event::loop;
… …
2967 warn "reloading cf.pm"; 3327 warn "reloading cf.pm";
2968 require cf; 3328 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3330
2971 warn "loading config and database again"; 3331 warn "loading config and database again";
2972 cf::cfg_load; 3332 cf::reload_config;
2973 3333
2974 warn "loading extensions"; 3334 warn "loading extensions";
2975 cf::load_extensions; 3335 cf::load_extensions;
2976 3336
2977 warn "reattaching attachments to objects/players"; 3337 warn "reattaching attachments to objects/players";
… …
3070 or die; 3430 or die;
3071 3431
3072 $map->width (50); 3432 $map->width (50);
3073 $map->height (50); 3433 $map->height (50);
3074 $map->alloc; 3434 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1); 3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3076 my $t = Event::time - $t; 3436 my $t = Event::time - $t;
3077 3437
3078 #next unless $t < 0.0013;#d# 3438 #next unless $t < 0.0013;#d#
3079 if ($t < $min) { 3439 if ($t < $min) {
3080 $min = $t; 3440 $min = $t;

Diff Legend

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