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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.384 by root, Fri Oct 12 18:17:16 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 4.1 ();
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
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 88our $DB_ENV;
82 89
83our %CFG; 90our %CFG;
84 91
85our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 93our $RUNTIME;
87 94
88our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
91 98
92# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 101
164 171
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
169=back 182=back
170 183
171=cut 184=cut
172 185
173BEGIN { 186BEGIN {
177 $msg .= "\n" 190 $msg .= "\n"
178 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
179 192
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 194
182 utf8::encode $msg;
183 LOG llevError, $msg; 195 LOG llevError, $msg;
184 }; 196 };
185} 197}
186 198
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 249 $d
238 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
239} 251}
240 252
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
244 254
245Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
246 256
247=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
248 258
249Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
250 267
251=item cf::lock_wait $string 268=item cf::lock_wait $string
252 269
253Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
254 271
257Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
258a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
260returned. 277returned.
261 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
262Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
264 284
265=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
266 286
267Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
268 288
269=cut 289=cut
270 290
271our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
272 293
273sub lock_wait($) { 294sub lock_wait($) {
274 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
275 301
276 # wait for lock, if any 302 # wait for lock, if any
277 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 305 Coro::schedule;
285 311
286 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
287 lock_wait $key; 313 lock_wait $key;
288 314
289 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
290 317
291 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
294 } 322 }
295} 323}
296 324
308 }; 336 };
309 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
310 $guard 338 $guard
311} 339}
312 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
313=item cf::async { BLOCK } 399=item cf::async { BLOCK }
314 400
315Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
316C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
317thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
341 my $time = Event::time; 427 my $time = Event::time;
342 428
343 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
345 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
346 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
347 # (but this is cancel-safe) 435 # (but this is cancel-safe)
348 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
349 437
350 my $busy = 1; 438 my $busy = 1;
351 my @res; 439 my @res;
352 440
353 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 443 @res = eval { $job->() };
355 warn $@ if $@; 444 warn $@ if $@;
356 undef $busy; 445 undef $busy;
357 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
358 447
405=cut 494=cut
406 495
407sub fork_call(&@) { 496sub fork_call(&@) {
408 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
409 498
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 499 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 500 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 501 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 502
415 if (my $pid = fork) { 503 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 504 reset_signals;
428 local $SIG{__WARN__}; 505 &$cb
429 local $SIG{__DIE__}; 506 }, @args;
430 eval {
431 close $fh1;
432 507
433 my @res = eval { $cb->(@args) }; 508 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 509}
441 510
442=item $value = cf::db_get $family => $key 511=item $value = cf::db_get $family => $key
443 512
444Returns a single value from the environment database. 513Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
447 516
448Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
451=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
452 543
453our $DB; 544our $DB;
454 545
455sub db_init { 546sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 547 cf::sync_job {
460 eval { 548 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 549 };
470} 550}
471 551
472sub db_get($$) { 552sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
474 554
524 if (1) { 604 if (1) {
525 $md5 = 605 $md5 =
526 join "\x00", 606 join "\x00",
527 $processversion, 607 $processversion,
528 map { 608 map {
529 Coro::cede; 609 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 611 } 0.. $#$src;
532 612
533 613
534 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
840 "; 920 ";
841 die if $@; 921 die if $@;
842} 922}
843 923
844our $override; 924our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 925our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 926
847sub override { 927sub override {
848 $override = 1; 928 $override = 1;
849 @invoke_results = (); 929 @INVOKE_RESULTS = (@_);
850} 930}
851 931
852sub do_invoke { 932sub do_invoke {
853 my $event = shift; 933 my $event = shift;
854 my $callbacks = shift; 934 my $callbacks = shift;
855 935
856 @invoke_results = (); 936 @INVOKE_RESULTS = ();
857 937
858 local $override; 938 local $override;
859 939
860 for (@$callbacks) { 940 for (@$callbacks) {
861 eval { &{$_->[1]} }; 941 eval { &{$_->[1]} };
878 958
879Generate an object-specific event with the given arguments. 959Generate an object-specific event with the given arguments.
880 960
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 961This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 962removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 963results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 964
885=back 965=back
886 966
887=cut 967=cut
888 968
889############################################################################# 969#############################################################################
890# object support 970# object support
971#
972
973sub _can_merge {
974 my ($ob1, $ob2) = @_;
975
976 local $Storable::canonical = 1;
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979
980 $fob1 eq $fob2
981}
891 982
892sub reattach { 983sub reattach {
893 # basically do the same as instantiate, without calling instantiate 984 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 985 my ($obj) = @_;
895 986
942sub object_freezer_save { 1033sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
944 1035
945 sync_job { 1036 sync_job {
946 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
949 1041
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1046 close $fh;
955 1047
956 if (@$objs) { 1048 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1054 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
964 } 1056 }
972 } 1064 }
973 } else { 1065 } else {
974 aio_unlink $filename; 1066 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
976 } 1068 }
977 } 1069 };
978} 1070}
979 1071
980sub object_freezer_as_string { 1072sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
982 1074
994 or return; 1086 or return;
995 1087
996 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
998 or return; 1090 or return;
999 $av = eval { (Storable::thaw $av)->{objs} };
1000 }
1001 1091
1092 my $st = eval { Coro::Storable::thaw $av }
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1095 }
1096
1097 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1004 return ($data, $av); 1101 ($data, $av)
1005} 1102}
1006 1103
1007=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1008 1105
1009=over 4 1106=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1126 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1127}
1031 1128
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1129=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1130
1034Register a callback fro execution when the client sends an extcmd packet. 1131Register a callback for execution when the client sends an (synchronous)
1132extcmd packet. Ext commands will be processed in the order they are
1133received by the server, like other user commands. The first argument is
1134the logged-in player. Ext commands can only be processed after a player
1135has logged in successfully.
1035 1136
1036If the callback returns something, it is sent back as if reply was being 1137If the callback returns something, it is sent back as if reply was being
1037called. 1138called.
1038 1139
1140=item cf::register_exticmd $name => \&callback($ns,$packet);
1141
1142Register a callback for execution when the client sends an (asynchronous)
1143exticmd packet. Exti commands are processed by the server as soon as they
1144are received, i.e. out of order w.r.t. other commands. The first argument
1145is a client socket. Exti commands can be received anytime, even before
1146log-in.
1147
1148If the callback returns something, it is sent back as if reply was being
1149called.
1150
1039=cut 1151=cut
1040 1152
1041sub register_extcmd { 1153sub register_extcmd {
1042 my ($name, $cb) = @_; 1154 my ($name, $cb) = @_;
1043 1155
1044 $EXTCMD{$name} = $cb; 1156 $EXTCMD{$name} = $cb;
1157}
1158
1159sub register_exticmd {
1160 my ($name, $cb) = @_;
1161
1162 $EXTICMD{$name} = $cb;
1045} 1163}
1046 1164
1047cf::player->attach ( 1165cf::player->attach (
1048 on_command => sub { 1166 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1167 my ($pl, $name, $params) = @_;
1058 cf::override; 1176 cf::override;
1059 }, 1177 },
1060 on_extcmd => sub { 1178 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
1062 1180
1063 my $msg = eval { from_json $buf }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1182
1065 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1071 } else { 1198 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1200 }
1074 1201
1075 cf::override; 1202 cf::override;
1165 1292
1166=head3 cf::player 1293=head3 cf::player
1167 1294
1168=over 4 1295=over 4
1169 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1170=item cf::player::find $login 1311=item cf::player::find $login
1171 1312
1172Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1173 1314
1174=cut 1315=cut
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1354
1214 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1217 } 1363 }
1218 } 1364 }
1219} 1365}
1220 1366
1230 1376
1231 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1233 1379
1234 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1235 Coro::cede; 1381 cf::cede_to_tick;
1236} 1382}
1237 1383
1238sub new($) { 1384sub new($) {
1239 my ($login) = @_; 1385 my ($login) = @_;
1240 1386
1244 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1245 1391
1246 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1247 1393
1248 $self 1394 $self
1395}
1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1249} 1405}
1250 1406
1251=item $pl->quit_character 1407=item $pl->quit_character
1252 1408
1253Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1464 or return [];
1309 1465
1310 my @logins; 1466 my @logins;
1311 1467
1312 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1316 1477
1317 utf8::decode $login; 1478 utf8::decode $login;
1318 push @logins, $login; 1479 push @logins, $login;
1319 } 1480 }
1320 1481
1347 } 1508 }
1348 1509
1349 \@paths 1510 \@paths
1350} 1511}
1351 1512
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1514
1515Expand crossfire pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563
1352=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1353 1565
1354Sends an ext reply to the player. 1566Sends an ext reply to the player.
1355 1567
1356=cut 1568=cut
1357 1569
1358sub ext_reply($$%) { 1570sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1360 1572
1361 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1574}
1365 1575
1366=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1367 1577
1368Sends an ext event to the client. 1578Sends an ext event to the client.
1369 1579
1370=cut 1580=cut
1371 1581
1372sub ext_event($$%) { 1582sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1374 1584
1375 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1376} 1586}
1377 1587
1378=head3 cf::region 1588=head3 cf::region
1379 1589
1380=over 4 1590=over 4
1393 my ($path) = @_; 1603 my ($path) = @_;
1394 1604
1395 my ($match, $specificity); 1605 my ($match, $specificity);
1396 1606
1397 for my $region (list) { 1607 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1608 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1609 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1610 if $region->specificity > $specificity;
1401 } 1611 }
1402 } 1612 }
1403 1613
1523 $self->init; # pass $1 etc. 1733 $self->init; # pass $1 etc.
1524 return $self; 1734 return $self;
1525 } 1735 }
1526 } 1736 }
1527 1737
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1738 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1739 ()
1530} 1740}
1531 1741
1532sub init { 1742sub init {
1533 my ($self) = @_; 1743 my ($self) = @_;
1596 1806
1597sub load_header_from($) { 1807sub load_header_from($) {
1598 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1599 1809
1600 utf8::encode $path; 1810 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1606 1819
1607 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1608 1821
1609 1 1822 1
1610} 1823}
1664sub find { 1877sub find {
1665 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1666 1879
1667 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1668 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1670 1884
1671 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1672 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1673 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1674 or return; 1890 or return;
1675 1891
1676 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1677 1893
1679 or return; 1895 or return;
1680 1896
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1684 $map->reset; 1902 $map->reset;
1685 undef $guard;
1686 return find $path; 1903 return find $path;
1687 } 1904 }
1688 1905
1689 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1690 } 1907 }
1699 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1700 1917
1701 my $path = $self->{path}; 1918 my $path = $self->{path};
1702 1919
1703 { 1920 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1705 1922
1923 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 1925
1708 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1709 1927
1710 $self->alloc; 1928 $self->alloc;
1711 1929
1712 $self->pre_load; 1930 $self->pre_load;
1713 Coro::cede; 1931 cf::cede_to_tick;
1714 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1716 or return; 1936 or return;
1717 1937
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1719 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1720 1940
1721 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 1942 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 1945 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1726 } 1949 }
1727 } 1950 }
1728 1951
1729 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1730 # now do the right thing for maps 1955 # now do the right thing for maps
1731 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 1958 unless $self->difficulty;
1734 Coro::cede; 1959 cf::cede_to_tick;
1735 1960
1736 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 1962 $self->decay_objects;
1738 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1739 $self->update_buttons; 1964 $self->update_buttons;
1740 Coro::cede; 1965 cf::cede_to_tick;
1741 $self->set_darkness_map; 1966 $self->set_darkness_map;
1742 Coro::cede; 1967 cf::cede_to_tick;
1743 $self->activate; 1968 $self->activate;
1744 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1745 1973
1746 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 1975 }
1748 1976
1749 $self->post_load; 1977 $self->post_load;
1760 1988
1761 $self 1989 $self
1762} 1990}
1763 1991
1764# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1765sub load_diag { 1993sub load_neighbours {
1766 my ($map) = @_; 1994 my ($map) = @_;
1767 1995
1768 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1769 1997
1770 for (0 .. 3) { 1998 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1772 or next; 2000 or next;
1773 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1774 or next; 2002 or next;
1775 $neigh->load; 2003 $neigh->load;
1776 2004
2005 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2008 }
1780 2009
1781 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1783 or next; 2013 or next;
1784 $neigh->load; 2014 $neigh->load;
1785 } 2015 }
1786} 2016}
1787 2017
1792} 2022}
1793 2023
1794sub do_load_sync { 2024sub do_load_sync {
1795 my ($map) = @_; 2025 my ($map) = @_;
1796 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1797 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1798} 2031}
1799 2032
1800our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1802 2035
1803sub find_async { 2036sub find_async {
1804 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1805 2038
1806 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1807 2040
1808 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810 } 2043 }
1811 2044
1812 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1813 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1814 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2052 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2053 $map->load if $v;
2054 }
1819 2055
1820 delete $MAP_PREFETCH{$path}; 2056 delete $MAP_PREFETCH{$k};
1821 } 2057 }
1822 } 2058 }
1823 undef $MAP_PREFETCHER; 2059 undef $MAP_PREFETCHER;
1824 }; 2060 };
1825 $MAP_PREFETCHER->prio (6); 2061 $MAP_PREFETCHER->prio (6);
1828} 2064}
1829 2065
1830sub save { 2066sub save {
1831 my ($self) = @_; 2067 my ($self) = @_;
1832 2068
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2070
1835 $self->{last_save} = $cf::RUNTIME; 2071 $self->{last_save} = $cf::RUNTIME;
1836 2072
1837 return unless $self->dirty; 2073 return unless $self->dirty;
1838 2074
1844 return if $self->{deny_save}; 2080 return if $self->{deny_save};
1845 2081
1846 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
1847 2083
1848 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
1850 }; 2087 };
1851 2088
1852 if ($uniq) { 2089 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1861 my ($self) = @_; 2098 my ($self) = @_;
1862 2099
1863 # save first because save cedes 2100 # save first because save cedes
1864 $self->save; 2101 $self->save;
1865 2102
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2104
1868 return if $self->players; 2105 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
1870 return if $self->{deny_save}; 2107 return if $self->{deny_save};
1871 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2113 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2114}
1875 2115
1876sub reset_at { 2116sub reset_at {
1877 my ($self) = @_; 2117 my ($self) = @_;
1878 2118
1910 if $uniq; 2150 if $uniq;
1911 } 2151 }
1912 2152
1913 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
1914 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2157 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2158
1919 $self->unlink_save; 2159 $self->unlink_save;
1920 $self->destroy; 2160 $self->destroy;
1921} 2161}
1922 2162
1923my $nuke_counter = "aaaa"; 2163my $nuke_counter = "aaaa";
1924 2164
1925sub nuke { 2165sub nuke {
1926 my ($self) = @_; 2166 my ($self) = @_;
1927 2167
2168 {
2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2170
1928 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
1929 2172
1930 $self->unlink_save; 2173 $self->unlink_save;
1931 2174
1932 bless $self, "cf::map"; 2175 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2180
1938 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2182 }
1939 2183
1940 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
1941} 2185}
1942 2186
1943=item $maps = cf::map::tmp_maps 2187=item $maps = cf::map::tmp_maps
2019 2263
2020sub inv_recursive { 2264sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2022} 2266}
2023 2267
2268=item $ref = $ob->ref
2269
2270creates and returns a persistent reference to an objetc that can be stored as a string.
2271
2272=item $ob = cf::object::deref ($refstring)
2273
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block.
2276
2277=cut
2278
2279sub deref {
2280 my ($ref) = @_;
2281
2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2024package cf; 2296package cf;
2025 2297
2026=back 2298=back
2027 2299
2028=head3 cf::object::player 2300=head3 cf::object::player
2050 2322
2051 } else { 2323 } else {
2052 my $pl = $self->contr; 2324 my $pl = $self->contr;
2053 2325
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2327 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2329
2060 } else { 2330 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2063 } 2333 }
2064 } 2334 }
2335}
2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
2065} 2345}
2066 2346
2067=item $player_object->may ("access") 2347=item $player_object->may ("access")
2068 2348
2069Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
2148 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
2151 2431
2152 $map->load; 2432 $map->load;
2153 $map->load_diag; 2433 $map->load_neighbours;
2154 2434
2155 return unless $self->contr->active; 2435 return unless $self->contr->active;
2156 $self->activate_recursive; 2436 $self->activate_recursive;
2157 2437
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2439 $self->enter_map ($map, $x, $y);
2160} 2440}
2161 2441
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2443
2164Moves the player to the given map-path and coordinates by first freezing 2444Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2445her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2446that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2447the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process.
2168 2449
2169=cut 2450=cut
2170 2451
2171our $GOTOGEN; 2452our $GOTOGEN;
2172 2453
2173sub cf::object::player::goto { 2454sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2455 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2456
2176 # do generation counting so two concurrent goto's will be executed in-order 2457 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2459
2179 $self->enter_link; 2460 $self->enter_link;
2180 2461
2181 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2465 # *tag paths override both path and x|y
2466 if ($path =~ /^\*(.*)$/) {
2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2468 my $ob = $obs[rand @obs];
2469
2470 # see if we actually can go there
2471 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2472 $ob = $obs[rand @obs];
2473 } else {
2474 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2475 }
2476 # else put us there anyways for now #d#
2477
2478 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2479 } else {
2480 ($path, $x, $y) = (undef, undef, undef);
2481 }
2482 }
2483
2182 my $map = eval { 2484 my $map = eval {
2183 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2184 2486
2185 if ($map) { 2487 if ($map) {
2186 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2188 } else { 2490 } else {
2189 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2190 } 2492 }
2191 2493
2192 $map 2494 $map
2193 }; 2495 };
2194 2496
2199 2501
2200 if ($gen == $self->{_goto_generation}) { 2502 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2503 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2504 $self->leave_link ($map, $x, $y);
2203 } 2505 }
2506
2507 $done->() if $done;
2204 })->prio (1); 2508 })->prio (1);
2205} 2509}
2206 2510
2207=item $player_object->enter_exit ($exit_object) 2511=item $player_object->enter_exit ($exit_object)
2208 2512
2277 my $hp = $exit->stats->hp; 2581 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp; 2582 my $sp = $exit->stats->sp;
2279 2583
2280 $self->enter_link; 2584 $self->enter_link;
2281 2585
2586 # if exit is damned, update players death & WoR home-position
2587 $self->contr->savebed ($slaying, $hp, $sp)
2588 if $exit->flag (FLAG_DAMNED);
2589
2282 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2283 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2284 unless (eval { 2594 unless (eval {
2285 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2286 2596
2287 1; 2597 1;
2313 2623
2314 utf8::encode $text; 2624 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2625 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2626}
2317 2627
2628=item $client->send_msg ($channel, $msg, $color, [extra...])
2629
2630Send a drawinfo or msg packet to the client, formatting the msg for the
2631client if neccessary. C<$type> should be a string identifying the type of
2632the message, with C<log> being the default. If C<$color> is negative, suppress
2633the message unless the client supports the msg packet.
2634
2635=cut
2636
2637our %CHANNEL = (
2638 "c/identify" => {
2639 id => "infobox",
2640 title => "Identify",
2641 reply => undef,
2642 tooltip => "Items recently identified",
2643 },
2644 "c/examine" => {
2645 id => "infobox",
2646 title => "Examine",
2647 reply => undef,
2648 tooltip => "Signs and other items you examined",
2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2656);
2657
2658sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_;
2660
2661 $msg = $self->pl->expand_cfpod ($msg);
2662
2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2664
2665 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2674 } elsif (ref $channel) {
2675 # send meta info to client, if not yet sent
2676 unless (exists $self->{channel}{$channel->{id}}) {
2677 $self->{channel}{$channel->{id}} = $channel;
2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2680 }
2681
2682 $channel = $channel->{id};
2683 }
2684
2685 return unless @extra || length $msg;
2686
2687 if ($self->can_msg) {
2688 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF;
2691
2692 $self->send_packet ("msg " . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2694 } else {
2695 if ($color >= 0) {
2696 # replace some tags by gcfclient-compatible ones
2697 for ($msg) {
2698 1 while
2699 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2700 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2701 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2702 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2703 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2704 }
2705
2706 $color &= cf::NDI_COLOR_MASK;
2707
2708 utf8::encode $msg;
2709
2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2713 } else {
2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2715 $self->send_packet ("drawinfo $color $msg")
2716 }
2717 }
2718 }
2719}
2720
2318=item $client->ext_event ($type, %msg) 2721=item $client->ext_msg ($type, @msg)
2319 2722
2320Sends an exti event to the client. 2723Sends an ext event to the client.
2321 2724
2322=cut 2725=cut
2323 2726
2324sub cf::client::ext_event($$%) { 2727sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2728 my ($self, $type, @msg) = @_;
2326 2729
2730 if ($self->extcmd == 2) {
2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2733 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 }
2736}
2737
2738=item $client->ext_reply ($msgid, @msg)
2739
2740Sends an ext reply to the client.
2741
2742=cut
2743
2744sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_;
2746
2747 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id;
2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2753 }
2329} 2754}
2330 2755
2331=item $success = $client->query ($flags, "text", \&cb) 2756=item $success = $client->query ($flags, "text", \&cb)
2332 2757
2333Queues a query to the client, calling the given callback with 2758Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2759the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2760C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2761
2337Queries can fail, so check the return code. Or don't, as queries will become 2762Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2763become reliable at some point in the future.
2339 2764
2340=cut 2765=cut
2341 2766
2342sub cf::client::query { 2767sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2768 my ($self, $flags, $text, $cb) = @_;
2351 utf8::encode $text; 2776 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2777 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2778
2354 $self->send_packet ($self->{query_queue}[0][0]) 2779 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2780 if @{ $self->{query_queue} } == 1;
2781
2782 1
2356} 2783}
2357 2784
2358cf::client->attach ( 2785cf::client->attach (
2786 on_connect => sub {
2787 my ($ns) = @_;
2788
2789 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2790 },
2359 on_reply => sub { 2791 on_reply => sub {
2360 my ($ns, $msg) = @_; 2792 my ($ns, $msg) = @_;
2361 2793
2362 # this weird shuffling is so that direct followup queries 2794 # this weird shuffling is so that direct followup queries
2363 # get handled first 2795 # get handled first
2375 } else { 2807 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2808 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2809 }
2378 } 2810 }
2379 }, 2811 },
2812 on_exticmd => sub {
2813 my ($ns, $buf) = @_;
2814
2815 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2816
2817 if (ref $msg) {
2818 my ($type, $reply, @payload) =
2819 "ARRAY" eq ref $msg
2820 ? @$msg
2821 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2822
2823 my @reply;
2824
2825 if (my $cb = $EXTICMD{$type}) {
2826 @reply = $cb->($ns, @payload);
2827 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2832 } else {
2833 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2834 }
2835
2836 cf::override;
2837 },
2380); 2838);
2381 2839
2382=item $client->async (\&cb) 2840=item $client->async (\&cb)
2383 2841
2384Create a new coroutine, running the specified callback. The coroutine will 2842Create a new coroutine, running the specified callback. The coroutine will
2425our $safe = new Safe "safe"; 2883our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 2884our $safe_hole = new Safe::Hole;
2427 2885
2428$SIG{FPE} = 'IGNORE'; 2886$SIG{FPE} = 'IGNORE';
2429 2887
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2888$safe->permit_only (Opcode::opset qw(
2889 :base_core :base_mem :base_orig :base_math
2890 grepstart grepwhile mapstart mapwhile
2891 sort time
2892));
2431 2893
2432# here we export the classes and methods available to script code 2894# here we export the classes and methods available to script code
2433 2895
2434=pod 2896=pod
2435 2897
2436The following functions and methods are available within a safe environment: 2898The following functions and methods are available within a safe environment:
2437 2899
2438 cf::object contr pay_amount pay_player map 2900 cf::object
2901 contr pay_amount pay_player map x y force_find force_add destroy
2902 insert remove name archname title slaying race decrease_ob_nr
2903
2439 cf::object::player player 2904 cf::object::player
2440 cf::player peaceful 2905 player
2441 cf::map trigger 2906
2907 cf::player
2908 peaceful
2909
2910 cf::map
2911 trigger
2442 2912
2443=cut 2913=cut
2444 2914
2445for ( 2915for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race
2918 decrease_ob_nr destroy)],
2447 ["cf::object::player" => qw(player)], 2919 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 2920 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 2921 ["cf::map" => qw(trigger)],
2450) { 2922) {
2451 no strict 'refs'; 2923 no strict 'refs';
2527# the server's init and main functions 2999# the server's init and main functions
2528 3000
2529sub load_facedata($) { 3001sub load_facedata($) {
2530 my ($path) = @_; 3002 my ($path) = @_;
2531 3003
3004 # HACK to clear player env face cache, we need some signal framework
3005 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = ();
3007
3008 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3009
2532 warn "loading facedata from $path\n"; 3010 warn "loading facedata from $path\n";
2533 3011
2534 my $facedata; 3012 my $facedata;
2535 0 < aio_load $path, $facedata 3013 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3014 or die "$path: $!";
2538 $facedata = Coro::Storable::thaw $facedata; 3016 $facedata = Coro::Storable::thaw $facedata;
2539 3017
2540 $facedata->{version} == 2 3018 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3019 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 3020
3021 # patch in the exptable
3022 $facedata->{resource}{"res/exp_table"} = {
3023 type => FT_RSRC,
3024 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3025 };
3026 cf::cede_to_tick;
3027
2543 { 3028 {
2544 my $faces = $facedata->{faceinfo}; 3029 my $faces = $facedata->{faceinfo};
2545 3030
2546 while (my ($face, $info) = each %$faces) { 3031 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3032 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3033 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3037
3038 cf::cede_to_tick;
2552 } 3039 }
2553 3040
2554 while (my ($face, $info) = each %$faces) { 3041 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3042 next unless $info->{smooth};
2556 my $idx = cf::face::find $face 3043 my $idx = cf::face::find $face
2557 or next; 3044 or next;
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3045 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3048 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3049 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3050 }
2563 Coro::cede; 3051
3052 cf::cede_to_tick;
2564 } 3053 }
2565 } 3054 }
2566 3055
2567 { 3056 {
2568 my $anims = $facedata->{animinfo}; 3057 my $anims = $facedata->{animinfo};
2569 3058
2570 while (my ($anim, $info) = each %$anims) { 3059 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3060 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3061 cf::cede_to_tick;
2573 } 3062 }
2574 3063
2575 cf::anim::invalidate_all; # d'oh 3064 cf::anim::invalidate_all; # d'oh
2576 } 3065 }
2577 3066
3067 {
3068 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource};
3071
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 while (my ($name, $info) = each %$res) {
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
3077
3078 if ($info->{type} & 1) {
3079 # prepend meta info
3080
3081 my $meta = $enc->encode ({
3082 name => $name,
3083 %{ $info->{meta} || {} },
3084 });
3085
3086 $data = pack "(w/a*)*", $meta, $info->{data};
3087 } else {
3088 $data = $info->{data};
3089 }
3090
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
3094 cf::cede_to_tick;
3095 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
3114 }
3115
2578 1 3116 1
2579} 3117}
2580 3118
3119register_exticmd fx_want => sub {
3120 my ($ns, $want) = @_;
3121
3122 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v);
3124 }
3125};
3126
2581sub reload_regions { 3127sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
2582 load_resource_file "$MAPDIR/regions" 3132 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 3133 or die "unable to load regions file\n";
3134
3135 for (cf::region::list) {
3136 $_->{match} = qr/$_->{match}/
3137 if exists $_->{match};
3138 }
2584} 3139}
2585 3140
2586sub reload_facedata { 3141sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3142 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3143 or die "unable to load facedata\n";
2589} 3144}
2590 3145
2591sub reload_archetypes { 3146sub reload_archetypes {
3147 load_resource_file "$DATADIR/archetypes"
3148 or die "unable to load archetypes\n";
3149 #d# NEED to laod twice to resolve forward references
3150 # this really needs to be done in an extra post-pass
3151 # (which needs to be synchronous, so solve it differently)
2592 load_resource_file "$DATADIR/archetypes" 3152 load_resource_file "$DATADIR/archetypes"
2593 or die "unable to load archetypes\n"; 3153 or die "unable to load archetypes\n";
2594} 3154}
2595 3155
2596sub reload_treasures { 3156sub reload_treasures {
2612 3172
2613sub init { 3173sub init {
2614 reload_resources; 3174 reload_resources;
2615} 3175}
2616 3176
2617sub cfg_load { 3177sub reload_config {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3178 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3179 or return;
2620 3180
2621 local $/; 3181 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3182 *CFG = YAML::Syck::Load <$fh>;
2638sub main { 3198sub main {
2639 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
2641 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2642 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
2643 Event::one_event; 3204 Event::one_event;
2644 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
2645 }; 3206 };
2646 3207
2647 cfg_load; 3208 reload_config;
2648 db_init; 3209 db_init;
2649 load_extensions; 3210 load_extensions;
2650 3211
2651 $TICK_WATCHER->start; 3212 $TICK_WATCHER->start;
2652 Event::loop; 3213 Event::loop;
2719 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
2721 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3286 $pl->save;
2725 } 3287 }
2726 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
2727 3289
2728 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
2790 %EXT_CORO = (); 3352 %EXT_CORO = ();
2791 3353
2792 warn "removing commands"; 3354 warn "removing commands";
2793 %COMMAND = (); 3355 %COMMAND = ();
2794 3356
2795 warn "removing ext commands"; 3357 warn "removing ext/exti commands";
2796 %EXTCMD = (); 3358 %EXTCMD = ();
3359 %EXTICMD = ();
2797 3360
2798 warn "unloading/nuking all extensions"; 3361 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 3362 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 3363 warn "... unloading $pkg";
2801 3364
2844 warn "reloading cf.pm"; 3407 warn "reloading cf.pm";
2845 require cf; 3408 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3410
2848 warn "loading config and database again"; 3411 warn "loading config and database again";
2849 cf::cfg_load; 3412 cf::reload_config;
2850 3413
2851 warn "loading extensions"; 3414 warn "loading extensions";
2852 cf::load_extensions; 3415 cf::load_extensions;
2853 3416
2854 warn "reattaching attachments to objects/players"; 3417 warn "reattaching attachments to objects/players";
2890register_command "reload" => sub { 3453register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
2892 3455
2893 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3460 reload_perl;
3461 };
2896 } 3462 }
2897}; 3463};
2898 3464
2899unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
2900 3466
2919 my $signal = new Coro::Signal; 3485 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3486 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3487 $signal->wait;
2922} 3488}
2923 3489
2924 my $min = 1e6;#d#
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer ( 3490$TICK_WATCHER = Event->timer (
2927 reentrant => 0, 3491 reentrant => 0,
2928 parked => 1, 3492 parked => 1,
2929 prio => 0, 3493 prio => 0,
2930 at => $NEXT_TICK || $TICK, 3494 at => $NEXT_TICK || $TICK,
2938 3502
2939 $NOW = $tick_start = Event::time; 3503 $NOW = $tick_start = Event::time;
2940 3504
2941 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
2942 3506
2943 0 && sync_job {#d#
2944 for(1..10) {
2945 my $t = Event::time;
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2947 or die;
2948
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 };
2965
2966 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
2968 3509
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
2972 write_runtime 3514 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
2974 }; 3516 };
2975 } 3517 }
2976 3518
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3520 $sig->send;
2982 } 3521 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3522 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3523 $sig->send;
2994 3533
2995 $LOAD = ($NOW - $tick_start) / $TICK; 3534 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3536
2998 _post_tick; 3537 _post_tick;
2999
3000
3001 }, 3538 },
3002); 3539);
3003 3540
3004{ 3541{
3542 BDB::min_parallel 8;
3005 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
3006 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
3007 reentrant => 0, 3545 reentrant => 0,
3008 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
3009 poll => 'r', 3547 poll => 'r',
3010 prio => 0, 3548 prio => 0,
3011 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
3013 ); 3551 );
3014 BDB::min_parallel 8;
3015 3552
3016 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
3017 my $status; 3554 my $status;
3018 my $current = $Coro::current; 3555 my $current = $Coro::current;
3019 ( 3556 (
3028 ) 3565 )
3029 }; 3566 };
3030 3567
3031 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
3032 $DB_ENV = BDB::db_env_create; 3569 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1);
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033 3574
3034 cf::sync_job { 3575 cf::sync_job {
3035 eval { 3576 eval {
3036 BDB::db_env_open 3577 BDB::db_env_open
3037 $DB_ENV, 3578 $DB_ENV,
3039 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3580 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3582 0666;
3042 3583
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3585 };
3048 3586
3049 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3588 };
3051 } 3589 }
3590
3591 $BDB_DEADLOCK_WATCHER = Event->timer (
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 );
3601 $BDB_CHECKPOINT_WATCHER = Event->timer (
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 );
3611 $BDB_TRICKLE_WATCHER = Event->timer (
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 );
3052} 3621}
3053 3622
3054{ 3623{
3055 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
3056 3625
3059 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
3060 reentrant => 0, 3629 reentrant => 0,
3061 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
3063 poll => 'r', 3632 poll => 'r',
3064 prio => 6, 3633 prio => 0,
3065 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
3066 ); 3635 );
3067} 3636}
3068 3637
3069my $_log_backtrace; 3638my $_log_backtrace;
3075 3644
3076 # limit the # of concurrent backtraces 3645 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3646 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3647 ++$_log_backtrace;
3079 async { 3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3080 my @bt = fork_call { 3651 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3652 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3654 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3084 or die "addr2line: $!"; 3655 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines