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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.359 by root, Sat Sep 8 18:15:55 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
274Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
275 286
276=cut 287=cut
277 288
278our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
279 291
280sub lock_wait($) { 292sub lock_wait($) {
281 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
282 299
283 # wait for lock, if any 300 # wait for lock, if any
284 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 303 Coro::schedule;
… …
292 309
293 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
294 lock_wait $key; 311 lock_wait $key;
295 312
296 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
297 315
298 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
301 } 320 }
302} 321}
303 322
… …
313 my $guard = Coro::guard { 332 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 333 $TICK_WATCHER->start;
315 }; 334 };
316 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
317 $guard 336 $guard
337}
338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
318} 393}
319 394
320=item cf::async { BLOCK } 395=item cf::async { BLOCK }
321 396
322Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 484Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 485never block itself or use any form of Event handling.
411 486
412=cut 487=cut
413 488
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 489sub fork_call(&@) {
424 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
425 491
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 492 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 495
431 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 497 reset_signals;
445 local $SIG{__WARN__}; 498 &$cb
446 local $SIG{__DIE__}; 499 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 500
453 eval { 501 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 502}
466 503
467=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
468 505
469Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
549 if (1) { 586 if (1) {
550 $md5 = 587 $md5 =
551 join "\x00", 588 join "\x00",
552 $processversion, 589 $processversion,
553 map { 590 map {
554 Coro::cede; 591 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 593 } 0.. $#$src;
557 594
558 595
559 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
865 "; 902 ";
866 die if $@; 903 die if $@;
867} 904}
868 905
869our $override; 906our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 908
872sub override { 909sub override {
873 $override = 1; 910 $override = 1;
874 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
875} 912}
876 913
877sub do_invoke { 914sub do_invoke {
878 my $event = shift; 915 my $event = shift;
879 my $callbacks = shift; 916 my $callbacks = shift;
880 917
881 @invoke_results = (); 918 @INVOKE_RESULTS = ();
882 919
883 local $override; 920 local $override;
884 921
885 for (@$callbacks) { 922 for (@$callbacks) {
886 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
… …
903 940
904Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
905 942
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 946
910=back 947=back
911 948
912=cut 949=cut
913 950
914############################################################################# 951#############################################################################
915# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
916 964
917sub reattach { 965sub reattach {
918 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 967 my ($obj) = @_;
920 968
… …
964 }, 1012 },
965); 1013);
966 1014
967sub object_freezer_save { 1015sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
969 1019
970 sync_job { 1020 sync_job {
971 if (length $$rdata) { 1021 if (length $$rdata) {
972 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
997 } 1047 }
998 } else { 1048 } else {
999 aio_unlink $filename; 1049 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1001 } 1051 }
1002 } 1052 };
1053
1054 undef $guard;
1003} 1055}
1004 1056
1005sub object_freezer_as_string { 1057sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1007 1059
… …
1012 1064
1013sub object_thawer_load { 1065sub object_thawer_load {
1014 my ($filename) = @_; 1066 my ($filename) = @_;
1015 1067
1016 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1017 1071
1018 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1019 or return; 1073 or return;
1020 1074
1021 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1077 or return;
1078
1079 undef $guard;
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1025 } 1081 }
1026 1082
1027 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1029 return ($data, $av); 1086 ($data, $av)
1030} 1087}
1031 1088
1032=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1033 1090
1034=over 4 1091=over 4
… …
1107 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1108 1165
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1167
1111 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1117 } else { 1183 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1185 }
1120 1186
1121 cf::override; 1187 cf::override;
… …
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1325
1260 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1261 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
1262 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1263 } 1335 }
1264 } 1336 }
1265} 1337}
1266 1338
… …
1276 1348
1277 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1279 1351
1280 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1281 Coro::cede; 1353 cf::cede_to_tick;
1282} 1354}
1283 1355
1284sub new($) { 1356sub new($) {
1285 my ($login) = @_; 1357 my ($login) = @_;
1286 1358
… …
1290 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1291 1363
1292 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1293 1365
1294 $self 1366 $self
1367}
1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1295} 1377}
1296 1378
1297=item $pl->quit_character 1379=item $pl->quit_character
1298 1380
1299Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
… …
1354 or return []; 1436 or return [];
1355 1437
1356 my @logins; 1438 my @logins;
1357 1439
1358 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1362 1449
1363 utf8::decode $login; 1450 utf8::decode $login;
1364 push @logins, $login; 1451 push @logins, $login;
1365 } 1452 }
1366 1453
… …
1404sub expand_cfpod { 1491sub expand_cfpod {
1405 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1406 1493
1407 # escape & and < 1494 # escape & and <
1408 s/&/&amp;/g; 1495 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1410 1497
1411 # this is buggy, it needs to properly take care of nested <'s 1498 # this is buggy, it needs to properly take care of nested <'s
1412 1499
1413 1 while 1500 1 while
1414 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1418 # replace G<male|female> tags 1506 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1421 }ge 1509 }ge
1422 # replace H<hint text> 1510 # replace H<hint text>
… …
1443sub hintmode { 1531sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1; 1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode} 1533 $_[0]{hintmode}
1446} 1534}
1447 1535
1448=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1449 1537
1450Sends an ext reply to the player. 1538Sends an ext reply to the player.
1451 1539
1452=cut 1540=cut
1453 1541
1454sub ext_reply($$%) { 1542sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1456 1544
1457 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1546}
1460 1547
1461=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1462 1549
1463Sends an ext event to the client. 1550Sends an ext event to the client.
1464 1551
1465=cut 1552=cut
1466 1553
1467sub ext_event($$%) { 1554sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1469 1556
1470 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1471} 1558}
1472 1559
1473=head3 cf::region 1560=head3 cf::region
1474 1561
1475=over 4 1562=over 4
… …
1488 my ($path) = @_; 1575 my ($path) = @_;
1489 1576
1490 my ($match, $specificity); 1577 my ($match, $specificity);
1491 1578
1492 for my $region (list) { 1579 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1580 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1581 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1582 if $region->specificity > $specificity;
1496 } 1583 }
1497 } 1584 }
1498 1585
… …
1618 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1619 return $self; 1706 return $self;
1620 } 1707 }
1621 } 1708 }
1622 1709
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1711 ()
1625} 1712}
1626 1713
1627sub init { 1714sub init {
1628 my ($self) = @_; 1715 my ($self) = @_;
… …
1691 1778
1692sub load_header_from($) { 1779sub load_header_from($) {
1693 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1694 1781
1695 utf8::encode $path; 1782 utf8::encode $path;
1696 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1697 # or return;
1698
1699 $self->_load_header ($path)
1700 or return; 1784 or return;
1785
1786 $self->_load_header ($f)
1787 or return;
1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1701 1791
1702 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1703 1793
1704 1 1794 1
1705} 1795}
… …
1759sub find { 1849sub find {
1760 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1761 1851
1762 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1763 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1764 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1765 1856
1766 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1767 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1768 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1769 or return; 1862 or return;
1770 1863
1771 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1772 1865
… …
1774 or return; 1867 or return;
1775 1868
1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1778 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1779 $map->reset; 1874 $map->reset;
1780 undef $guard;
1781 return find $path; 1875 return find $path;
1782 } 1876 }
1783 1877
1784 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1785 } 1879 }
… …
1794 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1795 1889
1796 my $path = $self->{path}; 1890 my $path = $self->{path};
1797 1891
1798 { 1892 {
1799 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1800 1894
1895 return unless $self->valid;
1801 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1802 1897
1803 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1804 1899
1805 $self->alloc; 1900 $self->alloc;
1806 1901
1807 $self->pre_load; 1902 $self->pre_load;
1808 Coro::cede; 1903 cf::cede_to_tick;
1809 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1810 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1811 or return; 1908 or return;
1812 1909
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1815 1912
1816 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq; 1914 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1819 $self->clear_unique_items; 1917 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1821 } 1921 }
1822 } 1922 }
1823 1923
1824 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1825 # now do the right thing for maps 1927 # now do the right thing for maps
1826 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 1930 unless $self->difficulty;
1829 Coro::cede; 1931 cf::cede_to_tick;
1830 1932
1831 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 1934 $self->decay_objects;
1833 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1834 $self->update_buttons; 1936 $self->update_buttons;
1835 Coro::cede; 1937 cf::cede_to_tick;
1836 $self->set_darkness_map; 1938 $self->set_darkness_map;
1837 Coro::cede; 1939 cf::cede_to_tick;
1838 $self->activate; 1940 $self->activate;
1839 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1840 1945
1841 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1842 } 1947 }
1843 1948
1844 $self->post_load; 1949 $self->post_load;
… …
1855 1960
1856 $self 1961 $self
1857} 1962}
1858 1963
1859# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1860sub load_diag { 1965sub load_neighbours {
1861 my ($map) = @_; 1966 my ($map) = @_;
1862 1967
1863 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1864 1969
1865 for (0 .. 3) { 1970 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1867 or next; 1972 or next;
1868 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1869 or next; 1974 or next;
1870 $neigh->load; 1975 $neigh->load;
1871 1976
1977 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 1980 }
1875 1981
1876 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1878 or next; 1985 or next;
1879 $neigh->load; 1986 $neigh->load;
1880 } 1987 }
1881} 1988}
1882 1989
… …
1887} 1994}
1888 1995
1889sub do_load_sync { 1996sub do_load_sync {
1890 my ($map) = @_; 1997 my ($map) = @_;
1891 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1892 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1893} 2003}
1894 2004
1895our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1897 2007
1898sub find_async { 2008sub find_async {
1899 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1900 2010
1901 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1902 2012
1903 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1905 } 2015 }
1906 2016
1907 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1908 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1909 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 2022 if (my $map = find $k) {
1912 or next;
1913 $map->load; 2023 $map->load if $v;
2024 }
1914 2025
1915 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1916 } 2027 }
1917 } 2028 }
1918 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1919 }; 2030 };
1920 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1923} 2034}
1924 2035
1925sub save { 2036sub save {
1926 my ($self) = @_; 2037 my ($self) = @_;
1927 2038
1928 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1929 2040
1930 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1931 2042
1932 return unless $self->dirty; 2043 return unless $self->dirty;
1933 2044
… …
1956 my ($self) = @_; 2067 my ($self) = @_;
1957 2068
1958 # save first because save cedes 2069 # save first because save cedes
1959 $self->save; 2070 $self->save;
1960 2071
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2073
1963 return if $self->players; 2074 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1965 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1966 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
1967 $self->clear; 2082 $self->clear;
1968 $self->in_memory (cf::MAP_SWAPPED);
1969} 2083}
1970 2084
1971sub reset_at { 2085sub reset_at {
1972 my ($self) = @_; 2086 my ($self) = @_;
1973 2087
… …
2005 if $uniq; 2119 if $uniq;
2006 } 2120 }
2007 2121
2008 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
2009 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2010 $self->clear; 2126 $self->clear;
2011
2012 $_->clear_links_to ($self) for values %cf::MAP;
2013 2127
2014 $self->unlink_save; 2128 $self->unlink_save;
2015 $self->destroy; 2129 $self->destroy;
2016} 2130}
2017 2131
2018my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
2019 2133
2020sub nuke { 2134sub nuke {
2021 my ($self) = @_; 2135 my ($self) = @_;
2022 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
2023 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
2024 2141
2025 $self->unlink_save; 2142 $self->unlink_save;
2026 2143
2027 bless $self, "cf::map"; 2144 bless $self, "cf::map";
2028 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2149
2033 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
2034 2152
2035 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2036} 2154}
2037 2155
2038=item $maps = cf::map::tmp_maps 2156=item $maps = cf::map::tmp_maps
… …
2114 2232
2115sub inv_recursive { 2233sub inv_recursive {
2116 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2117} 2235}
2118 2236
2237=item $ref = $ob->ref
2238
2239creates and returns a persistent reference to an objetc that can be stored as a string.
2240
2241=item $ob = cf::object::deref ($refstring)
2242
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block.
2245
2246=cut
2247
2248sub deref {
2249 my ($ref) = @_;
2250
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return;
2258 $pl->ob->uuid eq $uuid
2259 or return;
2260
2261 $pl->ob
2262 } else {
2263 warn "$ref: cannot resolve object reference\n";
2264 undef
2265 }
2266}
2267
2119package cf; 2268package cf;
2120 2269
2121=back 2270=back
2122 2271
2123=head3 cf::object::player 2272=head3 cf::object::player
… …
2145 2294
2146 } else { 2295 } else {
2147 my $pl = $self->contr; 2296 my $pl = $self->contr;
2148 2297
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2298 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2299 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2301
2158 } else { 2302 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2303 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2304 $self->message ($msg, $flags);
2161 } 2305 }
2162 } 2306 }
2307}
2308
2309=item $object->send_msg ($channel, $msg, $color, [extra...])
2310
2311=cut
2312
2313sub cf::object::send_msg {
2314 my $pl = shift->contr
2315 or return;
2316 $pl->send_msg (@_);
2163} 2317}
2164 2318
2165=item $player_object->may ("access") 2319=item $player_object->may ("access")
2166 2320
2167Returns wether the given player is authorized to access resource "access" 2321Returns wether the given player is authorized to access resource "access"
… …
2246 # use -1 or undef as default coordinates, not 0, 0 2400 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2401 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2402 if $x <=0 && $y <= 0;
2249 2403
2250 $map->load; 2404 $map->load;
2251 $map->load_diag; 2405 $map->load_neighbours;
2252 2406
2253 return unless $self->contr->active; 2407 return unless $self->contr->active;
2254 $self->activate_recursive; 2408 $self->activate_recursive;
2255 2409
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2411 $self->enter_map ($map, $x, $y);
2258} 2412}
2259 2413
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2414=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2415
2262Moves the player to the given map-path and coordinates by first freezing 2416Moves the player to the given map-path and coordinates by first freezing
2263her, loading and preparing them map, calling the provided $check callback 2417her, loading and preparing them map, calling the provided $check callback
2264that has to return the map if sucecssful, and then unfreezes the player on 2418that has to return the map if sucecssful, and then unfreezes the player on
2265the new (success) or old (failed) map position. 2419the new (success) or old (failed) map position. In either case, $done will
2420be called at the end of this process.
2266 2421
2267=cut 2422=cut
2268 2423
2269our $GOTOGEN; 2424our $GOTOGEN;
2270 2425
2271sub cf::object::player::goto { 2426sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2427 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2428
2274 # do generation counting so two concurrent goto's will be executed in-order 2429 # do generation counting so two concurrent goto's will be executed in-order
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2431
2277 $self->enter_link; 2432 $self->enter_link;
… …
2297 2452
2298 if ($gen == $self->{_goto_generation}) { 2453 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2454 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2455 $self->leave_link ($map, $x, $y);
2301 } 2456 }
2457
2458 $done->() if $done;
2302 })->prio (1); 2459 })->prio (1);
2303} 2460}
2304 2461
2305=item $player_object->enter_exit ($exit_object) 2462=item $player_object->enter_exit ($exit_object)
2306 2463
… …
2415 2572
2416 utf8::encode $text; 2573 utf8::encode $text;
2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2574 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2418} 2575}
2419 2576
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2577=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2578
2422Send a drawinfo or msg packet to the client, formatting the msg for the 2579Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of 2580client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress 2581the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet. 2582the message unless the client supports the msg packet.
2426 2583
2427=cut 2584=cut
2428 2585
2586our %CHANNEL = (
2587 "c/identify" => {
2588 id => "identify",
2589 title => "Identify",
2590 reply => undef,
2591 tooltip => "Items recently identified",
2592 },
2593 "c/examine" => {
2594 id => "examine",
2595 title => "Examine",
2596 reply => undef,
2597 tooltip => "Signs and other items you examined",
2598 },
2599);
2600
2429sub cf::client::send_msg { 2601sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2602 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2603
2432 $msg = $self->pl->expand_cfpod ($msg); 2604 $msg = $self->pl->expand_cfpod ($msg);
2433 2605
2606 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607
2608 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2610
2611 if (ref $channel) {
2612 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg;
2617 }
2618
2619 $channel = $channel->{id};
2620 }
2621
2434 return unless @extra || length $msg; 2622 return unless @extra || length $msg;
2435 2623
2436 if ($self->can_msg) { 2624 if ($self->can_msg) {
2625 # default colour, mask it out
2626 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2627 if $color & cf::NDI_DEF;
2628
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2629 $self->send_packet ("msg " . $self->{json_coder}->encode (
2630 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2438 } else { 2631 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) { 2632 if ($color >= 0) {
2633 # replace some tags by gcfclient-compatible ones
2634 for ($msg) {
2635 1 while
2636 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2637 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2638 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2639 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2640 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2641 }
2642
2643 $color &= cf::NDI_COLOR_MASK;
2644
2645 utf8::encode $msg;
2646
2450 if (0 && $msg =~ /\[/) { 2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2650 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2652 $self->send_packet ("drawinfo $color $msg")
2455 } 2653 }
2456 } 2654 }
2457 } 2655 }
2458} 2656}
2459 2657
2460=item $client->ext_event ($type, %msg) 2658=item $client->ext_msg ($type, @msg)
2461 2659
2462Sends an ext event to the client. 2660Sends an ext event to the client.
2463 2661
2464=cut 2662=cut
2465 2663
2466sub cf::client::ext_event($$%) { 2664sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2665 my ($self, $type, @msg) = @_;
2468 2666
2667 if ($self->extcmd == 2) {
2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2669 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 2670 push @msg, msgtype => "event_$type";
2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2671 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2672 }
2673}
2674
2675=item $client->ext_reply ($msgid, @msg)
2676
2677Sends an ext reply to the client.
2678
2679=cut
2680
2681sub cf::client::ext_reply($$@) {
2682 my ($self, $id, @msg) = @_;
2683
2684 if ($self->extcmd == 2) {
2685 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2686 } elsif ($self->extcmd == 1) {
2687 #TODO: version 1, remove
2688 unshift @msg, msgtype => "reply", msgid => $id;
2689 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2690 }
2471} 2691}
2472 2692
2473=item $success = $client->query ($flags, "text", \&cb) 2693=item $success = $client->query ($flags, "text", \&cb)
2474 2694
2475Queues a query to the client, calling the given callback with 2695Queues a query to the client, calling the given callback with
… …
2530 my ($ns, $buf) = @_; 2750 my ($ns, $buf) = @_;
2531 2751
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2752 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2753
2534 if (ref $msg) { 2754 if (ref $msg) {
2755 my ($type, $reply, @payload) =
2756 "ARRAY" eq ref $msg
2757 ? @$msg
2758 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2759
2760 my @reply;
2761
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2762 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2763 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 2764 }
2765
2766 $ns->ext_reply ($reply, @reply)
2767 if $reply;
2768
2541 } else { 2769 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2770 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 } 2771 }
2544 2772
2545 cf::override; 2773 cf::override;
… …
2592our $safe = new Safe "safe"; 2820our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 2821our $safe_hole = new Safe::Hole;
2594 2822
2595$SIG{FPE} = 'IGNORE'; 2823$SIG{FPE} = 'IGNORE';
2596 2824
2597$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2825$safe->permit_only (Opcode::opset qw(
2826 :base_core :base_mem :base_orig :base_math
2827 grepstart grepwhile mapstart mapwhile
2828 sort time
2829));
2598 2830
2599# here we export the classes and methods available to script code 2831# here we export the classes and methods available to script code
2600 2832
2601=pod 2833=pod
2602 2834
2603The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2604 2836
2605 cf::object 2837 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 2838 contr pay_amount pay_player map x y force_find force_add
2607 insert remove 2839 insert remove name archname title slaying race decrease_ob_nr
2608 2840
2609 cf::object::player 2841 cf::object::player
2610 player 2842 player
2611 2843
2612 cf::player 2844 cf::player
… …
2617 2849
2618=cut 2850=cut
2619 2851
2620for ( 2852for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race
2622 insert remove)], 2855 decrease_ob_nr)],
2623 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2626) { 2859) {
2627 no strict 'refs'; 2860 no strict 'refs';
… …
2703# the server's init and main functions 2936# the server's init and main functions
2704 2937
2705sub load_facedata($) { 2938sub load_facedata($) {
2706 my ($path) = @_; 2939 my ($path) = @_;
2707 2940
2941 # HACK to clear player env face cache, we need some signal framework
2942 # for this (global event?)
2943 %ext::player_env::MUSIC_FACE_CACHE = ();
2944
2945 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2946
2708 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2709 2948
2710 my $facedata; 2949 my $facedata;
2711 0 < aio_load $path, $facedata 2950 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 2951 or die "$path: $!";
… …
2714 $facedata = Coro::Storable::thaw $facedata; 2953 $facedata = Coro::Storable::thaw $facedata;
2715 2954
2716 $facedata->{version} == 2 2955 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 2956 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 2957
2958 # patch in the exptable
2959 $facedata->{resource}{"res/exp_table"} = {
2960 type => FT_RSRC,
2961 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2962 };
2963 cf::cede_to_tick;
2964
2719 { 2965 {
2720 my $faces = $facedata->{faceinfo}; 2966 my $faces = $facedata->{faceinfo};
2721 2967
2722 while (my ($face, $info) = each %$faces) { 2968 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2969 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2970 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 2974
2975 cf::cede_to_tick;
2728 } 2976 }
2729 2977
2730 while (my ($face, $info) = each %$faces) { 2978 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 2979 next unless $info->{smooth};
2732 my $idx = cf::face::find $face 2980 my $idx = cf::face::find $face
2733 or next; 2981 or next;
2734 if (my $smooth = cf::face::find $info->{smooth}) { 2982 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 2985 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2986 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 2987 }
2739 Coro::cede; 2988
2989 cf::cede_to_tick;
2740 } 2990 }
2741 } 2991 }
2742 2992
2743 { 2993 {
2744 my $anims = $facedata->{animinfo}; 2994 my $anims = $facedata->{animinfo};
2745 2995
2746 while (my ($anim, $info) = each %$anims) { 2996 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2997 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 2998 cf::cede_to_tick;
2749 } 2999 }
2750 3000
2751 cf::anim::invalidate_all; # d'oh 3001 cf::anim::invalidate_all; # d'oh
2752 } 3002 }
2753 3003
3004 {
3005 # TODO: for gcfclient pleasure, we should give resources
3006 # that gcfclient doesn't grok a >10000 face index.
3007 my $res = $facedata->{resource};
3008
3009 my $soundconf = delete $res->{"res/sound.conf"};
3010
3011 while (my ($name, $info) = each %$res) {
3012 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data;
3014
3015 if ($info->{type} & 1) {
3016 # prepend meta info
3017
3018 my $meta = $enc->encode ({
3019 name => $name,
3020 %{ $info->{meta} || {} },
3021 });
3022
3023 $data = pack "(w/a*)*", $meta, $info->{data};
3024 } else {
3025 $data = $info->{data};
3026 }
3027
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
3031 cf::cede_to_tick;
3032 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
3051 }
3052
2754 1 3053 1
2755} 3054}
2756 3055
3056register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_;
3058
3059 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v);
3061 }
3062};
3063
2757sub reload_regions { 3064sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = ();
3068
2758 load_resource_file "$MAPDIR/regions" 3069 load_resource_file "$MAPDIR/regions"
2759 or die "unable to load regions file\n"; 3070 or die "unable to load regions file\n";
3071
3072 for (cf::region::list) {
3073 $_->{match} = qr/$_->{match}/
3074 if exists $_->{match};
3075 }
2760} 3076}
2761 3077
2762sub reload_facedata { 3078sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3079 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3080 or die "unable to load facedata\n";
… …
2793 3109
2794sub init { 3110sub init {
2795 reload_resources; 3111 reload_resources;
2796} 3112}
2797 3113
2798sub cfg_load { 3114sub reload_config {
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
2800 or return; 3116 or return;
2801 3117
2802 local $/; 3118 local $/;
2803 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
… …
2823 (async { 3139 (async {
2824 Event::one_event; 3140 Event::one_event;
2825 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
2826 }; 3142 };
2827 3143
2828 cfg_load; 3144 reload_config;
2829 db_init; 3145 db_init;
2830 load_extensions; 3146 load_extensions;
2831 3147
2832 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
2833 Event::loop; 3149 Event::loop;
… …
3026 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
3027 require cf; 3343 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3029 3345
3030 warn "loading config and database again"; 3346 warn "loading config and database again";
3031 cf::cfg_load; 3347 cf::reload_config;
3032 3348
3033 warn "loading extensions"; 3349 warn "loading extensions";
3034 cf::load_extensions; 3350 cf::load_extensions;
3035 3351
3036 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
… …
3129 or die; 3445 or die;
3130 3446
3131 $map->width (50); 3447 $map->width (50);
3132 $map->height (50); 3448 $map->height (50);
3133 $map->alloc; 3449 $map->alloc;
3134 $map->_load_objects ("/tmp/x.map", 1); 3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3135 my $t = Event::time - $t; 3451 my $t = Event::time - $t;
3136 3452
3137 #next unless $t < 0.0013;#d# 3453 #next unless $t < 0.0013;#d#
3138 if ($t < $min) { 3454 if ($t < $min) {
3139 $min = $t; 3455 $min = $t;

Diff Legend

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