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

Diff Legend

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