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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.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 $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;
… …
1193 1277
1194=head3 cf::player 1278=head3 cf::player
1195 1279
1196=over 4 1280=over 4
1197 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
1198=item cf::player::find $login 1296=item cf::player::find $login
1199 1297
1200Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1201 1299
1202=cut 1300=cut
… …
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1339
1242 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1245 } 1349 }
1246 } 1350 }
1247} 1351}
1248 1352
… …
1258 1362
1259 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1261 1365
1262 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1263 Coro::cede; 1367 cf::cede_to_tick;
1264} 1368}
1265 1369
1266sub new($) { 1370sub new($) {
1267 my ($login) = @_; 1371 my ($login) = @_;
1268 1372
… …
1272 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1273 1377
1274 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1275 1379
1276 $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 (@_);
1277} 1391}
1278 1392
1279=item $pl->quit_character 1393=item $pl->quit_character
1280 1394
1281Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
… …
1336 or return []; 1450 or return [];
1337 1451
1338 my @logins; 1452 my @logins;
1339 1453
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1344 1463
1345 utf8::decode $login; 1464 utf8::decode $login;
1346 push @logins, $login; 1465 push @logins, $login;
1347 } 1466 }
1348 1467
… …
1386sub expand_cfpod { 1505sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1388 1507
1389 # escape & and < 1508 # escape & and <
1390 s/&/&amp;/g; 1509 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1392 1511
1393 # 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
1394 1513
1395 1 while 1514 1 while
1396 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1400 # replace G<male|female> tags 1520 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1403 }ge 1523 }ge
1404 # replace H<hint text> 1524 # replace H<hint text>
… …
1412 1532
1413 # create single paragraphs (very hackish) 1533 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1534 s/(?<=\S)\n(?=\w)/ /g;
1415 1535
1416 # compress some whitespace 1536 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1418 1541
1419 $_ 1542 $_
1420} 1543}
1421 1544
1422sub hintmode { 1545sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1547 $_[0]{hintmode}
1426} 1548}
1427 1549
1428=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1429 1551
1430Sends an ext reply to the player. 1552Sends an ext reply to the player.
1431 1553
1432=cut 1554=cut
1433 1555
1434sub ext_reply($$%) { 1556sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1436 1558
1437 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1560}
1440 1561
1441=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1442 1563
1443Sends an ext event to the client. 1564Sends an ext event to the client.
1444 1565
1445=cut 1566=cut
1446 1567
1447sub ext_event($$%) { 1568sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1449 1570
1450 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1451} 1572}
1452 1573
1453=head3 cf::region 1574=head3 cf::region
1454 1575
1455=over 4 1576=over 4
… …
1468 my ($path) = @_; 1589 my ($path) = @_;
1469 1590
1470 my ($match, $specificity); 1591 my ($match, $specificity);
1471 1592
1472 for my $region (list) { 1593 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1594 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1595 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1596 if $region->specificity > $specificity;
1476 } 1597 }
1477 } 1598 }
1478 1599
… …
1598 $self->init; # pass $1 etc. 1719 $self->init; # pass $1 etc.
1599 return $self; 1720 return $self;
1600 } 1721 }
1601 } 1722 }
1602 1723
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1724 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1725 ()
1605} 1726}
1606 1727
1607sub init { 1728sub init {
1608 my ($self) = @_; 1729 my ($self) = @_;
… …
1671 1792
1672sub load_header_from($) { 1793sub load_header_from($) {
1673 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1674 1795
1675 utf8::encode $path; 1796 utf8::encode $path;
1676 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1677 # or return;
1678
1679 $self->_load_header ($path)
1680 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;
1681 1805
1682 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1683 1807
1684 1 1808 1
1685} 1809}
… …
1739sub find { 1863sub find {
1740 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1741 1865
1742 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1743 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1744 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1745 1870
1746 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1747 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
1748 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1749 or return; 1876 or return;
1750 1877
1751 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1752 1879
… …
1754 or return; 1881 or return;
1755 1882
1756 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1758 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1759 $map->reset; 1888 $map->reset;
1760 undef $guard;
1761 return find $path; 1889 return find $path;
1762 } 1890 }
1763 1891
1764 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1765 } 1893 }
… …
1774 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1775 1903
1776 my $path = $self->{path}; 1904 my $path = $self->{path};
1777 1905
1778 { 1906 {
1779 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1780 1908
1909 return unless $self->valid;
1781 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1782 1911
1783 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1784 1913
1785 $self->alloc; 1914 $self->alloc;
1786 1915
1787 $self->pre_load; 1916 $self->pre_load;
1788 Coro::cede; 1917 cf::cede_to_tick;
1789 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1790 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1791 or return; 1922 or return;
1792 1923
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1795 1926
1796 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1797 utf8::encode $uniq; 1928 utf8::encode $uniq;
1798 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1799 $self->clear_unique_items; 1931 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1801 } 1935 }
1802 } 1936 }
1803 1937
1804 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1805 # now do the right thing for maps 1941 # now do the right thing for maps
1806 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 1944 unless $self->difficulty;
1809 Coro::cede; 1945 cf::cede_to_tick;
1810 1946
1811 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 1948 $self->decay_objects;
1813 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1814 $self->update_buttons; 1950 $self->update_buttons;
1815 Coro::cede; 1951 cf::cede_to_tick;
1816 $self->set_darkness_map; 1952 $self->set_darkness_map;
1817 Coro::cede; 1953 cf::cede_to_tick;
1818 $self->activate; 1954 $self->activate;
1819 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1820 1959
1821 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 1961 }
1823 1962
1824 $self->post_load; 1963 $self->post_load;
… …
1835 1974
1836 $self 1975 $self
1837} 1976}
1838 1977
1839# 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
1840sub load_diag { 1979sub load_neighbours {
1841 my ($map) = @_; 1980 my ($map) = @_;
1842 1981
1843 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1844 1983
1845 for (0 .. 3) { 1984 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1847 or next; 1986 or next;
1848 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1849 or next; 1988 or next;
1850 $neigh->load; 1989 $neigh->load;
1851 1990
1991 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 1994 }
1855 1995
1856 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1858 or next; 1999 or next;
1859 $neigh->load; 2000 $neigh->load;
1860 } 2001 }
1861} 2002}
1862 2003
… …
1867} 2008}
1868 2009
1869sub do_load_sync { 2010sub do_load_sync {
1870 my ($map) = @_; 2011 my ($map) = @_;
1871 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1872 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1873} 2017}
1874 2018
1875our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1877 2021
1878sub find_async { 2022sub find_async {
1879 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1880 2024
1881 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1882 2026
1883 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 2029 }
1886 2030
1887 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1888 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1889 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 2036 if (my $map = find $k) {
1892 or next;
1893 $map->load; 2037 $map->load if $v;
2038 }
1894 2039
1895 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1896 } 2041 }
1897 } 2042 }
1898 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1899 }; 2044 };
1900 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
1903} 2048}
1904 2049
1905sub save { 2050sub save {
1906 my ($self) = @_; 2051 my ($self) = @_;
1907 2052
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2054
1910 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1911 2056
1912 return unless $self->dirty; 2057 return unless $self->dirty;
1913 2058
… …
1936 my ($self) = @_; 2081 my ($self) = @_;
1937 2082
1938 # save first because save cedes 2083 # save first because save cedes
1939 $self->save; 2084 $self->save;
1940 2085
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2087
1943 return if $self->players; 2088 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1946 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1947 $self->clear; 2096 $self->clear;
1948 $self->in_memory (cf::MAP_SWAPPED);
1949} 2097}
1950 2098
1951sub reset_at { 2099sub reset_at {
1952 my ($self) = @_; 2100 my ($self) = @_;
1953 2101
… …
1985 if $uniq; 2133 if $uniq;
1986 } 2134 }
1987 2135
1988 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
1989 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
1990 $self->clear; 2140 $self->clear;
1991
1992 $_->clear_links_to ($self) for values %cf::MAP;
1993 2141
1994 $self->unlink_save; 2142 $self->unlink_save;
1995 $self->destroy; 2143 $self->destroy;
1996} 2144}
1997 2145
1998my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
1999 2147
2000sub nuke { 2148sub nuke {
2001 my ($self) = @_; 2149 my ($self) = @_;
2002 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2003 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2004 2155
2005 $self->unlink_save; 2156 $self->unlink_save;
2006 2157
2007 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2163
2013 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2014 2166
2015 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2016} 2168}
2017 2169
2018=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2094 2246
2095sub inv_recursive { 2247sub inv_recursive {
2096 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2097} 2249}
2098 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
2099package cf; 2282package cf;
2100 2283
2101=back 2284=back
2102 2285
2103=head3 cf::object::player 2286=head3 cf::object::player
… …
2125 2308
2126 } else { 2309 } else {
2127 my $pl = $self->contr; 2310 my $pl = $self->contr;
2128 2311
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2313 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2315
2138 } else { 2316 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2141 } 2319 }
2142 } 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 (@_);
2143} 2331}
2144 2332
2145=item $player_object->may ("access") 2333=item $player_object->may ("access")
2146 2334
2147Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
… …
2226 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2229 2417
2230 $map->load; 2418 $map->load;
2231 $map->load_diag; 2419 $map->load_neighbours;
2232 2420
2233 return unless $self->contr->active; 2421 return unless $self->contr->active;
2234 $self->activate_recursive; 2422 $self->activate_recursive;
2235 2423
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2425 $self->enter_map ($map, $x, $y);
2238} 2426}
2239 2427
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2429
2242Moves 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
2243her, loading and preparing them map, calling the provided $check callback 2431her, loading and preparing them map, calling the provided $check callback
2244that 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
2245the 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.
2246 2435
2247=cut 2436=cut
2248 2437
2249our $GOTOGEN; 2438our $GOTOGEN;
2250 2439
2251sub cf::object::player::goto { 2440sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2441 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2442
2254 # 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
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2445
2257 $self->enter_link; 2446 $self->enter_link;
… …
2277 2466
2278 if ($gen == $self->{_goto_generation}) { 2467 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2468 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2469 $self->leave_link ($map, $x, $y);
2281 } 2470 }
2471
2472 $done->() if $done;
2282 })->prio (1); 2473 })->prio (1);
2283} 2474}
2284 2475
2285=item $player_object->enter_exit ($exit_object) 2476=item $player_object->enter_exit ($exit_object)
2286 2477
… …
2355 my $hp = $exit->stats->hp; 2546 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2547 my $sp = $exit->stats->sp;
2357 2548
2358 $self->enter_link; 2549 $self->enter_link;
2359 2550
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2554
2360 (async { 2555 (async {
2361 $self->deactivate_recursive; # just to be sure 2556 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2557 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2558 $self->goto ($slaying, $hp, $sp);
2364 2559
… …
2391 2586
2392 utf8::encode $text; 2587 utf8::encode $text;
2393 $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);
2394} 2589}
2395 2590
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2592
2398Send 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
2399client 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
2400the 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
2401the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2402 2597
2403=cut 2598=cut
2404 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
2405sub cf::client::send_msg { 2615sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2617
2408 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2409 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
2636 return unless @extra || length $msg;
2637
2410 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
2411 $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]));
2412 } else { 2645 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 if ($color >= 0) { 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
2424 if (0 && $msg =~ /\[/) { 2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2664 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2666 $self->send_packet ("drawinfo $color $msg")
2429 } 2667 }
2430 } 2668 }
2431 } 2669 }
2432} 2670}
2433 2671
2434=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2435 2673
2436Sends an ext event to the client. 2674Sends an ext event to the client.
2437 2675
2438=cut 2676=cut
2439 2677
2440sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2442 2680
2681 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2444 $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 }
2445} 2705}
2446 2706
2447=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2448 2708
2449Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
… …
2504 my ($ns, $buf) = @_; 2764 my ($ns, $buf) = @_;
2505 2765
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2767
2508 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
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2776 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 2777 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2515 } else { 2783 } else {
2516 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";
2517 } 2785 }
2518 2786
2519 cf::override; 2787 cf::override;
… …
2566our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2568 2836
2569$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2570 2838
2571$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));
2572 2844
2573# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2574 2846
2575=pod 2847=pod
2576 2848
2577The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2578 2850
2579 cf::object contr pay_amount pay_player map 2851 cf::object
2852 contr pay_amount pay_player map x y force_find force_add
2853 insert remove name archname title slaying race decrease_ob_nr
2854
2580 cf::object::player player 2855 cf::object::player
2581 cf::player peaceful 2856 player
2582 cf::map trigger 2857
2858 cf::player
2859 peaceful
2860
2861 cf::map
2862 trigger
2583 2863
2584=cut 2864=cut
2585 2865
2586for ( 2866for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 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
2869 decrease_ob_nr)],
2588 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2591) { 2873) {
2592 no strict 'refs'; 2874 no strict 'refs';
… …
2668# the server's init and main functions 2950# the server's init and main functions
2669 2951
2670sub load_facedata($) { 2952sub load_facedata($) {
2671 my ($path) = @_; 2953 my ($path) = @_;
2672 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
2673 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2674 2962
2675 my $facedata; 2963 my $facedata;
2676 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 2965 or die "$path: $!";
… …
2679 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2680 2968
2681 $facedata->{version} == 2 2969 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 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
2684 { 2979 {
2685 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2686 2981
2687 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 2988
2989 cf::cede_to_tick;
2693 } 2990 }
2694 2991
2695 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 2993 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 2994 my $idx = cf::face::find $face
2698 or next; 2995 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 2996 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 2999 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3000 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 3001 }
2704 Coro::cede; 3002
3003 cf::cede_to_tick;
2705 } 3004 }
2706 } 3005 }
2707 3006
2708 { 3007 {
2709 my $anims = $facedata->{animinfo}; 3008 my $anims = $facedata->{animinfo};
2710 3009
2711 while (my ($anim, $info) = each %$anims) { 3010 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3011 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 3012 cf::cede_to_tick;
2714 } 3013 }
2715 3014
2716 cf::anim::invalidate_all; # d'oh 3015 cf::anim::invalidate_all; # d'oh
2717 } 3016 }
2718 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
2719 1 3067 1
2720} 3068}
2721 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
2722sub 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
2723 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2724 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 }
2725} 3090}
2726 3091
2727sub reload_facedata { 3092sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3093 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3094 or die "unable to load facedata\n";
… …
2758 3123
2759sub init { 3124sub init {
2760 reload_resources; 3125 reload_resources;
2761} 3126}
2762 3127
2763sub cfg_load { 3128sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3130 or return;
2766 3131
2767 local $/; 3132 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
2788 (async { 3153 (async {
2789 Event::one_event; 3154 Event::one_event;
2790 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2791 }; 3156 };
2792 3157
2793 cfg_load; 3158 reload_config;
2794 db_init; 3159 db_init;
2795 load_extensions; 3160 load_extensions;
2796 3161
2797 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2798 Event::loop; 3163 Event::loop;
… …
2991 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
2992 require cf; 3357 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3359
2995 warn "loading config and database again"; 3360 warn "loading config and database again";
2996 cf::cfg_load; 3361 cf::reload_config;
2997 3362
2998 warn "loading extensions"; 3363 warn "loading extensions";
2999 cf::load_extensions; 3364 cf::load_extensions;
3000 3365
3001 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3094 or die; 3459 or die;
3095 3460
3096 $map->width (50); 3461 $map->width (50);
3097 $map->height (50); 3462 $map->height (50);
3098 $map->alloc; 3463 $map->alloc;
3099 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3100 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3101 3466
3102 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3103 if ($t < $min) { 3468 if ($t < $min) {
3104 $min = $t; 3469 $min = $t;

Diff Legend

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