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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
85our %CFG; 87our %CFG;
86 88
87our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 90our $RUNTIME;
89 91
90our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
93 95
94# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 98
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
170 178
171=back 179=back
172 180
173=cut 181=cut
174 182
… …
264Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
267returned. 275returned.
268 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
269Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
271 282
272=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
273 284
274Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
275 286
276=cut 287=cut
277 288
278our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
279 291
280sub lock_wait($) { 292sub lock_wait($) {
281 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
282 299
283 # wait for lock, if any 300 # wait for lock, if any
284 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 303 Coro::schedule;
… …
292 309
293 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
294 lock_wait $key; 311 lock_wait $key;
295 312
296 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
297 315
298 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
301 } 320 }
302} 321}
303 322
… …
313 my $guard = Coro::guard { 332 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 333 $TICK_WATCHER->start;
315 }; 334 };
316 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
317 $guard 336 $guard
337}
338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
318} 393}
319 394
320=item cf::async { BLOCK } 395=item cf::async { BLOCK }
321 396
322Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
… …
412=cut 487=cut
413 488
414sub fork_call(&@) { 489sub fork_call(&@) {
415 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
416 491
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 492 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 495
422 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 497 reset_signals;
436 local $SIG{__WARN__}; 498 &$cb
437 local $SIG{__DIE__}; 499 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 500
443 my @res = eval { $cb->(@args) }; 501 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 502}
461 503
462=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
463 505
464Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
544 if (1) { 586 if (1) {
545 $md5 = 587 $md5 =
546 join "\x00", 588 join "\x00",
547 $processversion, 589 $processversion,
548 map { 590 map {
549 Coro::cede; 591 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 593 } 0.. $#$src;
552 594
553 595
554 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
860 "; 902 ";
861 die if $@; 903 die if $@;
862} 904}
863 905
864our $override; 906our $override;
865our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
866 908
867sub override { 909sub override {
868 $override = 1; 910 $override = 1;
869 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
870} 912}
871 913
872sub do_invoke { 914sub do_invoke {
873 my $event = shift; 915 my $event = shift;
874 my $callbacks = shift; 916 my $callbacks = shift;
875 917
876 @invoke_results = (); 918 @INVOKE_RESULTS = ();
877 919
878 local $override; 920 local $override;
879 921
880 for (@$callbacks) { 922 for (@$callbacks) {
881 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
… …
898 940
899Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
900 942
901This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
902removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
903results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 946
905=back 947=back
906 948
907=cut 949=cut
908 950
909############################################################################# 951#############################################################################
910# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
911 964
912sub reattach { 965sub reattach {
913 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 967 my ($obj) = @_;
915 968
… …
959 }, 1012 },
960); 1013);
961 1014
962sub object_freezer_save { 1015sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
964 1019
965 sync_job { 1020 sync_job {
966 if (length $$rdata) { 1021 if (length $$rdata) {
967 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
992 } 1047 }
993 } else { 1048 } else {
994 aio_unlink $filename; 1049 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
996 } 1051 }
997 } 1052 };
1053
1054 undef $guard;
998} 1055}
999 1056
1000sub object_freezer_as_string { 1057sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1002 1059
… …
1007 1064
1008sub object_thawer_load { 1065sub object_thawer_load {
1009 my ($filename) = @_; 1066 my ($filename) = @_;
1010 1067
1011 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1012 1071
1013 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1014 or return; 1073 or return;
1015 1074
1016 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1077 or return;
1078
1079 undef $guard;
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1020 } 1081 }
1021 1082
1022 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1024 return ($data, $av); 1086 ($data, $av)
1025} 1087}
1026 1088
1027=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1028 1090
1029=over 4 1091=over 4
… …
1102 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1103 1165
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1167
1106 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1112 } else { 1183 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1185 }
1115 1186
1116 cf::override; 1187 cf::override;
… …
1206 1277
1207=head3 cf::player 1278=head3 cf::player
1208 1279
1209=over 4 1280=over 4
1210 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
1211=item cf::player::find $login 1296=item cf::player::find $login
1212 1297
1213Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1214 1299
1215=cut 1300=cut
… …
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1339
1255 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1256 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1257 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1258 } 1349 }
1259 } 1350 }
1260} 1351}
1261 1352
… …
1271 1362
1272 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1274 1365
1275 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1276 Coro::cede; 1367 cf::cede_to_tick;
1277} 1368}
1278 1369
1279sub new($) { 1370sub new($) {
1280 my ($login) = @_; 1371 my ($login) = @_;
1281 1372
… …
1285 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1286 1377
1287 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1288 1379
1289 $self 1380 $self
1381}
1382
1383=item $player->send_msg ($channel, $msg, $color, [extra...])
1384
1385=cut
1386
1387sub send_msg {
1388 my $ns = shift->ns
1389 or return;
1390 $ns->send_msg (@_);
1290} 1391}
1291 1392
1292=item $pl->quit_character 1393=item $pl->quit_character
1293 1394
1294Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
… …
1349 or return []; 1450 or return [];
1350 1451
1351 my @logins; 1452 my @logins;
1352 1453
1353 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1357 1463
1358 utf8::decode $login; 1464 utf8::decode $login;
1359 push @logins, $login; 1465 push @logins, $login;
1360 } 1466 }
1361 1467
… …
1399sub expand_cfpod { 1505sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1401 1507
1402 # escape & and < 1508 # escape & and <
1403 s/&/&amp;/g; 1509 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1405 1511
1406 # this is buggy, it needs to properly take care of nested <'s 1512 # this is buggy, it needs to properly take care of nested <'s
1407 1513
1408 1 while 1514 1 while
1409 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1413 # replace G<male|female> tags 1520 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1416 }ge 1523 }ge
1417 # replace H<hint text> 1524 # replace H<hint text>
… …
1438sub hintmode { 1545sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1547 $_[0]{hintmode}
1441} 1548}
1442 1549
1443=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1444 1551
1445Sends an ext reply to the player. 1552Sends an ext reply to the player.
1446 1553
1447=cut 1554=cut
1448 1555
1449sub ext_reply($$%) { 1556sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1451 1558
1452 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1560}
1455 1561
1456=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1457 1563
1458Sends an ext event to the client. 1564Sends an ext event to the client.
1459 1565
1460=cut 1566=cut
1461 1567
1462sub ext_event($$%) { 1568sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1464 1570
1465 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1466} 1572}
1467 1573
1468=head3 cf::region 1574=head3 cf::region
1469 1575
1470=over 4 1576=over 4
… …
1483 my ($path) = @_; 1589 my ($path) = @_;
1484 1590
1485 my ($match, $specificity); 1591 my ($match, $specificity);
1486 1592
1487 for my $region (list) { 1593 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1594 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1595 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1596 if $region->specificity > $specificity;
1491 } 1597 }
1492 } 1598 }
1493 1599
… …
1613 $self->init; # pass $1 etc. 1719 $self->init; # pass $1 etc.
1614 return $self; 1720 return $self;
1615 } 1721 }
1616 } 1722 }
1617 1723
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1724 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1725 ()
1620} 1726}
1621 1727
1622sub init { 1728sub init {
1623 my ($self) = @_; 1729 my ($self) = @_;
… …
1686 1792
1687sub load_header_from($) { 1793sub load_header_from($) {
1688 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1689 1795
1690 utf8::encode $path; 1796 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1696 1805
1697 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1698 1807
1699 1 1808 1
1700} 1809}
… …
1754sub find { 1863sub find {
1755 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1756 1865
1757 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1758 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1760 1870
1761 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1762 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1763 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1764 or return; 1876 or return;
1765 1877
1766 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1767 1879
… …
1769 or return; 1881 or return;
1770 1882
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1774 $map->reset; 1888 $map->reset;
1775 undef $guard;
1776 return find $path; 1889 return find $path;
1777 } 1890 }
1778 1891
1779 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1780 } 1893 }
… …
1789 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1790 1903
1791 my $path = $self->{path}; 1904 my $path = $self->{path};
1792 1905
1793 { 1906 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1795 1908
1909 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 1911
1798 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1799 1913
1800 $self->alloc; 1914 $self->alloc;
1801 1915
1802 $self->pre_load; 1916 $self->pre_load;
1803 Coro::cede; 1917 cf::cede_to_tick;
1804 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1806 or return; 1922 or return;
1807 1923
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1810 1926
1811 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 1928 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 1931 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1816 } 1935 }
1817 } 1936 }
1818 1937
1819 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1820 # now do the right thing for maps 1941 # now do the right thing for maps
1821 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 1944 unless $self->difficulty;
1824 Coro::cede; 1945 cf::cede_to_tick;
1825 1946
1826 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 1948 $self->decay_objects;
1828 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1829 $self->update_buttons; 1950 $self->update_buttons;
1830 Coro::cede; 1951 cf::cede_to_tick;
1831 $self->set_darkness_map; 1952 $self->set_darkness_map;
1832 Coro::cede; 1953 cf::cede_to_tick;
1833 $self->activate; 1954 $self->activate;
1834 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1835 1959
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1961 }
1838 1962
1839 $self->post_load; 1963 $self->post_load;
… …
1850 1974
1851 $self 1975 $self
1852} 1976}
1853 1977
1854# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1855sub load_diag { 1979sub load_neighbours {
1856 my ($map) = @_; 1980 my ($map) = @_;
1857 1981
1858 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1859 1983
1860 for (0 .. 3) { 1984 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1862 or next; 1986 or next;
1863 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1864 or next; 1988 or next;
1865 $neigh->load; 1989 $neigh->load;
1866 1990
1991 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 1994 }
1870 1995
1871 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1873 or next; 1999 or next;
1874 $neigh->load; 2000 $neigh->load;
1875 } 2001 }
1876} 2002}
1877 2003
… …
1882} 2008}
1883 2009
1884sub do_load_sync { 2010sub do_load_sync {
1885 my ($map) = @_; 2011 my ($map) = @_;
1886 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1887 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1888} 2017}
1889 2018
1890our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1892 2021
1893sub find_async { 2022sub find_async {
1894 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1895 2024
1896 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1897 2026
1898 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 2029 }
1901 2030
1902 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1903 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2036 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2037 $map->load if $v;
2038 }
1909 2039
1910 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1911 } 2041 }
1912 } 2042 }
1913 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1914 }; 2044 };
1915 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
1918} 2048}
1919 2049
1920sub save { 2050sub save {
1921 my ($self) = @_; 2051 my ($self) = @_;
1922 2052
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2054
1925 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1926 2056
1927 return unless $self->dirty; 2057 return unless $self->dirty;
1928 2058
… …
1951 my ($self) = @_; 2081 my ($self) = @_;
1952 2082
1953 # save first because save cedes 2083 # save first because save cedes
1954 $self->save; 2084 $self->save;
1955 2085
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2087
1958 return if $self->players; 2088 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1961 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2096 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2097}
1965 2098
1966sub reset_at { 2099sub reset_at {
1967 my ($self) = @_; 2100 my ($self) = @_;
1968 2101
… …
2000 if $uniq; 2133 if $uniq;
2001 } 2134 }
2002 2135
2003 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
2004 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2140 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2141
2009 $self->unlink_save; 2142 $self->unlink_save;
2010 $self->destroy; 2143 $self->destroy;
2011} 2144}
2012 2145
2013my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
2014 2147
2015sub nuke { 2148sub nuke {
2016 my ($self) = @_; 2149 my ($self) = @_;
2017 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2018 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2019 2155
2020 $self->unlink_save; 2156 $self->unlink_save;
2021 2157
2022 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2163
2028 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2029 2166
2030 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2031} 2168}
2032 2169
2033=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2109 2246
2110sub inv_recursive { 2247sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2112} 2249}
2113 2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
2280}
2281
2114package cf; 2282package cf;
2115 2283
2116=back 2284=back
2117 2285
2118=head3 cf::object::player 2286=head3 cf::object::player
… …
2140 2308
2141 } else { 2309 } else {
2142 my $pl = $self->contr; 2310 my $pl = $self->contr;
2143 2311
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2313 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2315
2153 } else { 2316 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2156 } 2319 }
2157 } 2320 }
2321}
2322
2323=item $object->send_msg ($channel, $msg, $color, [extra...])
2324
2325=cut
2326
2327sub cf::object::send_msg {
2328 my $pl = shift->contr
2329 or return;
2330 $pl->send_msg (@_);
2158} 2331}
2159 2332
2160=item $player_object->may ("access") 2333=item $player_object->may ("access")
2161 2334
2162Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2244 2417
2245 $map->load; 2418 $map->load;
2246 $map->load_diag; 2419 $map->load_neighbours;
2247 2420
2248 return unless $self->contr->active; 2421 return unless $self->contr->active;
2249 $self->activate_recursive; 2422 $self->activate_recursive;
2250 2423
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2425 $self->enter_map ($map, $x, $y);
2253} 2426}
2254 2427
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2429
2257Moves the player to the given map-path and coordinates by first freezing 2430Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2431her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2432that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2433the new (success) or old (failed) map position. In either case, $done will
2434be called at the end of this process.
2261 2435
2262=cut 2436=cut
2263 2437
2264our $GOTOGEN; 2438our $GOTOGEN;
2265 2439
2266sub cf::object::player::goto { 2440sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2441 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2442
2269 # do generation counting so two concurrent goto's will be executed in-order 2443 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2445
2272 $self->enter_link; 2446 $self->enter_link;
… …
2292 2466
2293 if ($gen == $self->{_goto_generation}) { 2467 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2468 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2469 $self->leave_link ($map, $x, $y);
2296 } 2470 }
2471
2472 $done->() if $done;
2297 })->prio (1); 2473 })->prio (1);
2298} 2474}
2299 2475
2300=item $player_object->enter_exit ($exit_object) 2476=item $player_object->enter_exit ($exit_object)
2301 2477
… …
2410 2586
2411 utf8::encode $text; 2587 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2588 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2589}
2414 2590
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2592
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2593Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2594client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2595the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2421 2597
2422=cut 2598=cut
2423 2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2424sub cf::client::send_msg { 2615sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2617
2427 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2428 2619
2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2624
2625 if (ref $channel) {
2626 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2631 }
2632
2633 $channel = $channel->{id};
2634 }
2635
2429 return unless @extra || length $msg; 2636 return unless @extra || length $msg;
2430 2637
2431 if ($self->can_msg) { 2638 if ($self->can_msg) {
2639 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF;
2642
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2643 $self->send_packet ("msg " . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2645 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656
2657 $color &= cf::NDI_COLOR_MASK;
2658
2659 utf8::encode $msg;
2660
2445 if (0 && $msg =~ /\[/) { 2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2664 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2666 $self->send_packet ("drawinfo $color $msg")
2450 } 2667 }
2451 } 2668 }
2452 } 2669 }
2453} 2670}
2454 2671
2455=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2456 2673
2457Sends an ext event to the client. 2674Sends an ext event to the client.
2458 2675
2459=cut 2676=cut
2460 2677
2461sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2463 2680
2681 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2466} 2705}
2467 2706
2468=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2469 2708
2470Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2764 my ($ns, $buf) = @_;
2526 2765
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2767
2529 if (ref $msg) { 2768 if (ref $msg) {
2769 my ($type, $reply, @payload) =
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773
2774 my @reply;
2775
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2776 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2777 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2536 } else { 2783 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2785 }
2539 2786
2540 cf::override; 2787 cf::override;
… …
2587our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2589 2836
2590$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2591 2838
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2839$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math
2841 grepstart grepwhile mapstart mapwhile
2842 sort time
2843));
2593 2844
2594# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2595 2846
2596=pod 2847=pod
2597 2848
2598The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2599 2850
2600 cf::object 2851 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 2852 contr pay_amount pay_player map x y force_find force_add
2602 insert remove 2853 insert remove name archname title slaying race decrease_ob_nr
2603 2854
2604 cf::object::player 2855 cf::object::player
2605 player 2856 player
2606 2857
2607 cf::player 2858 cf::player
… …
2612 2863
2613=cut 2864=cut
2614 2865
2615for ( 2866for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race
2617 insert remove)], 2869 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2621) { 2873) {
2622 no strict 'refs'; 2874 no strict 'refs';
… …
2698# the server's init and main functions 2950# the server's init and main functions
2699 2951
2700sub load_facedata($) { 2952sub load_facedata($) {
2701 my ($path) = @_; 2953 my ($path) = @_;
2702 2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2960
2703 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2704 2962
2705 my $facedata; 2963 my $facedata;
2706 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2965 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2710 2968
2711 $facedata->{version} == 2 2969 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2978
2714 { 2979 {
2715 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2716 2981
2717 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 2988
2989 cf::cede_to_tick;
2723 } 2990 }
2724 2991
2725 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2993 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2994 my $idx = cf::face::find $face
2728 or next; 2995 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2996 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2999 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3000 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3001 }
2734 Coro::cede; 3002
3003 cf::cede_to_tick;
2735 } 3004 }
2736 } 3005 }
2737 3006
2738 { 3007 {
2739 my $anims = $facedata->{animinfo}; 3008 my $anims = $facedata->{animinfo};
2740 3009
2741 while (my ($anim, $info) = each %$anims) { 3010 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3011 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3012 cf::cede_to_tick;
2744 } 3013 }
2745 3014
2746 cf::anim::invalidate_all; # d'oh 3015 cf::anim::invalidate_all; # d'oh
2747 } 3016 }
2748 3017
3018 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource};
3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028
3029 if ($info->{type} & 1) {
3030 # prepend meta info
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else {
3039 $data = $info->{data};
3040 }
3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick;
3046 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 }
3066
2749 1 3067 1
2750} 3068}
2751 3069
3070register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_;
3072
3073 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v);
3075 }
3076};
3077
2752sub reload_regions { 3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
2753 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
3085
3086 for (cf::region::list) {
3087 $_->{match} = qr/$_->{match}/
3088 if exists $_->{match};
3089 }
2755} 3090}
2756 3091
2757sub reload_facedata { 3092sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3093 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3094 or die "unable to load facedata\n";
… …
2788 3123
2789sub init { 3124sub init {
2790 reload_resources; 3125 reload_resources;
2791} 3126}
2792 3127
2793sub cfg_load { 3128sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3130 or return;
2796 3131
2797 local $/; 3132 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
2818 (async { 3153 (async {
2819 Event::one_event; 3154 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2821 }; 3156 };
2822 3157
2823 cfg_load; 3158 reload_config;
2824 db_init; 3159 db_init;
2825 load_extensions; 3160 load_extensions;
2826 3161
2827 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2828 Event::loop; 3163 Event::loop;
… …
3021 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
3022 require cf; 3357 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3359
3025 warn "loading config and database again"; 3360 warn "loading config and database again";
3026 cf::cfg_load; 3361 cf::reload_config;
3027 3362
3028 warn "loading extensions"; 3363 warn "loading extensions";
3029 cf::load_extensions; 3364 cf::load_extensions;
3030 3365
3031 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3124 or die; 3459 or die;
3125 3460
3126 $map->width (50); 3461 $map->width (50);
3127 $map->height (50); 3462 $map->height (50);
3128 $map->alloc; 3463 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3130 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3131 3466
3132 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3133 if ($t < $min) { 3468 if ($t < $min) {
3134 $min = $t; 3469 $min = $t;

Diff Legend

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