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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.360 by root, Sun Sep 9 06:25:46 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
… …
412=cut 487=cut
413 488
414sub fork_call(&@) { 489sub fork_call(&@) {
415 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
416 491
417# 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,
418# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 495
422 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 497 reset_signals;
436 local $SIG{__WARN__}; 498 &$cb
437 local $SIG{__DIE__}; 499 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 500
443 my @res = eval { $cb->(@args) }; 501 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 502}
461 503
462=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
463 505
464Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
544 if (1) { 586 if (1) {
545 $md5 = 587 $md5 =
546 join "\x00", 588 join "\x00",
547 $processversion, 589 $processversion,
548 map { 590 map {
549 Coro::cede; 591 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 593 } 0.. $#$src;
552 594
553 595
554 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
860 "; 902 ";
861 die if $@; 903 die if $@;
862} 904}
863 905
864our $override; 906our $override;
865our @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?
866 908
867sub override { 909sub override {
868 $override = 1; 910 $override = 1;
869 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
870} 912}
871 913
872sub do_invoke { 914sub do_invoke {
873 my $event = shift; 915 my $event = shift;
874 my $callbacks = shift; 916 my $callbacks = shift;
875 917
876 @invoke_results = (); 918 @INVOKE_RESULTS = ();
877 919
878 local $override; 920 local $override;
879 921
880 for (@$callbacks) { 922 for (@$callbacks) {
881 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
… …
898 940
899Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
900 942
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 946
905=back 947=back
906 948
907=cut 949=cut
908 950
909############################################################################# 951#############################################################################
910# 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}
911 964
912sub reattach { 965sub reattach {
913 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 967 my ($obj) = @_;
915 968
… …
959 }, 1012 },
960); 1013);
961 1014
962sub object_freezer_save { 1015sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
964 1019
965 sync_job { 1020 sync_job {
966 if (length $$rdata) { 1021 if (length $$rdata) {
967 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
992 } 1047 }
993 } else { 1048 } else {
994 aio_unlink $filename; 1049 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
996 } 1051 }
997 } 1052 };
1053
1054 undef $guard;
998} 1055}
999 1056
1000sub object_freezer_as_string { 1057sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1002 1059
… …
1007 1064
1008sub object_thawer_load { 1065sub object_thawer_load {
1009 my ($filename) = @_; 1066 my ($filename) = @_;
1010 1067
1011 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1012 1071
1013 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1014 or return; 1073 or return;
1015 1074
1016 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1077 or return;
1078
1079 undef $guard;
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1020 } 1081 }
1021 1082
1022 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1024 return ($data, $av); 1086 ($data, $av)
1025} 1087}
1026 1088
1027=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1028 1090
1029=over 4 1091=over 4
… …
1102 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1103 1165
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1167
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1112 } else { 1183 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1185 }
1115 1186
1116 cf::override; 1187 cf::override;
… …
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1325
1255 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1258 } 1335 }
1259 } 1336 }
1260} 1337}
1261 1338
… …
1271 1348
1272 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1274 1351
1275 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1276 Coro::cede; 1353 cf::cede_to_tick;
1277} 1354}
1278 1355
1279sub new($) { 1356sub new($) {
1280 my ($login) = @_; 1357 my ($login) = @_;
1281 1358
… …
1285 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1286 1363
1287 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1288 1365
1289 $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 (@_);
1290} 1377}
1291 1378
1292=item $pl->quit_character 1379=item $pl->quit_character
1293 1380
1294Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
… …
1349 or return []; 1436 or return [];
1350 1437
1351 my @logins; 1438 my @logins;
1352 1439
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1357 1449
1358 utf8::decode $login; 1450 utf8::decode $login;
1359 push @logins, $login; 1451 push @logins, $login;
1360 } 1452 }
1361 1453
… …
1399sub expand_cfpod { 1491sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1401 1493
1402 # escape & and < 1494 # escape & and <
1403 s/&/&amp;/g; 1495 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1405 1497
1406 # 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
1407 1499
1408 1 while 1500 1 while
1409 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413 # replace G<male|female> tags 1506 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1416 }ge 1509 }ge
1417 # replace H<hint text> 1510 # replace H<hint text>
… …
1438sub hintmode { 1531sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1533 $_[0]{hintmode}
1441} 1534}
1442 1535
1443=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1444 1537
1445Sends an ext reply to the player. 1538Sends an ext reply to the player.
1446 1539
1447=cut 1540=cut
1448 1541
1449sub ext_reply($$%) { 1542sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1451 1544
1452 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1546}
1455 1547
1456=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1457 1549
1458Sends an ext event to the client. 1550Sends an ext event to the client.
1459 1551
1460=cut 1552=cut
1461 1553
1462sub ext_event($$%) { 1554sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1464 1556
1465 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1466} 1558}
1467 1559
1468=head3 cf::region 1560=head3 cf::region
1469 1561
1470=over 4 1562=over 4
… …
1483 my ($path) = @_; 1575 my ($path) = @_;
1484 1576
1485 my ($match, $specificity); 1577 my ($match, $specificity);
1486 1578
1487 for my $region (list) { 1579 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1580 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1581 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1582 if $region->specificity > $specificity;
1491 } 1583 }
1492 } 1584 }
1493 1585
… …
1613 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1614 return $self; 1706 return $self;
1615 } 1707 }
1616 } 1708 }
1617 1709
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1711 ()
1620} 1712}
1621 1713
1622sub init { 1714sub init {
1623 my ($self) = @_; 1715 my ($self) = @_;
… …
1686 1778
1687sub load_header_from($) { 1779sub load_header_from($) {
1688 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1689 1781
1690 utf8::encode $path; 1782 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 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;
1696 1791
1697 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1698 1793
1699 1 1794 1
1700} 1795}
… …
1754sub find { 1849sub find {
1755 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1756 1851
1757 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1758 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1760 1856
1761 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1762 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
1763 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1764 or return; 1862 or return;
1765 1863
1766 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1767 1865
… …
1769 or return; 1867 or return;
1770 1868
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1774 $map->reset; 1874 $map->reset;
1775 undef $guard;
1776 return find $path; 1875 return find $path;
1777 } 1876 }
1778 1877
1779 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1780 } 1879 }
… …
1789 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1790 1889
1791 my $path = $self->{path}; 1890 my $path = $self->{path};
1792 1891
1793 { 1892 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1795 1894
1895 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 1897
1798 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1799 1899
1800 $self->alloc; 1900 $self->alloc;
1801 1901
1802 $self->pre_load; 1902 $self->pre_load;
1803 Coro::cede; 1903 cf::cede_to_tick;
1804 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1806 or return; 1908 or return;
1807 1909
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1810 1912
1811 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 1914 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 1917 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1816 } 1921 }
1817 } 1922 }
1818 1923
1819 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1820 # now do the right thing for maps 1927 # now do the right thing for maps
1821 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 1930 unless $self->difficulty;
1824 Coro::cede; 1931 cf::cede_to_tick;
1825 1932
1826 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 1934 $self->decay_objects;
1828 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1829 $self->update_buttons; 1936 $self->update_buttons;
1830 Coro::cede; 1937 cf::cede_to_tick;
1831 $self->set_darkness_map; 1938 $self->set_darkness_map;
1832 Coro::cede; 1939 cf::cede_to_tick;
1833 $self->activate; 1940 $self->activate;
1834 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1835 1945
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1947 }
1838 1948
1839 $self->post_load; 1949 $self->post_load;
… …
1850 1960
1851 $self 1961 $self
1852} 1962}
1853 1963
1854# 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
1855sub load_diag { 1965sub load_neighbours {
1856 my ($map) = @_; 1966 my ($map) = @_;
1857 1967
1858 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1859 1969
1860 for (0 .. 3) { 1970 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1862 or next; 1972 or next;
1863 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1864 or next; 1974 or next;
1865 $neigh->load; 1975 $neigh->load;
1866 1976
1977 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 1980 }
1870 1981
1871 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1873 or next; 1985 or next;
1874 $neigh->load; 1986 $neigh->load;
1875 } 1987 }
1876} 1988}
1877 1989
… …
1882} 1994}
1883 1995
1884sub do_load_sync { 1996sub do_load_sync {
1885 my ($map) = @_; 1997 my ($map) = @_;
1886 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1887 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1888} 2003}
1889 2004
1890our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1892 2007
1893sub find_async { 2008sub find_async {
1894 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1895 2010
1896 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1897 2012
1898 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2015 }
1901 2016
1902 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1903 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2022 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2023 $map->load if $v;
2024 }
1909 2025
1910 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1911 } 2027 }
1912 } 2028 }
1913 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1914 }; 2030 };
1915 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1918} 2034}
1919 2035
1920sub save { 2036sub save {
1921 my ($self) = @_; 2037 my ($self) = @_;
1922 2038
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2040
1925 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1926 2042
1927 return unless $self->dirty; 2043 return unless $self->dirty;
1928 2044
… …
1951 my ($self) = @_; 2067 my ($self) = @_;
1952 2068
1953 # save first because save cedes 2069 # save first because save cedes
1954 $self->save; 2070 $self->save;
1955 2071
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2073
1958 return if $self->players; 2074 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1961 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2082 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2083}
1965 2084
1966sub reset_at { 2085sub reset_at {
1967 my ($self) = @_; 2086 my ($self) = @_;
1968 2087
… …
2000 if $uniq; 2119 if $uniq;
2001 } 2120 }
2002 2121
2003 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
2004 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2126 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2127
2009 $self->unlink_save; 2128 $self->unlink_save;
2010 $self->destroy; 2129 $self->destroy;
2011} 2130}
2012 2131
2013my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
2014 2133
2015sub nuke { 2134sub nuke {
2016 my ($self) = @_; 2135 my ($self) = @_;
2017 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
2018 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
2019 2141
2020 $self->unlink_save; 2142 $self->unlink_save;
2021 2143
2022 bless $self, "cf::map"; 2144 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2149
2028 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
2029 2152
2030 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2031} 2154}
2032 2155
2033=item $maps = cf::map::tmp_maps 2156=item $maps = cf::map::tmp_maps
… …
2109 2232
2110sub inv_recursive { 2233sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2112} 2235}
2113 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
2114package cf; 2268package cf;
2115 2269
2116=back 2270=back
2117 2271
2118=head3 cf::object::player 2272=head3 cf::object::player
… …
2140 2294
2141 } else { 2295 } else {
2142 my $pl = $self->contr; 2296 my $pl = $self->contr;
2143 2297
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2298 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2299 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2301
2153 } else { 2302 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2303 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2304 $self->message ($msg, $flags);
2156 } 2305 }
2157 } 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 (@_);
2158} 2317}
2159 2318
2160=item $player_object->may ("access") 2319=item $player_object->may ("access")
2161 2320
2162Returns wether the given player is authorized to access resource "access" 2321Returns wether the given player is authorized to access resource "access"
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2400 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2401 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2402 if $x <=0 && $y <= 0;
2244 2403
2245 $map->load; 2404 $map->load;
2246 $map->load_diag; 2405 $map->load_neighbours;
2247 2406
2248 return unless $self->contr->active; 2407 return unless $self->contr->active;
2249 $self->activate_recursive; 2408 $self->activate_recursive;
2250 2409
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2411 $self->enter_map ($map, $x, $y);
2253} 2412}
2254 2413
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2414=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2415
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2417her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2421
2262=cut 2422=cut
2263 2423
2264our $GOTOGEN; 2424our $GOTOGEN;
2265 2425
2266sub cf::object::player::goto { 2426sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2427 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2428
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2431
2272 $self->enter_link; 2432 $self->enter_link;
… …
2292 2452
2293 if ($gen == $self->{_goto_generation}) { 2453 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2454 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2455 $self->leave_link ($map, $x, $y);
2296 } 2456 }
2457
2458 $done->() if $done;
2297 })->prio (1); 2459 })->prio (1);
2298} 2460}
2299 2461
2300=item $player_object->enter_exit ($exit_object) 2462=item $player_object->enter_exit ($exit_object)
2301 2463
… …
2410 2572
2411 utf8::encode $text; 2573 utf8::encode $text;
2412 $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);
2413} 2575}
2414 2576
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2577=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2578
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2582the message unless the client supports the msg packet.
2421 2583
2422=cut 2584=cut
2423 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
2424sub cf::client::send_msg { 2601sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2602 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2603
2427 $msg = $self->pl->expand_cfpod ($msg); 2604 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2622 return unless @extra || length $msg;
2430 2623
2431 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
2432 $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]));
2433 } else { 2631 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 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
2445 if (0 && $msg =~ /\[/) { 2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2650 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2652 $self->send_packet ("drawinfo $color $msg")
2450 } 2653 }
2451 } 2654 }
2452 } 2655 }
2453} 2656}
2454 2657
2455=item $client->ext_event ($type, %msg) 2658=item $client->ext_msg ($type, @msg)
2456 2659
2457Sends an ext event to the client. 2660Sends an ext event to the client.
2458 2661
2459=cut 2662=cut
2460 2663
2461sub cf::client::ext_event($$%) { 2664sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2665 my ($self, $type, @msg) = @_;
2463 2666
2667 if ($self->extcmd == 2) {
2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2669 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2670 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 2691}
2467 2692
2468=item $success = $client->query ($flags, "text", \&cb) 2693=item $success = $client->query ($flags, "text", \&cb)
2469 2694
2470Queues a query to the client, calling the given callback with 2695Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2750 my ($ns, $buf) = @_;
2526 2751
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2752 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2753
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2762 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2763 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2764 }
2765
2766 $ns->ext_reply ($reply, @reply)
2767 if $reply;
2768
2536 } else { 2769 } else {
2537 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";
2538 } 2771 }
2539 2772
2540 cf::override; 2773 cf::override;
… …
2587our $safe = new Safe "safe"; 2820our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2821our $safe_hole = new Safe::Hole;
2589 2822
2590$SIG{FPE} = 'IGNORE'; 2823$SIG{FPE} = 'IGNORE';
2591 2824
2592$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));
2593 2830
2594# here we export the classes and methods available to script code 2831# here we export the classes and methods available to script code
2595 2832
2596=pod 2833=pod
2597 2834
2598The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2599 2836
2600 cf::object 2837 cf::object
2601 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
2602 insert remove 2839 insert remove name archname title slaying race decrease_ob_nr
2603 2840
2604 cf::object::player 2841 cf::object::player
2605 player 2842 player
2606 2843
2607 cf::player 2844 cf::player
… …
2612 2849
2613=cut 2850=cut
2614 2851
2615for ( 2852for (
2616 ["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
2617 insert remove)], 2855 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2621) { 2859) {
2622 no strict 'refs'; 2860 no strict 'refs';
… …
2698# the server's init and main functions 2936# the server's init and main functions
2699 2937
2700sub load_facedata($) { 2938sub load_facedata($) {
2701 my ($path) = @_; 2939 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2704 2948
2705 my $facedata; 2949 my $facedata;
2706 0 < aio_load $path, $facedata 2950 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2951 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 2953 $facedata = Coro::Storable::thaw $facedata;
2710 2954
2711 $facedata->{version} == 2 2955 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2956 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 2965 {
2715 my $faces = $facedata->{faceinfo}; 2966 my $faces = $facedata->{faceinfo};
2716 2967
2717 while (my ($face, $info) = each %$faces) { 2968 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2969 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2970 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 2974
2975 cf::cede_to_tick;
2723 } 2976 }
2724 2977
2725 while (my ($face, $info) = each %$faces) { 2978 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2979 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2980 my $idx = cf::face::find $face
2728 or next; 2981 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2982 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2985 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2986 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2987 }
2734 Coro::cede; 2988
2989 cf::cede_to_tick;
2735 } 2990 }
2736 } 2991 }
2737 2992
2738 { 2993 {
2739 my $anims = $facedata->{animinfo}; 2994 my $anims = $facedata->{animinfo};
2740 2995
2741 while (my ($anim, $info) = each %$anims) { 2996 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2997 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2998 cf::cede_to_tick;
2744 } 2999 }
2745 3000
2746 cf::anim::invalidate_all; # d'oh 3001 cf::anim::invalidate_all; # d'oh
2747 } 3002 }
2748 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
2749 1 3053 1
2750} 3054}
2751 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
2752sub 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
2753 load_resource_file "$MAPDIR/regions" 3069 load_resource_file "$MAPDIR/regions"
2754 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 }
2755} 3076}
2756 3077
2757sub reload_facedata { 3078sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3079 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3080 or die "unable to load facedata\n";
… …
2788 3109
2789sub init { 3110sub init {
2790 reload_resources; 3111 reload_resources;
2791} 3112}
2792 3113
2793sub cfg_load { 3114sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3116 or return;
2796 3117
2797 local $/; 3118 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
… …
2818 (async { 3139 (async {
2819 Event::one_event; 3140 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
2821 }; 3142 };
2822 3143
2823 cfg_load; 3144 reload_config;
2824 db_init; 3145 db_init;
2825 load_extensions; 3146 load_extensions;
2826 3147
2827 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
2828 Event::loop; 3149 Event::loop;
… …
3021 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
3022 require cf; 3343 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3345
3025 warn "loading config and database again"; 3346 warn "loading config and database again";
3026 cf::cfg_load; 3347 cf::reload_config;
3027 3348
3028 warn "loading extensions"; 3349 warn "loading extensions";
3029 cf::load_extensions; 3350 cf::load_extensions;
3030 3351
3031 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
… …
3124 or die; 3445 or die;
3125 3446
3126 $map->width (50); 3447 $map->width (50);
3127 $map->height (50); 3448 $map->height (50);
3128 $map->alloc; 3449 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1); 3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3130 my $t = Event::time - $t; 3451 my $t = Event::time - $t;
3131 3452
3132 #next unless $t < 0.0013;#d# 3453 #next unless $t < 0.0013;#d#
3133 if ($t < $min) { 3454 if ($t < $min) {
3134 $min = $t; 3455 $min = $t;

Diff Legend

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