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.291 by root, Tue Jul 3 00:54:44 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 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 497 reset_signals;
435 local $SIG{__WARN__}; 498 &$cb
436 local $SIG{__DIE__}; 499 }, @args;
437 eval {
438 close $fh1;
439 500
440 my @res = eval { $cb->(@args) }; 501 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 502}
448 503
449=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
450 505
451Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
531 if (1) { 586 if (1) {
532 $md5 = 587 $md5 =
533 join "\x00", 588 join "\x00",
534 $processversion, 589 $processversion,
535 map { 590 map {
536 Coro::cede; 591 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 593 } 0.. $#$src;
539 594
540 595
541 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
847 "; 902 ";
848 die if $@; 903 die if $@;
849} 904}
850 905
851our $override; 906our $override;
852our @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?
853 908
854sub override { 909sub override {
855 $override = 1; 910 $override = 1;
856 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
857} 912}
858 913
859sub do_invoke { 914sub do_invoke {
860 my $event = shift; 915 my $event = shift;
861 my $callbacks = shift; 916 my $callbacks = shift;
862 917
863 @invoke_results = (); 918 @INVOKE_RESULTS = ();
864 919
865 local $override; 920 local $override;
866 921
867 for (@$callbacks) { 922 for (@$callbacks) {
868 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
… …
885 940
886Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
887 942
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 946
892=back 947=back
893 948
894=cut 949=cut
895 950
896############################################################################# 951#############################################################################
897# 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}
898 964
899sub reattach { 965sub reattach {
900 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 967 my ($obj) = @_;
902 968
… …
946 }, 1012 },
947); 1013);
948 1014
949sub object_freezer_save { 1015sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
951 1019
952 sync_job { 1020 sync_job {
953 if (length $$rdata) { 1021 if (length $$rdata) {
954 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
979 } 1047 }
980 } else { 1048 } else {
981 aio_unlink $filename; 1049 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
983 } 1051 }
984 } 1052 };
1053
1054 undef $guard;
985} 1055}
986 1056
987sub object_freezer_as_string { 1057sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
989 1059
… …
994 1064
995sub object_thawer_load { 1065sub object_thawer_load {
996 my ($filename) = @_; 1066 my ($filename) = @_;
997 1067
998 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
999 1071
1000 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1001 or return; 1073 or return;
1002 1074
1003 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1077 or return;
1078
1079 undef $guard;
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1007 } 1081 }
1008 1082
1009 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1011 return ($data, $av); 1086 ($data, $av)
1012} 1087}
1013 1088
1014=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1015 1090
1016=over 4 1091=over 4
… …
1089 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1090 1165
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1167
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1099 } else { 1183 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1185 }
1102 1186
1103 cf::override; 1187 cf::override;
… …
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1325
1242 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1245 } 1335 }
1246 } 1336 }
1247} 1337}
1248 1338
… …
1258 1348
1259 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1261 1351
1262 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1263 Coro::cede; 1353 cf::cede_to_tick;
1264} 1354}
1265 1355
1266sub new($) { 1356sub new($) {
1267 my ($login) = @_; 1357 my ($login) = @_;
1268 1358
… …
1272 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1273 1363
1274 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1275 1365
1276 $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 (@_);
1277} 1377}
1278 1378
1279=item $pl->quit_character 1379=item $pl->quit_character
1280 1380
1281Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
… …
1336 or return []; 1436 or return [];
1337 1437
1338 my @logins; 1438 my @logins;
1339 1439
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1344 1449
1345 utf8::decode $login; 1450 utf8::decode $login;
1346 push @logins, $login; 1451 push @logins, $login;
1347 } 1452 }
1348 1453
… …
1386sub expand_cfpod { 1491sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1388 1493
1389 # escape & and < 1494 # escape & and <
1390 s/&/&amp;/g; 1495 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1392 1497
1393 # 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
1394 1499
1395 1 while 1500 1 while
1396 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400 # replace G<male|female> tags 1506 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1403 }ge 1509 }ge
1404 # replace H<hint text> 1510 # replace H<hint text>
… …
1412 1518
1413 # create single paragraphs (very hackish) 1519 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1520 s/(?<=\S)\n(?=\w)/ /g;
1415 1521
1416 # compress some whitespace 1522 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1418 1527
1419 $_ 1528 $_
1420} 1529}
1421 1530
1422sub hintmode { 1531sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1533 $_[0]{hintmode}
1426} 1534}
1427 1535
1428=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1429 1537
1430Sends an ext reply to the player. 1538Sends an ext reply to the player.
1431 1539
1432=cut 1540=cut
1433 1541
1434sub ext_reply($$%) { 1542sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1436 1544
1437 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1546}
1440 1547
1441=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1442 1549
1443Sends an ext event to the client. 1550Sends an ext event to the client.
1444 1551
1445=cut 1552=cut
1446 1553
1447sub ext_event($$%) { 1554sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1449 1556
1450 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1451} 1558}
1452 1559
1453=head3 cf::region 1560=head3 cf::region
1454 1561
1455=over 4 1562=over 4
… …
1468 my ($path) = @_; 1575 my ($path) = @_;
1469 1576
1470 my ($match, $specificity); 1577 my ($match, $specificity);
1471 1578
1472 for my $region (list) { 1579 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1580 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1581 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1582 if $region->specificity > $specificity;
1476 } 1583 }
1477 } 1584 }
1478 1585
… …
1598 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1599 return $self; 1706 return $self;
1600 } 1707 }
1601 } 1708 }
1602 1709
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1711 ()
1605} 1712}
1606 1713
1607sub init { 1714sub init {
1608 my ($self) = @_; 1715 my ($self) = @_;
… …
1671 1778
1672sub load_header_from($) { 1779sub load_header_from($) {
1673 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1674 1781
1675 utf8::encode $path; 1782 utf8::encode $path;
1676 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1677 # or return;
1678
1679 $self->_load_header ($path)
1680 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;
1681 1791
1682 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1683 1793
1684 1 1794 1
1685} 1795}
… …
1739sub find { 1849sub find {
1740 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1741 1851
1742 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1743 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1744 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1745 1856
1746 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1747 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
1748 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1749 or return; 1862 or return;
1750 1863
1751 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1752 1865
… …
1754 or return; 1867 or return;
1755 1868
1756 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1758 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1759 $map->reset; 1874 $map->reset;
1760 undef $guard;
1761 return find $path; 1875 return find $path;
1762 } 1876 }
1763 1877
1764 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1765 } 1879 }
… …
1774 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1775 1889
1776 my $path = $self->{path}; 1890 my $path = $self->{path};
1777 1891
1778 { 1892 {
1779 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1780 1894
1895 return unless $self->valid;
1781 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return unless $self->in_memory == cf::MAP_SWAPPED;
1782 1897
1783 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1784 1899
1785 $self->alloc; 1900 $self->alloc;
1786 1901
1787 $self->pre_load; 1902 $self->pre_load;
1788 Coro::cede; 1903 cf::cede_to_tick;
1789 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1790 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1791 or return; 1908 or return;
1792 1909
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1795 1912
1796 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1797 utf8::encode $uniq; 1914 utf8::encode $uniq;
1798 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1799 $self->clear_unique_items; 1917 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1801 } 1921 }
1802 } 1922 }
1803 1923
1804 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1805 # now do the right thing for maps 1927 # now do the right thing for maps
1806 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 1930 unless $self->difficulty;
1809 Coro::cede; 1931 cf::cede_to_tick;
1810 1932
1811 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 1934 $self->decay_objects;
1813 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1814 $self->update_buttons; 1936 $self->update_buttons;
1815 Coro::cede; 1937 cf::cede_to_tick;
1816 $self->set_darkness_map; 1938 $self->set_darkness_map;
1817 Coro::cede; 1939 cf::cede_to_tick;
1818 $self->activate; 1940 $self->activate;
1819 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1820 1945
1821 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 1947 }
1823 1948
1824 $self->post_load; 1949 $self->post_load;
… …
1835 1960
1836 $self 1961 $self
1837} 1962}
1838 1963
1839# 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
1840sub load_diag { 1965sub load_neighbours {
1841 my ($map) = @_; 1966 my ($map) = @_;
1842 1967
1843 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1844 1969
1845 for (0 .. 3) { 1970 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1847 or next; 1972 or next;
1848 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1849 or next; 1974 or next;
1850 $neigh->load; 1975 $neigh->load;
1851 1976
1977 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 1980 }
1855 1981
1856 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1858 or next; 1985 or next;
1859 $neigh->load; 1986 $neigh->load;
1860 } 1987 }
1861} 1988}
1862 1989
… …
1867} 1994}
1868 1995
1869sub do_load_sync { 1996sub do_load_sync {
1870 my ($map) = @_; 1997 my ($map) = @_;
1871 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1872 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1873} 2003}
1874 2004
1875our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1877 2007
1878sub find_async { 2008sub find_async {
1879 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1880 2010
1881 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1882 2012
1883 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 2015 }
1886 2016
1887 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1888 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1889 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 2022 if (my $map = find $k) {
1892 or next;
1893 $map->load; 2023 $map->load if $v;
2024 }
1894 2025
1895 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1896 } 2027 }
1897 } 2028 }
1898 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1899 }; 2030 };
1900 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1903} 2034}
1904 2035
1905sub save { 2036sub save {
1906 my ($self) = @_; 2037 my ($self) = @_;
1907 2038
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2040
1910 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1911 2042
1912 return unless $self->dirty; 2043 return unless $self->dirty;
1913 2044
… …
1936 my ($self) = @_; 2067 my ($self) = @_;
1937 2068
1938 # save first because save cedes 2069 # save first because save cedes
1939 $self->save; 2070 $self->save;
1940 2071
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2073
1943 return if $self->players; 2074 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1946 2077
2078 $self->in_memory (cf::MAP_SWAPPED);
2079
2080 $self->deactivate;
2081 $_->clear_links_to ($self) for values %cf::MAP;
1947 $self->clear; 2082 $self->clear;
1948 $self->in_memory (cf::MAP_SWAPPED);
1949} 2083}
1950 2084
1951sub reset_at { 2085sub reset_at {
1952 my ($self) = @_; 2086 my ($self) = @_;
1953 2087
… …
1985 if $uniq; 2119 if $uniq;
1986 } 2120 }
1987 2121
1988 delete $cf::MAP{$self->path}; 2122 delete $cf::MAP{$self->path};
1989 2123
2124 $self->deactivate;
2125 $_->clear_links_to ($self) for values %cf::MAP;
1990 $self->clear; 2126 $self->clear;
1991
1992 $_->clear_links_to ($self) for values %cf::MAP;
1993 2127
1994 $self->unlink_save; 2128 $self->unlink_save;
1995 $self->destroy; 2129 $self->destroy;
1996} 2130}
1997 2131
1998my $nuke_counter = "aaaa"; 2132my $nuke_counter = "aaaa";
1999 2133
2000sub nuke { 2134sub nuke {
2001 my ($self) = @_; 2135 my ($self) = @_;
2002 2136
2137 {
2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139
2003 delete $cf::MAP{$self->path}; 2140 delete $cf::MAP{$self->path};
2004 2141
2005 $self->unlink_save; 2142 $self->unlink_save;
2006 2143
2007 bless $self, "cf::map"; 2144 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2145 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2146 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2147 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2148 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2149
2013 $cf::MAP{$self->path} = $self; 2150 $cf::MAP{$self->path} = $self;
2151 }
2014 2152
2015 $self->reset; # polite request, might not happen 2153 $self->reset; # polite request, might not happen
2016} 2154}
2017 2155
2018=item $maps = cf::map::tmp_maps 2156=item $maps = cf::map::tmp_maps
… …
2094 2232
2095sub inv_recursive { 2233sub inv_recursive {
2096 inv_recursive_ inv $_[0] 2234 inv_recursive_ inv $_[0]
2097} 2235}
2098 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
2099package cf; 2268package cf;
2100 2269
2101=back 2270=back
2102 2271
2103=head3 cf::object::player 2272=head3 cf::object::player
… …
2125 2294
2126 } else { 2295 } else {
2127 my $pl = $self->contr; 2296 my $pl = $self->contr;
2128 2297
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2298 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2299 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2301
2138 } else { 2302 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2303 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2304 $self->message ($msg, $flags);
2141 } 2305 }
2142 } 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 (@_);
2143} 2317}
2144 2318
2145=item $player_object->may ("access") 2319=item $player_object->may ("access")
2146 2320
2147Returns wether the given player is authorized to access resource "access" 2321Returns wether the given player is authorized to access resource "access"
… …
2226 # use -1 or undef as default coordinates, not 0, 0 2400 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2401 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2402 if $x <=0 && $y <= 0;
2229 2403
2230 $map->load; 2404 $map->load;
2231 $map->load_diag; 2405 $map->load_neighbours;
2232 2406
2233 return unless $self->contr->active; 2407 return unless $self->contr->active;
2234 $self->activate_recursive; 2408 $self->activate_recursive;
2235 2409
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2411 $self->enter_map ($map, $x, $y);
2238} 2412}
2239 2413
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2414=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2415
2242Moves 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
2243her, loading and preparing them map, calling the provided $check callback 2417her, loading and preparing them map, calling the provided $check callback
2244that 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
2245the 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.
2246 2421
2247=cut 2422=cut
2248 2423
2249our $GOTOGEN; 2424our $GOTOGEN;
2250 2425
2251sub cf::object::player::goto { 2426sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2427 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2428
2254 # 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
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2431
2257 $self->enter_link; 2432 $self->enter_link;
… …
2277 2452
2278 if ($gen == $self->{_goto_generation}) { 2453 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2454 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2455 $self->leave_link ($map, $x, $y);
2281 } 2456 }
2457
2458 $done->() if $done;
2282 })->prio (1); 2459 })->prio (1);
2283} 2460}
2284 2461
2285=item $player_object->enter_exit ($exit_object) 2462=item $player_object->enter_exit ($exit_object)
2286 2463
… …
2355 my $hp = $exit->stats->hp; 2532 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2533 my $sp = $exit->stats->sp;
2357 2534
2358 $self->enter_link; 2535 $self->enter_link;
2359 2536
2537 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED);
2540
2360 (async { 2541 (async {
2361 $self->deactivate_recursive; # just to be sure 2542 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2543 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2544 $self->goto ($slaying, $hp, $sp);
2364 2545
… …
2391 2572
2392 utf8::encode $text; 2573 utf8::encode $text;
2393 $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);
2394} 2575}
2395 2576
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2577=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2578
2398Send 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
2399client 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
2400the 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
2401the message unless the client supports the msg packet. 2582the message unless the client supports the msg packet.
2402 2583
2403=cut 2584=cut
2404 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
2405sub cf::client::send_msg { 2601sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2602 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2603
2408 $msg = $self->pl->expand_cfpod ($msg); 2604 $msg = $self->pl->expand_cfpod ($msg);
2409 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
2622 return unless @extra || length $msg;
2623
2410 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
2411 $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]));
2412 } else { 2631 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 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
2424 if (0 && $msg =~ /\[/) { 2647 if (0 && $msg =~ /\[/) {
2648 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2650 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2652 $self->send_packet ("drawinfo $color $msg")
2429 } 2653 }
2430 } 2654 }
2431 } 2655 }
2432} 2656}
2433 2657
2434=item $client->ext_event ($type, %msg) 2658=item $client->ext_msg ($type, @msg)
2435 2659
2436Sends an ext event to the client. 2660Sends an ext event to the client.
2437 2661
2438=cut 2662=cut
2439 2663
2440sub cf::client::ext_event($$%) { 2664sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2665 my ($self, $type, @msg) = @_;
2442 2666
2667 if ($self->extcmd == 2) {
2668 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2669 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2670 push @msg, msgtype => "event_$type";
2444 $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 }
2445} 2691}
2446 2692
2447=item $success = $client->query ($flags, "text", \&cb) 2693=item $success = $client->query ($flags, "text", \&cb)
2448 2694
2449Queues a query to the client, calling the given callback with 2695Queues a query to the client, calling the given callback with
… …
2504 my ($ns, $buf) = @_; 2750 my ($ns, $buf) = @_;
2505 2751
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2752 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2753
2508 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
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2762 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 2763 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 2764 }
2765
2766 $ns->ext_reply ($reply, @reply)
2767 if $reply;
2768
2515 } else { 2769 } else {
2516 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";
2517 } 2771 }
2518 2772
2519 cf::override; 2773 cf::override;
… …
2566our $safe = new Safe "safe"; 2820our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 2821our $safe_hole = new Safe::Hole;
2568 2822
2569$SIG{FPE} = 'IGNORE'; 2823$SIG{FPE} = 'IGNORE';
2570 2824
2571$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));
2572 2830
2573# here we export the classes and methods available to script code 2831# here we export the classes and methods available to script code
2574 2832
2575=pod 2833=pod
2576 2834
2577The following functions and methods are available within a safe environment: 2835The following functions and methods are available within a safe environment:
2578 2836
2579 cf::object contr pay_amount pay_player map 2837 cf::object
2838 contr pay_amount pay_player map x y force_find force_add
2839 insert remove name archname title slaying race decrease_ob_nr
2840
2580 cf::object::player player 2841 cf::object::player
2581 cf::player peaceful 2842 player
2582 cf::map trigger 2843
2844 cf::player
2845 peaceful
2846
2847 cf::map
2848 trigger
2583 2849
2584=cut 2850=cut
2585 2851
2586for ( 2852for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 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
2855 decrease_ob_nr)],
2588 ["cf::object::player" => qw(player)], 2856 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 2857 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 2858 ["cf::map" => qw(trigger)],
2591) { 2859) {
2592 no strict 'refs'; 2860 no strict 'refs';
… …
2668# the server's init and main functions 2936# the server's init and main functions
2669 2937
2670sub load_facedata($) { 2938sub load_facedata($) {
2671 my ($path) = @_; 2939 my ($path) = @_;
2672 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
2673 warn "loading facedata from $path\n"; 2947 warn "loading facedata from $path\n";
2674 2948
2675 my $facedata; 2949 my $facedata;
2676 0 < aio_load $path, $facedata 2950 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 2951 or die "$path: $!";
… …
2679 $facedata = Coro::Storable::thaw $facedata; 2953 $facedata = Coro::Storable::thaw $facedata;
2680 2954
2681 $facedata->{version} == 2 2955 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 2956 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 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
2684 { 2965 {
2685 my $faces = $facedata->{faceinfo}; 2966 my $faces = $facedata->{faceinfo};
2686 2967
2687 while (my ($face, $info) = each %$faces) { 2968 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2969 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2970 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 2974
2975 cf::cede_to_tick;
2693 } 2976 }
2694 2977
2695 while (my ($face, $info) = each %$faces) { 2978 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 2979 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 2980 my $idx = cf::face::find $face
2698 or next; 2981 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 2982 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 2985 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2986 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 2987 }
2704 Coro::cede; 2988
2989 cf::cede_to_tick;
2705 } 2990 }
2706 } 2991 }
2707 2992
2708 { 2993 {
2709 my $anims = $facedata->{animinfo}; 2994 my $anims = $facedata->{animinfo};
2710 2995
2711 while (my ($anim, $info) = each %$anims) { 2996 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2997 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 2998 cf::cede_to_tick;
2714 } 2999 }
2715 3000
2716 cf::anim::invalidate_all; # d'oh 3001 cf::anim::invalidate_all; # d'oh
2717 } 3002 }
2718 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
2719 1 3053 1
2720} 3054}
2721 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
2722sub 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
2723 load_resource_file "$MAPDIR/regions" 3069 load_resource_file "$MAPDIR/regions"
2724 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 }
2725} 3076}
2726 3077
2727sub reload_facedata { 3078sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3079 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3080 or die "unable to load facedata\n";
… …
2758 3109
2759sub init { 3110sub init {
2760 reload_resources; 3111 reload_resources;
2761} 3112}
2762 3113
2763sub cfg_load { 3114sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3115 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3116 or return;
2766 3117
2767 local $/; 3118 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3119 *CFG = YAML::Syck::Load <$fh>;
… …
2788 (async { 3139 (async {
2789 Event::one_event; 3140 Event::one_event;
2790 })->prio (Coro::PRIO_MAX); 3141 })->prio (Coro::PRIO_MAX);
2791 }; 3142 };
2792 3143
2793 cfg_load; 3144 reload_config;
2794 db_init; 3145 db_init;
2795 load_extensions; 3146 load_extensions;
2796 3147
2797 $TICK_WATCHER->start; 3148 $TICK_WATCHER->start;
2798 Event::loop; 3149 Event::loop;
… …
2991 warn "reloading cf.pm"; 3342 warn "reloading cf.pm";
2992 require cf; 3343 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3345
2995 warn "loading config and database again"; 3346 warn "loading config and database again";
2996 cf::cfg_load; 3347 cf::reload_config;
2997 3348
2998 warn "loading extensions"; 3349 warn "loading extensions";
2999 cf::load_extensions; 3350 cf::load_extensions;
3000 3351
3001 warn "reattaching attachments to objects/players"; 3352 warn "reattaching attachments to objects/players";
… …
3094 or die; 3445 or die;
3095 3446
3096 $map->width (50); 3447 $map->width (50);
3097 $map->height (50); 3448 $map->height (50);
3098 $map->alloc; 3449 $map->alloc;
3099 $map->_load_objects ("/tmp/x.map", 1); 3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3100 my $t = Event::time - $t; 3451 my $t = Event::time - $t;
3101 3452
3102 #next unless $t < 0.0013;#d# 3453 #next unless $t < 0.0013;#d#
3103 if ($t < $min) { 3454 if ($t < $min) {
3104 $min = $t; 3455 $min = $t;

Diff Legend

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