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.294 by root, Tue Jul 3 06:00:48 2007 UTC vs.
Revision 1.358 by root, Fri Sep 7 18:10:52 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
1418 1524 s/\n\n+/\n/g; # double lines
1419 s/^\s+//; 1525 s/^\n+//; # beginning lines
1420 s/\s+$//; 1526 s/\n+$//; # ending lines
1421 1527
1422 $_ 1528 $_
1423} 1529}
1424 1530
1425sub hintmode { 1531sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1; 1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode} 1533 $_[0]{hintmode}
1428} 1534}
1429 1535
1430=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1431 1537
1432Sends an ext reply to the player. 1538Sends an ext reply to the player.
1433 1539
1434=cut 1540=cut
1435 1541
1436sub ext_reply($$%) { 1542sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1438 1544
1439 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441} 1546}
1442 1547
1443=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1444 1549
1445Sends an ext event to the client. 1550Sends an ext event to the client.
1446 1551
1447=cut 1552=cut
1448 1553
1449sub ext_event($$%) { 1554sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1451 1556
1452 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1453} 1558}
1454 1559
1455=head3 cf::region 1560=head3 cf::region
1456 1561
1457=over 4 1562=over 4
… …
1470 my ($path) = @_; 1575 my ($path) = @_;
1471 1576
1472 my ($match, $specificity); 1577 my ($match, $specificity);
1473 1578
1474 for my $region (list) { 1579 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1580 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1581 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1582 if $region->specificity > $specificity;
1478 } 1583 }
1479 } 1584 }
1480 1585
… …
1600 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1601 return $self; 1706 return $self;
1602 } 1707 }
1603 } 1708 }
1604 1709
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1711 ()
1607} 1712}
1608 1713
1609sub init { 1714sub init {
1610 my ($self) = @_; 1715 my ($self) = @_;
… …
1673 1778
1674sub load_header_from($) { 1779sub load_header_from($) {
1675 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1676 1781
1677 utf8::encode $path; 1782 utf8::encode $path;
1678 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1679 # or return;
1680
1681 $self->_load_header ($path)
1682 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;
1683 1791
1684 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1685 1793
1686 1 1794 1
1687} 1795}
… …
1741sub find { 1849sub find {
1742 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1743 1851
1744 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1745 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1746 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1747 1856
1748 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1749 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
1750 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1751 or return; 1862 or return;
1752 1863
1753 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1754 1865
… …
1756 or return; 1867 or return;
1757 1868
1758 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1760 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1761 $map->reset; 1874 $map->reset;
1762 undef $guard;
1763 return find $path; 1875 return find $path;
1764 } 1876 }
1765 1877
1766 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1767 } 1879 }
… …
1776 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1777 1889
1778 my $path = $self->{path}; 1890 my $path = $self->{path};
1779 1891
1780 { 1892 {
1781 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1782 1894
1895 return unless $self->valid;
1783 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1784 1897
1785 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1786 1899
1787 $self->alloc; 1900 $self->alloc;
1788 1901
1789 $self->pre_load; 1902 $self->pre_load;
1790 Coro::cede; 1903 cf::cede_to_tick;
1791 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1792 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1793 or return; 1908 or return;
1794 1909
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1797 1912
1798 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1799 utf8::encode $uniq; 1914 utf8::encode $uniq;
1800 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1801 $self->clear_unique_items; 1917 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1803 } 1921 }
1804 } 1922 }
1805 1923
1806 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1807 # now do the right thing for maps 1927 # now do the right thing for maps
1808 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1809 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1810 unless $self->difficulty; 1930 unless $self->difficulty;
1811 Coro::cede; 1931 cf::cede_to_tick;
1812 1932
1813 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1814 $self->decay_objects; 1934 $self->decay_objects;
1815 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1816 $self->update_buttons; 1936 $self->update_buttons;
1817 Coro::cede; 1937 cf::cede_to_tick;
1818 $self->set_darkness_map; 1938 $self->set_darkness_map;
1819 Coro::cede; 1939 cf::cede_to_tick;
1820 $self->activate; 1940 $self->activate;
1821 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1822 1945
1823 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1824 } 1947 }
1825 1948
1826 $self->post_load; 1949 $self->post_load;
… …
1837 1960
1838 $self 1961 $self
1839} 1962}
1840 1963
1841# 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
1842sub load_diag { 1965sub load_neighbours {
1843 my ($map) = @_; 1966 my ($map) = @_;
1844 1967
1845 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1846 1969
1847 for (0 .. 3) { 1970 for (0 .. 3) {
1848 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1849 or next; 1972 or next;
1850 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1851 or next; 1974 or next;
1852 $neigh->load; 1975 $neigh->load;
1853 1976
1977 push @neigh,
1854 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1855 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1856 } 1980 }
1857 1981
1858 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1859 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1860 or next; 1985 or next;
1861 $neigh->load; 1986 $neigh->load;
1862 } 1987 }
1863} 1988}
1864 1989
… …
1869} 1994}
1870 1995
1871sub do_load_sync { 1996sub do_load_sync {
1872 my ($map) = @_; 1997 my ($map) = @_;
1873 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1874 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1875} 2003}
1876 2004
1877our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1878our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1879 2007
1880sub find_async { 2008sub find_async {
1881 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1882 2010
1883 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1884 2012
1885 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1886 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1887 } 2015 }
1888 2016
1889 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1890 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1891 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1893 my $map = find $path 2022 if (my $map = find $k) {
1894 or next;
1895 $map->load; 2023 $map->load if $v;
2024 }
1896 2025
1897 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1898 } 2027 }
1899 } 2028 }
1900 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1901 }; 2030 };
1902 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1905} 2034}
1906 2035
1907sub save { 2036sub save {
1908 my ($self) = @_; 2037 my ($self) = @_;
1909 2038
1910 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1911 2040
1912 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1913 2042
1914 return unless $self->dirty; 2043 return unless $self->dirty;
1915 2044
… …
1938 my ($self) = @_; 2067 my ($self) = @_;
1939 2068
1940 # save first because save cedes 2069 # save first because save cedes
1941 $self->save; 2070 $self->save;
1942 2071
1943 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1944 2073
1945 return if $self->players; 2074 return if $self->players;
1946 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1947 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1948 2077
2078 $self->deactivate;
1949 $self->clear; 2079 $self->clear;
1950 $self->in_memory (cf::MAP_SWAPPED); 2080 $self->in_memory (cf::MAP_SWAPPED);
1951} 2081}
1952 2082
1953sub reset_at { 2083sub reset_at {
… …
1987 if $uniq; 2117 if $uniq;
1988 } 2118 }
1989 2119
1990 delete $cf::MAP{$self->path}; 2120 delete $cf::MAP{$self->path};
1991 2121
2122 $self->deactivate;
1992 $self->clear; 2123 $self->clear;
1993 2124
1994 $_->clear_links_to ($self) for values %cf::MAP; 2125 $_->clear_links_to ($self) for values %cf::MAP;
1995 2126
1996 $self->unlink_save; 2127 $self->unlink_save;
… …
2000my $nuke_counter = "aaaa"; 2131my $nuke_counter = "aaaa";
2001 2132
2002sub nuke { 2133sub nuke {
2003 my ($self) = @_; 2134 my ($self) = @_;
2004 2135
2136 {
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
2005 delete $cf::MAP{$self->path}; 2139 delete $cf::MAP{$self->path};
2006 2140
2007 $self->unlink_save; 2141 $self->unlink_save;
2008 2142
2009 bless $self, "cf::map"; 2143 bless $self, "cf::map";
2010 delete $self->{deny_reset}; 2144 delete $self->{deny_reset};
2011 $self->{deny_save} = 1; 2145 $self->{deny_save} = 1;
2012 $self->reset_timeout (1); 2146 $self->reset_timeout (1);
2013 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014 2148
2015 $cf::MAP{$self->path} = $self; 2149 $cf::MAP{$self->path} = $self;
2150 }
2016 2151
2017 $self->reset; # polite request, might not happen 2152 $self->reset; # polite request, might not happen
2018} 2153}
2019 2154
2020=item $maps = cf::map::tmp_maps 2155=item $maps = cf::map::tmp_maps
… …
2096 2231
2097sub inv_recursive { 2232sub inv_recursive {
2098 inv_recursive_ inv $_[0] 2233 inv_recursive_ inv $_[0]
2099} 2234}
2100 2235
2236=item $ref = $ob->ref
2237
2238creates and returns a persistent reference to an objetc that can be stored as a string.
2239
2240=item $ob = cf::object::deref ($refstring)
2241
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block.
2244
2245=cut
2246
2247sub deref {
2248 my ($ref) = @_;
2249
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return;
2257 $pl->ob->uuid eq $uuid
2258 or return;
2259
2260 $pl->ob
2261 } else {
2262 warn "$ref: cannot resolve object reference\n";
2263 undef
2264 }
2265}
2266
2101package cf; 2267package cf;
2102 2268
2103=back 2269=back
2104 2270
2105=head3 cf::object::player 2271=head3 cf::object::player
… …
2127 2293
2128 } else { 2294 } else {
2129 my $pl = $self->contr; 2295 my $pl = $self->contr;
2130 2296
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2297 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2298 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2300
2140 } else { 2301 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2302 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2303 $self->message ($msg, $flags);
2143 } 2304 }
2144 } 2305 }
2306}
2307
2308=item $object->send_msg ($channel, $msg, $color, [extra...])
2309
2310=cut
2311
2312sub cf::object::send_msg {
2313 my $pl = shift->contr
2314 or return;
2315 $pl->send_msg (@_);
2145} 2316}
2146 2317
2147=item $player_object->may ("access") 2318=item $player_object->may ("access")
2148 2319
2149Returns wether the given player is authorized to access resource "access" 2320Returns wether the given player is authorized to access resource "access"
… …
2228 # use -1 or undef as default coordinates, not 0, 0 2399 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2400 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2401 if $x <=0 && $y <= 0;
2231 2402
2232 $map->load; 2403 $map->load;
2233 $map->load_diag; 2404 $map->load_neighbours;
2234 2405
2235 return unless $self->contr->active; 2406 return unless $self->contr->active;
2236 $self->activate_recursive; 2407 $self->activate_recursive;
2237 2408
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2410 $self->enter_map ($map, $x, $y);
2240} 2411}
2241 2412
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2413=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2414
2244Moves the player to the given map-path and coordinates by first freezing 2415Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback 2416her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on 2417that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position. 2418the new (success) or old (failed) map position. In either case, $done will
2419be called at the end of this process.
2248 2420
2249=cut 2421=cut
2250 2422
2251our $GOTOGEN; 2423our $GOTOGEN;
2252 2424
2253sub cf::object::player::goto { 2425sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2426 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2427
2256 # do generation counting so two concurrent goto's will be executed in-order 2428 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2430
2259 $self->enter_link; 2431 $self->enter_link;
… …
2279 2451
2280 if ($gen == $self->{_goto_generation}) { 2452 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2453 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2454 $self->leave_link ($map, $x, $y);
2283 } 2455 }
2456
2457 $done->() if $done;
2284 })->prio (1); 2458 })->prio (1);
2285} 2459}
2286 2460
2287=item $player_object->enter_exit ($exit_object) 2461=item $player_object->enter_exit ($exit_object)
2288 2462
… …
2357 my $hp = $exit->stats->hp; 2531 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp; 2532 my $sp = $exit->stats->sp;
2359 2533
2360 $self->enter_link; 2534 $self->enter_link;
2361 2535
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2539
2362 (async { 2540 (async {
2363 $self->deactivate_recursive; # just to be sure 2541 $self->deactivate_recursive; # just to be sure
2364 unless (eval { 2542 unless (eval {
2365 $self->goto ($slaying, $hp, $sp); 2543 $self->goto ($slaying, $hp, $sp);
2366 2544
… …
2393 2571
2394 utf8::encode $text; 2572 utf8::encode $text;
2395 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2573 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2396} 2574}
2397 2575
2398=item $client->send_msg ($color, $type, $msg, [extra...]) 2576=item $client->send_msg ($channel, $msg, $color, [extra...])
2399 2577
2400Send a drawinfo or msg packet to the client, formatting the msg for the 2578Send a drawinfo or msg packet to the client, formatting the msg for the
2401client if neccessary. C<$type> should be a string identifying the type of 2579client if neccessary. C<$type> should be a string identifying the type of
2402the message, with C<log> being the default. If C<$color> is negative, suppress 2580the message, with C<log> being the default. If C<$color> is negative, suppress
2403the message unless the client supports the msg packet. 2581the message unless the client supports the msg packet.
2404 2582
2405=cut 2583=cut
2406 2584
2585our %CHANNEL = (
2586 "c/identify" => {
2587 id => "identify",
2588 title => "Identify",
2589 reply => undef,
2590 tooltip => "Items recently identified",
2591 },
2592 "c/examine" => {
2593 id => "examine",
2594 title => "Examine",
2595 reply => undef,
2596 tooltip => "Signs and other items you examined",
2597 },
2598);
2599
2407sub cf::client::send_msg { 2600sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_; 2601 my ($self, $channel, $msg, $color, @extra) = @_;
2409 2602
2410 $msg = $self->pl->expand_cfpod ($msg); 2603 $msg = $self->pl->expand_cfpod ($msg);
2411 2604
2605 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606
2607 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2609
2610 if (ref $channel) {
2611 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg;
2616 }
2617
2618 $channel = $channel->{id};
2619 }
2620
2412 return unless @extra || length $msg; 2621 return unless @extra || length $msg;
2413 2622
2414 if ($self->can_msg) { 2623 if ($self->can_msg) {
2624 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF;
2627
2415 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2628 $self->send_packet ("msg " . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2416 } else { 2630 } else {
2417 # replace some tags by gcfclient-compatible ones
2418 for ($msg) {
2419 1 while
2420 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425 }
2426
2427 if ($color >= 0) { 2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641
2642 $color &= cf::NDI_COLOR_MASK;
2643
2644 utf8::encode $msg;
2645
2428 if (0 && $msg =~ /\[/) { 2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2429 $self->send_packet ("drawextinfo $color 4 0 $msg") 2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2430 } else { 2649 } else {
2431 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432 $self->send_packet ("drawinfo $color $msg") 2651 $self->send_packet ("drawinfo $color $msg")
2433 } 2652 }
2434 } 2653 }
2435 } 2654 }
2436} 2655}
2437 2656
2438=item $client->ext_event ($type, %msg) 2657=item $client->ext_msg ($type, @msg)
2439 2658
2440Sends an ext event to the client. 2659Sends an ext event to the client.
2441 2660
2442=cut 2661=cut
2443 2662
2444sub cf::client::ext_event($$%) { 2663sub cf::client::ext_msg($$@) {
2445 my ($self, $type, %msg) = @_; 2664 my ($self, $type, @msg) = @_;
2446 2665
2666 if ($self->extcmd == 2) {
2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove
2447 $msg{msgtype} = "event_$type"; 2669 push @msg, msgtype => "event_$type";
2448 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 }
2672}
2673
2674=item $client->ext_reply ($msgid, @msg)
2675
2676Sends an ext reply to the client.
2677
2678=cut
2679
2680sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_;
2682
2683 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 }
2449} 2690}
2450 2691
2451=item $success = $client->query ($flags, "text", \&cb) 2692=item $success = $client->query ($flags, "text", \&cb)
2452 2693
2453Queues a query to the client, calling the given callback with 2694Queues a query to the client, calling the given callback with
… …
2508 my ($ns, $buf) = @_; 2749 my ($ns, $buf) = @_;
2509 2750
2510 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2751 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511 2752
2512 if (ref $msg) { 2753 if (ref $msg) {
2754 my ($type, $reply, @payload) =
2755 "ARRAY" eq ref $msg
2756 ? @$msg
2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2758
2759 my @reply;
2760
2513 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2761 if (my $cb = $EXTICMD{$type}) {
2514 if (my %reply = $cb->($ns, $msg)) { 2762 @reply = $cb->($ns, @payload);
2515 $reply{msgid} = $msg->{msgid};
2516 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2517 }
2518 } 2763 }
2764
2765 $ns->ext_reply ($reply, @reply)
2766 if $reply;
2767
2519 } else { 2768 } else {
2520 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2521 } 2770 }
2522 2771
2523 cf::override; 2772 cf::override;
… …
2570our $safe = new Safe "safe"; 2819our $safe = new Safe "safe";
2571our $safe_hole = new Safe::Hole; 2820our $safe_hole = new Safe::Hole;
2572 2821
2573$SIG{FPE} = 'IGNORE'; 2822$SIG{FPE} = 'IGNORE';
2574 2823
2575$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2824$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math
2826 grepstart grepwhile mapstart mapwhile
2827 sort time
2828));
2576 2829
2577# here we export the classes and methods available to script code 2830# here we export the classes and methods available to script code
2578 2831
2579=pod 2832=pod
2580 2833
2581The following functions and methods are available within a safe environment: 2834The following functions and methods are available within a safe environment:
2582 2835
2583 cf::object contr pay_amount pay_player map 2836 cf::object
2837 contr pay_amount pay_player map x y force_find force_add
2838 insert remove name archname title slaying race decrease_ob_nr
2839
2584 cf::object::player player 2840 cf::object::player
2585 cf::player peaceful 2841 player
2586 cf::map trigger 2842
2843 cf::player
2844 peaceful
2845
2846 cf::map
2847 trigger
2587 2848
2588=cut 2849=cut
2589 2850
2590for ( 2851for (
2591 ["cf::object" => qw(contr pay_amount pay_player map)], 2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race
2854 decrease_ob_nr)],
2592 ["cf::object::player" => qw(player)], 2855 ["cf::object::player" => qw(player)],
2593 ["cf::player" => qw(peaceful)], 2856 ["cf::player" => qw(peaceful)],
2594 ["cf::map" => qw(trigger)], 2857 ["cf::map" => qw(trigger)],
2595) { 2858) {
2596 no strict 'refs'; 2859 no strict 'refs';
… …
2672# the server's init and main functions 2935# the server's init and main functions
2673 2936
2674sub load_facedata($) { 2937sub load_facedata($) {
2675 my ($path) = @_; 2938 my ($path) = @_;
2676 2939
2940 # HACK to clear player env face cache, we need some signal framework
2941 # for this (global event?)
2942 %ext::player_env::MUSIC_FACE_CACHE = ();
2943
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2945
2677 warn "loading facedata from $path\n"; 2946 warn "loading facedata from $path\n";
2678 2947
2679 my $facedata; 2948 my $facedata;
2680 0 < aio_load $path, $facedata 2949 0 < aio_load $path, $facedata
2681 or die "$path: $!"; 2950 or die "$path: $!";
… …
2683 $facedata = Coro::Storable::thaw $facedata; 2952 $facedata = Coro::Storable::thaw $facedata;
2684 2953
2685 $facedata->{version} == 2 2954 $facedata->{version} == 2
2686 or cf::cleanup "$path: version mismatch, cannot proceed."; 2955 or cf::cleanup "$path: version mismatch, cannot proceed.";
2687 2956
2957 # patch in the exptable
2958 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2961 };
2962 cf::cede_to_tick;
2963
2688 { 2964 {
2689 my $faces = $facedata->{faceinfo}; 2965 my $faces = $facedata->{faceinfo};
2690 2966
2691 while (my ($face, $info) = each %$faces) { 2967 while (my ($face, $info) = each %$faces) {
2692 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2968 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2693 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2969 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap};
2694 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2695 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2696 Coro::cede; 2973
2974 cf::cede_to_tick;
2697 } 2975 }
2698 2976
2699 while (my ($face, $info) = each %$faces) { 2977 while (my ($face, $info) = each %$faces) {
2700 next unless $info->{smooth}; 2978 next unless $info->{smooth};
2701 my $idx = cf::face::find $face 2979 my $idx = cf::face::find $face
2702 or next; 2980 or next;
2703 if (my $smooth = cf::face::find $info->{smooth}) { 2981 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth;
2704 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2705 } else { 2984 } else {
2706 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2985 warn "smooth face '$info->{smooth}' not found for face '$face'";
2707 } 2986 }
2708 Coro::cede; 2987
2988 cf::cede_to_tick;
2709 } 2989 }
2710 } 2990 }
2711 2991
2712 { 2992 {
2713 my $anims = $facedata->{animinfo}; 2993 my $anims = $facedata->{animinfo};
2714 2994
2715 while (my ($anim, $info) = each %$anims) { 2995 while (my ($anim, $info) = each %$anims) {
2716 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2996 cf::anim::set $anim, $info->{frames}, $info->{facings};
2717 Coro::cede; 2997 cf::cede_to_tick;
2718 } 2998 }
2719 2999
2720 cf::anim::invalidate_all; # d'oh 3000 cf::anim::invalidate_all; # d'oh
2721 } 3001 }
2722 3002
3003 {
3004 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource};
3007
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
3013
3014 if ($info->{type} & 1) {
3015 # prepend meta info
3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
3023 } else {
3024 $data = $info->{data};
3025 }
3026
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick;
3031 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 }
3051
2723 1 3052 1
2724} 3053}
2725 3054
3055register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_;
3057
3058 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v);
3060 }
3061};
3062
2726sub reload_regions { 3063sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = ();
3067
2727 load_resource_file "$MAPDIR/regions" 3068 load_resource_file "$MAPDIR/regions"
2728 or die "unable to load regions file\n"; 3069 or die "unable to load regions file\n";
3070
3071 for (cf::region::list) {
3072 $_->{match} = qr/$_->{match}/
3073 if exists $_->{match};
3074 }
2729} 3075}
2730 3076
2731sub reload_facedata { 3077sub reload_facedata {
2732 load_facedata "$DATADIR/facedata" 3078 load_facedata "$DATADIR/facedata"
2733 or die "unable to load facedata\n"; 3079 or die "unable to load facedata\n";
… …
2762 3108
2763sub init { 3109sub init {
2764 reload_resources; 3110 reload_resources;
2765} 3111}
2766 3112
2767sub cfg_load { 3113sub reload_config {
2768 open my $fh, "<:utf8", "$CONFDIR/config" 3114 open my $fh, "<:utf8", "$CONFDIR/config"
2769 or return; 3115 or return;
2770 3116
2771 local $/; 3117 local $/;
2772 *CFG = YAML::Syck::Load <$fh>; 3118 *CFG = YAML::Syck::Load <$fh>;
… …
2792 (async { 3138 (async {
2793 Event::one_event; 3139 Event::one_event;
2794 })->prio (Coro::PRIO_MAX); 3140 })->prio (Coro::PRIO_MAX);
2795 }; 3141 };
2796 3142
2797 cfg_load; 3143 reload_config;
2798 db_init; 3144 db_init;
2799 load_extensions; 3145 load_extensions;
2800 3146
2801 $TICK_WATCHER->start; 3147 $TICK_WATCHER->start;
2802 Event::loop; 3148 Event::loop;
… …
2995 warn "reloading cf.pm"; 3341 warn "reloading cf.pm";
2996 require cf; 3342 require cf;
2997 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2998 3344
2999 warn "loading config and database again"; 3345 warn "loading config and database again";
3000 cf::cfg_load; 3346 cf::reload_config;
3001 3347
3002 warn "loading extensions"; 3348 warn "loading extensions";
3003 cf::load_extensions; 3349 cf::load_extensions;
3004 3350
3005 warn "reattaching attachments to objects/players"; 3351 warn "reattaching attachments to objects/players";
… …
3098 or die; 3444 or die;
3099 3445
3100 $map->width (50); 3446 $map->width (50);
3101 $map->height (50); 3447 $map->height (50);
3102 $map->alloc; 3448 $map->alloc;
3103 $map->_load_objects ("/tmp/x.map", 1); 3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3104 my $t = Event::time - $t; 3450 my $t = Event::time - $t;
3105 3451
3106 #next unless $t < 0.0013;#d# 3452 #next unless $t < 0.0013;#d#
3107 if ($t < $min) { 3453 if ($t < $min) {
3108 $min = $t; 3454 $min = $t;

Diff Legend

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