… | |
… | |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Symbol; |
6 | use Symbol; |
7 | use List::Util; |
7 | use List::Util; |
8 | use Socket; |
8 | use Socket; |
9 | use Storable; |
|
|
10 | use Event; |
9 | use Event; |
11 | use Opcode; |
10 | use Opcode; |
12 | use Safe; |
11 | use Safe; |
13 | use Safe::Hole; |
12 | use Safe::Hole; |
|
|
13 | use Storable (); |
14 | |
14 | |
15 | use Coro 3.64 (); |
15 | use Coro 4.1 (); |
16 | use Coro::State; |
16 | use Coro::State; |
17 | use Coro::Handle; |
17 | use Coro::Handle; |
18 | use Coro::Event; |
18 | use Coro::Event; |
19 | use Coro::Timer; |
19 | use Coro::Timer; |
20 | use Coro::Signal; |
20 | use Coro::Signal; |
21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
22 | use Coro::AIO; |
22 | use Coro::AIO; |
23 | use Coro::Storable; |
23 | use Coro::Storable; |
24 | use Coro::Util (); |
24 | use Coro::Util (); |
25 | |
25 | |
26 | use JSON::XS 1.4 (); |
26 | use JSON::XS (); |
27 | use BDB (); |
27 | use BDB (); |
28 | use Data::Dumper; |
28 | use Data::Dumper; |
29 | use Digest::MD5; |
29 | use Digest::MD5; |
30 | use Fcntl; |
30 | use Fcntl; |
31 | use YAML::Syck (); |
31 | use YAML::Syck (); |
32 | use IO::AIO 2.32 (); |
32 | use IO::AIO 2.51 (); |
33 | use Time::HiRes; |
33 | use Time::HiRes; |
34 | use Compress::LZF; |
34 | use Compress::LZF; |
35 | use Digest::MD5 (); |
35 | use Digest::MD5 (); |
36 | |
36 | |
37 | # configure various modules to our taste |
37 | # configure various modules to our taste |
… | |
… | |
80 | our $NEXT_TICK; |
80 | our $NEXT_TICK; |
81 | our $NOW; |
81 | our $NOW; |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
83 | |
83 | |
84 | our $BDB_POLL_WATCHER; |
84 | our $BDB_POLL_WATCHER; |
|
|
85 | our $BDB_DEADLOCK_WATCHER; |
|
|
86 | our $BDB_CHECKPOINT_WATCHER; |
|
|
87 | our $BDB_TRICKLE_WATCHER; |
85 | our $DB_ENV; |
88 | our $DB_ENV; |
86 | |
89 | |
87 | our %CFG; |
90 | our %CFG; |
88 | |
91 | |
89 | our $UPTIME; $UPTIME ||= time; |
92 | our $UPTIME; $UPTIME ||= time; |
90 | our $RUNTIME; |
93 | our $RUNTIME; |
91 | |
94 | |
92 | our %PLAYER; # all users |
95 | our (%PLAYER, %PLAYER_LOADING); # all users |
93 | our %MAP; # all maps |
96 | our (%MAP, %MAP_LOADING ); # all maps |
94 | our $LINK_MAP; # the special {link} map, which is always available |
97 | our $LINK_MAP; # the special {link} map, which is always available |
95 | |
98 | |
96 | # 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 ∕ |
97 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
100 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
98 | |
101 | |
… | |
… | |
187 | $msg .= "\n" |
190 | $msg .= "\n" |
188 | unless $msg =~ /\n$/; |
191 | unless $msg =~ /\n$/; |
189 | |
192 | |
190 | $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; |
191 | |
194 | |
192 | utf8::encode $msg; |
|
|
193 | LOG llevError, $msg; |
195 | LOG llevError, $msg; |
194 | }; |
196 | }; |
195 | } |
197 | } |
196 | |
198 | |
197 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
199 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
… | |
… | |
272 | Wait until the given lock is available and then acquires it and returns |
274 | Wait until the given lock is available and then acquires it and returns |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
275 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
274 | for example when the coroutine gets canceled), the lock is automatically |
276 | for example when the coroutine gets canceled), the lock is automatically |
275 | returned. |
277 | returned. |
276 | |
278 | |
|
|
279 | Locks are *not* recursive, locking from the same coro twice results in a |
|
|
280 | deadlocked coro. |
|
|
281 | |
277 | Lock names should begin with a unique identifier (for example, cf::map::find |
282 | Lock names should begin with a unique identifier (for example, cf::map::find |
278 | uses map_find and cf::map::load uses map_load). |
283 | uses map_find and cf::map::load uses map_load). |
279 | |
284 | |
280 | =item $locked = cf::lock_active $string |
285 | =item $locked = cf::lock_active $string |
281 | |
286 | |
282 | Return true if the lock is currently active, i.e. somebody has locked it. |
287 | Return true if the lock is currently active, i.e. somebody has locked it. |
283 | |
288 | |
284 | =cut |
289 | =cut |
285 | |
290 | |
286 | our %LOCK; |
291 | our %LOCK; |
|
|
292 | our %LOCKER;#d# |
287 | |
293 | |
288 | sub lock_wait($) { |
294 | sub lock_wait($) { |
289 | 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# |
290 | |
301 | |
291 | # wait for lock, if any |
302 | # wait for lock, if any |
292 | while ($LOCK{$key}) { |
303 | while ($LOCK{$key}) { |
293 | push @{ $LOCK{$key} }, $Coro::current; |
304 | push @{ $LOCK{$key} }, $Coro::current; |
294 | Coro::schedule; |
305 | Coro::schedule; |
… | |
… | |
300 | |
311 | |
301 | # wait, to be sure we are not locked |
312 | # wait, to be sure we are not locked |
302 | lock_wait $key; |
313 | lock_wait $key; |
303 | |
314 | |
304 | $LOCK{$key} = []; |
315 | $LOCK{$key} = []; |
|
|
316 | $LOCKER{$key} = $Coro::current;#d# |
305 | |
317 | |
306 | Coro::guard { |
318 | Coro::guard { |
|
|
319 | delete $LOCKER{$key};#d# |
307 | # wake up all waiters, to be on the safe side |
320 | # wake up all waiters, to be on the safe side |
308 | $_->ready for @{ delete $LOCK{$key} }; |
321 | $_->ready for @{ delete $LOCK{$key} }; |
309 | } |
322 | } |
310 | } |
323 | } |
311 | |
324 | |
… | |
… | |
341 | our @SLOT_QUEUE; |
354 | our @SLOT_QUEUE; |
342 | our $SLOT_QUEUE; |
355 | our $SLOT_QUEUE; |
343 | |
356 | |
344 | $SLOT_QUEUE->cancel if $SLOT_QUEUE; |
357 | $SLOT_QUEUE->cancel if $SLOT_QUEUE; |
345 | $SLOT_QUEUE = Coro::async { |
358 | $SLOT_QUEUE = Coro::async { |
|
|
359 | $Coro::current->desc ("timeslot manager"); |
|
|
360 | |
346 | my $signal = new Coro::Signal; |
361 | my $signal = new Coro::Signal; |
347 | |
362 | |
348 | while () { |
363 | while () { |
349 | next_job: |
364 | next_job: |
350 | my $avail = cf::till_tick; |
365 | my $avail = cf::till_tick; |
… | |
… | |
358 | } |
373 | } |
359 | } |
374 | } |
360 | } |
375 | } |
361 | |
376 | |
362 | if (@SLOT_QUEUE) { |
377 | if (@SLOT_QUEUE) { |
363 | # we do not use wait_For_tick() as it returns immediately when tick is inactive |
378 | # we do not use wait_for_tick() as it returns immediately when tick is inactive |
364 | push @cf::WAIT_FOR_TICK, $signal; |
379 | push @cf::WAIT_FOR_TICK, $signal; |
365 | $signal->wait; |
380 | $signal->wait; |
366 | } else { |
381 | } else { |
367 | Coro::schedule; |
382 | Coro::schedule; |
368 | } |
383 | } |
… | |
… | |
412 | my $time = Event::time; |
427 | my $time = Event::time; |
413 | |
428 | |
414 | # this is the main coro, too bad, we have to block |
429 | # this is the main coro, too bad, we have to block |
415 | # till the operation succeeds, freezing the server :/ |
430 | # till the operation succeeds, freezing the server :/ |
416 | |
431 | |
|
|
432 | LOG llevError, Carp::longmess "sync job";#d# |
|
|
433 | |
417 | # TODO: use suspend/resume instead |
434 | # TODO: use suspend/resume instead |
418 | # (but this is cancel-safe) |
435 | # (but this is cancel-safe) |
419 | my $freeze_guard = freeze_mainloop; |
436 | my $freeze_guard = freeze_mainloop; |
420 | |
437 | |
421 | my $busy = 1; |
438 | my $busy = 1; |
422 | my @res; |
439 | my @res; |
423 | |
440 | |
424 | (async { |
441 | (async { |
|
|
442 | $Coro::current->desc ("sync job coro"); |
425 | @res = eval { $job->() }; |
443 | @res = eval { $job->() }; |
426 | warn $@ if $@; |
444 | warn $@ if $@; |
427 | undef $busy; |
445 | undef $busy; |
428 | })->prio (Coro::PRIO_MAX); |
446 | })->prio (Coro::PRIO_MAX); |
429 | |
447 | |
… | |
… | |
478 | sub fork_call(&@) { |
496 | sub fork_call(&@) { |
479 | my ($cb, @args) = @_; |
497 | my ($cb, @args) = @_; |
480 | |
498 | |
481 | # we seemingly have to make a local copy of the whole thing, |
499 | # we seemingly have to make a local copy of the whole thing, |
482 | # otherwise perl prematurely frees the stuff :/ |
500 | # otherwise perl prematurely frees the stuff :/ |
483 | # TODO: investigate and fix (liekly this will be rather laborious) |
501 | # TODO: investigate and fix (likely this will be rather laborious) |
484 | |
502 | |
485 | my @res = Coro::Util::fork_eval { |
503 | my @res = Coro::Util::fork_eval { |
486 | reset_signals; |
504 | reset_signals; |
487 | &$cb |
505 | &$cb |
488 | }, @args; |
506 | }, @args; |
… | |
… | |
497 | =item cf::db_put $family => $key => $value |
515 | =item cf::db_put $family => $key => $value |
498 | |
516 | |
499 | Stores the given C<$value> in the family. It can currently store binary |
517 | Stores the given C<$value> in the family. It can currently store binary |
500 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
518 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
501 | |
519 | |
|
|
520 | =item $db = cf::db_table "name" |
|
|
521 | |
|
|
522 | Create and/or open a new database table. The string must not be "db" and must be unique |
|
|
523 | within each server. |
|
|
524 | |
502 | =cut |
525 | =cut |
|
|
526 | |
|
|
527 | sub 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 | } |
503 | |
543 | |
504 | our $DB; |
544 | our $DB; |
505 | |
545 | |
506 | sub db_init { |
546 | sub db_init { |
507 | unless ($DB) { |
|
|
508 | $DB = BDB::db_create $DB_ENV; |
|
|
509 | |
|
|
510 | cf::sync_job { |
547 | cf::sync_job { |
511 | eval { |
548 | $DB ||= db_table "db"; |
512 | $DB->set_flags (BDB::CHKSUM); |
|
|
513 | |
|
|
514 | BDB::db_open $DB, undef, "db", undef, BDB::BTREE, |
|
|
515 | BDB::CREATE | BDB::AUTO_COMMIT, 0666; |
|
|
516 | cf::cleanup "db_open(db): $!" if $!; |
|
|
517 | }; |
|
|
518 | cf::cleanup "db_open(db): $@" if $@; |
|
|
519 | }; |
|
|
520 | } |
549 | }; |
521 | } |
550 | } |
522 | |
551 | |
523 | sub db_get($$) { |
552 | sub db_get($$) { |
524 | my $key = "$_[0]/$_[1]"; |
553 | my $key = "$_[0]/$_[1]"; |
525 | |
554 | |
… | |
… | |
575 | if (1) { |
604 | if (1) { |
576 | $md5 = |
605 | $md5 = |
577 | join "\x00", |
606 | join "\x00", |
578 | $processversion, |
607 | $processversion, |
579 | map { |
608 | map { |
580 | Coro::cede; |
609 | cf::cede_to_tick; |
581 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
610 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
582 | } 0.. $#$src; |
611 | } 0.. $#$src; |
583 | |
612 | |
584 | |
613 | |
585 | my $dbmd5 = db_get cache => "$id/md5"; |
614 | my $dbmd5 = db_get cache => "$id/md5"; |
… | |
… | |
937 | |
966 | |
938 | =cut |
967 | =cut |
939 | |
968 | |
940 | ############################################################################# |
969 | ############################################################################# |
941 | # object support |
970 | # object support |
942 | # |
|
|
943 | |
971 | |
|
|
972 | sub _object_equal($$); |
|
|
973 | sub _object_equal($$) { |
|
|
974 | my ($a, $b) = @_; |
|
|
975 | |
|
|
976 | return 0 unless (ref $a) eq (ref $b); |
|
|
977 | |
|
|
978 | if ("HASH" eq ref $a) { |
|
|
979 | my @ka = keys %$a; |
|
|
980 | my @kb = keys %$b; |
|
|
981 | |
|
|
982 | return 0 if @ka != @kb; |
|
|
983 | |
|
|
984 | for (0 .. $#ka) { |
|
|
985 | return 0 unless $ka[$_] eq $kb[$_]; |
|
|
986 | return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]}; |
|
|
987 | } |
|
|
988 | |
|
|
989 | } elsif ("ARRAY" eq ref $a) { |
|
|
990 | |
|
|
991 | return 0 if @$a != @$b; |
|
|
992 | |
|
|
993 | for (0 .. $#$a) { |
|
|
994 | return 0 unless _object_equal $a->[$_], $b->[$_]; |
|
|
995 | } |
|
|
996 | |
|
|
997 | } elsif ($a ne $b) { |
|
|
998 | return 0; |
|
|
999 | } |
|
|
1000 | |
|
|
1001 | 1 |
|
|
1002 | } |
|
|
1003 | |
|
|
1004 | our $SLOW_MERGES;#d# |
944 | sub _can_merge { |
1005 | sub _can_merge { |
945 | my ($ob1, $ob2) = @_; |
1006 | my ($ob1, $ob2) = @_; |
946 | |
1007 | |
947 | local $Storable::canonical = 1; |
1008 | ++$SLOW_MERGES;#d# |
948 | my $fob1 = Storable::freeze $ob1; |
|
|
949 | my $fob2 = Storable::freeze $ob2; |
|
|
950 | |
1009 | |
951 | $fob1 eq $fob2 |
1010 | # we do the slow way here |
|
|
1011 | return _object_equal $ob1, $ob2 |
952 | } |
1012 | } |
953 | |
1013 | |
954 | sub reattach { |
1014 | sub reattach { |
955 | # basically do the same as instantiate, without calling instantiate |
1015 | # basically do the same as instantiate, without calling instantiate |
956 | my ($obj) = @_; |
1016 | my ($obj) = @_; |
… | |
… | |
1004 | sub object_freezer_save { |
1064 | sub object_freezer_save { |
1005 | my ($filename, $rdata, $objs) = @_; |
1065 | my ($filename, $rdata, $objs) = @_; |
1006 | |
1066 | |
1007 | sync_job { |
1067 | sync_job { |
1008 | if (length $$rdata) { |
1068 | if (length $$rdata) { |
|
|
1069 | utf8::decode (my $decname = $filename); |
1009 | warn sprintf "saving %s (%d,%d)\n", |
1070 | warn sprintf "saving %s (%d,%d)\n", |
1010 | $filename, length $$rdata, scalar @$objs; |
1071 | $decname, length $$rdata, scalar @$objs; |
1011 | |
1072 | |
1012 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1073 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1013 | chmod SAVE_MODE, $fh; |
1074 | chmod SAVE_MODE, $fh; |
1014 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1075 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1015 | aio_fsync $fh if $cf::USE_FSYNC; |
1076 | aio_fsync $fh if $cf::USE_FSYNC; |
1016 | close $fh; |
1077 | close $fh; |
1017 | |
1078 | |
1018 | if (@$objs) { |
1079 | if (@$objs) { |
1019 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1080 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1020 | chmod SAVE_MODE, $fh; |
1081 | chmod SAVE_MODE, $fh; |
1021 | my $data = Storable::nfreeze { version => 1, objs => $objs }; |
1082 | my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; |
1022 | aio_write $fh, 0, (length $data), $data, 0; |
1083 | aio_write $fh, 0, (length $data), $data, 0; |
1023 | aio_fsync $fh if $cf::USE_FSYNC; |
1084 | aio_fsync $fh if $cf::USE_FSYNC; |
1024 | close $fh; |
1085 | close $fh; |
1025 | aio_rename "$filename.pst~", "$filename.pst"; |
1086 | aio_rename "$filename.pst~", "$filename.pst"; |
1026 | } |
1087 | } |
… | |
… | |
1034 | } |
1095 | } |
1035 | } else { |
1096 | } else { |
1036 | aio_unlink $filename; |
1097 | aio_unlink $filename; |
1037 | aio_unlink "$filename.pst"; |
1098 | aio_unlink "$filename.pst"; |
1038 | } |
1099 | } |
1039 | } |
1100 | }; |
1040 | } |
1101 | } |
1041 | |
1102 | |
1042 | sub object_freezer_as_string { |
1103 | sub object_freezer_as_string { |
1043 | my ($rdata, $objs) = @_; |
1104 | my ($rdata, $objs) = @_; |
1044 | |
1105 | |
… | |
… | |
1056 | or return; |
1117 | or return; |
1057 | |
1118 | |
1058 | unless (aio_stat "$filename.pst") { |
1119 | unless (aio_stat "$filename.pst") { |
1059 | (aio_load "$filename.pst", $av) >= 0 |
1120 | (aio_load "$filename.pst", $av) >= 0 |
1060 | or return; |
1121 | or return; |
1061 | $av = eval { (Storable::thaw $av)->{objs} }; |
|
|
1062 | } |
|
|
1063 | |
1122 | |
|
|
1123 | my $st = eval { Coro::Storable::thaw $av } |
|
|
1124 | || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove |
|
|
1125 | $av = $st->{objs}; |
|
|
1126 | } |
|
|
1127 | |
|
|
1128 | utf8::decode (my $decname = $filename); |
1064 | warn sprintf "loading %s (%d)\n", |
1129 | warn sprintf "loading %s (%d,%d)\n", |
1065 | $filename, length $data, scalar @{$av || []}; |
1130 | $decname, length $data, scalar @{$av || []}; |
|
|
1131 | |
1066 | return ($data, $av); |
1132 | ($data, $av) |
1067 | } |
1133 | } |
1068 | |
1134 | |
1069 | =head2 COMMAND CALLBACKS |
1135 | =head2 COMMAND CALLBACKS |
1070 | |
1136 | |
1071 | =over 4 |
1137 | =over 4 |
… | |
… | |
1149 | my ($type, $reply, @payload) = |
1215 | my ($type, $reply, @payload) = |
1150 | "ARRAY" eq ref $msg |
1216 | "ARRAY" eq ref $msg |
1151 | ? @$msg |
1217 | ? @$msg |
1152 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1218 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
1153 | |
1219 | |
|
|
1220 | my @reply; |
|
|
1221 | |
1154 | if (my $cb = $EXTCMD{$type}) { |
1222 | if (my $cb = $EXTCMD{$type}) { |
1155 | my @reply = $cb->($pl, @payload); |
1223 | @reply = $cb->($pl, @payload); |
1156 | |
|
|
1157 | $pl->ext_reply ($reply, @reply) |
|
|
1158 | if $reply; |
|
|
1159 | } |
1224 | } |
|
|
1225 | |
|
|
1226 | $pl->ext_reply ($reply, @reply) |
|
|
1227 | if $reply; |
|
|
1228 | |
1160 | } else { |
1229 | } else { |
1161 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1230 | warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; |
1162 | } |
1231 | } |
1163 | |
1232 | |
1164 | cf::override; |
1233 | cf::override; |
… | |
… | |
1254 | |
1323 | |
1255 | =head3 cf::player |
1324 | =head3 cf::player |
1256 | |
1325 | |
1257 | =over 4 |
1326 | =over 4 |
1258 | |
1327 | |
|
|
1328 | =item cf::player::num_playing |
|
|
1329 | |
|
|
1330 | Returns the official number of playing players, as per the Crossfire metaserver rules. |
|
|
1331 | |
|
|
1332 | =cut |
|
|
1333 | |
|
|
1334 | sub num_playing { |
|
|
1335 | scalar grep |
|
|
1336 | $_->ob->map |
|
|
1337 | && !$_->hidden |
|
|
1338 | && !$_->ob->flag (cf::FLAG_WIZ), |
|
|
1339 | cf::player::list |
|
|
1340 | } |
|
|
1341 | |
1259 | =item cf::player::find $login |
1342 | =item cf::player::find $login |
1260 | |
1343 | |
1261 | Returns the given player object, loading it if necessary (might block). |
1344 | Returns the given player object, loading it if necessary (might block). |
1262 | |
1345 | |
1263 | =cut |
1346 | =cut |
… | |
… | |
1298 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1381 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1299 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1382 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1300 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1383 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1301 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1384 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1302 | |
1385 | |
1303 | my $pl = load_pl path $login |
1386 | my $f = new_from_file cf::object::thawer path $login |
1304 | or return; |
1387 | or return; |
|
|
1388 | |
|
|
1389 | my $pl = cf::player::load_pl $f |
|
|
1390 | or return; |
|
|
1391 | local $cf::PLAYER_LOADING{$login} = $pl; |
|
|
1392 | $f->resolve_delayed_derefs; |
1305 | $cf::PLAYER{$login} = $pl |
1393 | $cf::PLAYER{$login} = $pl |
1306 | } |
1394 | } |
1307 | } |
1395 | } |
1308 | } |
1396 | } |
1309 | |
1397 | |
… | |
… | |
1319 | |
1407 | |
1320 | aio_mkdir playerdir $pl, 0770; |
1408 | aio_mkdir playerdir $pl, 0770; |
1321 | $pl->{last_save} = $cf::RUNTIME; |
1409 | $pl->{last_save} = $cf::RUNTIME; |
1322 | |
1410 | |
1323 | $pl->save_pl ($path); |
1411 | $pl->save_pl ($path); |
1324 | Coro::cede; |
1412 | cf::cede_to_tick; |
1325 | } |
1413 | } |
1326 | |
1414 | |
1327 | sub new($) { |
1415 | sub new($) { |
1328 | my ($login) = @_; |
1416 | my ($login) = @_; |
1329 | |
1417 | |
… | |
… | |
1407 | or return []; |
1495 | or return []; |
1408 | |
1496 | |
1409 | my @logins; |
1497 | my @logins; |
1410 | |
1498 | |
1411 | for my $login (@$dirs) { |
1499 | for my $login (@$dirs) { |
|
|
1500 | my $path = path $login; |
|
|
1501 | |
|
|
1502 | # a .pst is a dead give-away for a valid player |
|
|
1503 | unless (-e "$path.pst") { |
1412 | my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; |
1504 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1413 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1505 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1414 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1506 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
|
|
1507 | } |
1415 | |
1508 | |
1416 | utf8::decode $login; |
1509 | utf8::decode $login; |
1417 | push @logins, $login; |
1510 | push @logins, $login; |
1418 | } |
1511 | } |
1419 | |
1512 | |
… | |
… | |
1457 | sub expand_cfpod { |
1550 | sub expand_cfpod { |
1458 | ((my $self), (local $_)) = @_; |
1551 | ((my $self), (local $_)) = @_; |
1459 | |
1552 | |
1460 | # escape & and < |
1553 | # escape & and < |
1461 | s/&/&/g; |
1554 | s/&/&/g; |
1462 | s/(?<![BIUGH])</</g; |
1555 | s/(?<![BIUGHT])</</g; |
1463 | |
1556 | |
1464 | # this is buggy, it needs to properly take care of nested <'s |
1557 | # this is buggy, it needs to properly take care of nested <'s |
1465 | |
1558 | |
1466 | 1 while |
1559 | 1 while |
1467 | # replace B<>, I<>, U<> etc. |
1560 | # replace B<>, I<>, U<> etc. |
1468 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1561 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1469 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1562 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1470 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1563 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
|
|
1564 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1471 | # replace G<male|female> tags |
1565 | # replace G<male|female> tags |
1472 | || s{G<([^>|]*)\|([^>]*)>}{ |
1566 | || s{G<([^>|]*)\|([^>]*)>}{ |
1473 | $self->gender ? $2 : $1 |
1567 | $self->gender ? $2 : $1 |
1474 | }ge |
1568 | }ge |
1475 | # replace H<hint text> |
1569 | # replace H<hint text> |
… | |
… | |
1505 | =cut |
1599 | =cut |
1506 | |
1600 | |
1507 | sub ext_reply($$@) { |
1601 | sub ext_reply($$@) { |
1508 | my ($self, $id, @msg) = @_; |
1602 | my ($self, $id, @msg) = @_; |
1509 | |
1603 | |
1510 | if ($self->ns->extcmd == 2) { |
1604 | $self->ns->ext_reply ($id, @msg) |
1511 | $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg])); |
|
|
1512 | } elsif ($self->ns->extcmd == 1) { |
|
|
1513 | #TODO: version 1, remove |
|
|
1514 | unshift @msg, msgtype => "reply", msgid => $id; |
|
|
1515 | $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg})); |
|
|
1516 | } |
|
|
1517 | } |
1605 | } |
1518 | |
1606 | |
1519 | =item $player->ext_msg ($type, @msg) |
1607 | =item $player->ext_msg ($type, @msg) |
1520 | |
1608 | |
1521 | Sends an ext event to the client. |
1609 | Sends an ext event to the client. |
… | |
… | |
1749 | |
1837 | |
1750 | sub load_header_from($) { |
1838 | sub load_header_from($) { |
1751 | my ($self, $path) = @_; |
1839 | my ($self, $path) = @_; |
1752 | |
1840 | |
1753 | utf8::encode $path; |
1841 | utf8::encode $path; |
1754 | #aio_open $path, O_RDONLY, 0 |
1842 | my $f = new_from_file cf::object::thawer $path |
1755 | # or return; |
|
|
1756 | |
|
|
1757 | $self->_load_header ($path) |
|
|
1758 | or return; |
1843 | or return; |
|
|
1844 | |
|
|
1845 | $self->_load_header ($f) |
|
|
1846 | or return; |
|
|
1847 | |
|
|
1848 | local $MAP_LOADING{$self->{path}} = $self; |
|
|
1849 | $f->resolve_delayed_derefs; |
1759 | |
1850 | |
1760 | $self->{load_path} = $path; |
1851 | $self->{load_path} = $path; |
1761 | |
1852 | |
1762 | 1 |
1853 | 1 |
1763 | } |
1854 | } |
… | |
… | |
1817 | sub find { |
1908 | sub find { |
1818 | my ($path, $origin) = @_; |
1909 | my ($path, $origin) = @_; |
1819 | |
1910 | |
1820 | $path = normalise $path, $origin && $origin->path; |
1911 | $path = normalise $path, $origin && $origin->path; |
1821 | |
1912 | |
|
|
1913 | cf::lock_wait "map_data:$path";#d#remove |
1822 | cf::lock_wait "map_find:$path"; |
1914 | cf::lock_wait "map_find:$path"; |
1823 | |
1915 | |
1824 | $cf::MAP{$path} || do { |
1916 | $cf::MAP{$path} || do { |
1825 | my $guard = cf::lock_acquire "map_find:$path"; |
1917 | my $guard1 = cf::lock_acquire "map_find:$path"; |
|
|
1918 | my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
1919 | |
1826 | my $map = new_from_path cf::map $path |
1920 | my $map = new_from_path cf::map $path |
1827 | or return; |
1921 | or return; |
1828 | |
1922 | |
1829 | $map->{last_save} = $cf::RUNTIME; |
1923 | $map->{last_save} = $cf::RUNTIME; |
1830 | |
1924 | |
… | |
… | |
1832 | or return; |
1926 | or return; |
1833 | |
1927 | |
1834 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1928 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1835 | # doing this can freeze the server in a sync job, obviously |
1929 | # doing this can freeze the server in a sync job, obviously |
1836 | #$cf::WAIT_FOR_TICK->wait; |
1930 | #$cf::WAIT_FOR_TICK->wait; |
|
|
1931 | undef $guard1; |
|
|
1932 | undef $guard2; |
1837 | $map->reset; |
1933 | $map->reset; |
1838 | undef $guard; |
|
|
1839 | return find $path; |
1934 | return find $path; |
1840 | } |
1935 | } |
1841 | |
1936 | |
1842 | $cf::MAP{$path} = $map |
1937 | $cf::MAP{$path} = $map |
1843 | } |
1938 | } |
… | |
… | |
1852 | local $self->{deny_reset} = 1; # loading can take a long time |
1947 | local $self->{deny_reset} = 1; # loading can take a long time |
1853 | |
1948 | |
1854 | my $path = $self->{path}; |
1949 | my $path = $self->{path}; |
1855 | |
1950 | |
1856 | { |
1951 | { |
1857 | my $guard = cf::lock_acquire "map_load:$path"; |
1952 | my $guard = cf::lock_acquire "map_data:$path"; |
1858 | |
1953 | |
|
|
1954 | return unless $self->valid; |
1859 | return if $self->in_memory != cf::MAP_SWAPPED; |
1955 | return unless $self->in_memory == cf::MAP_SWAPPED; |
1860 | |
1956 | |
1861 | $self->in_memory (cf::MAP_LOADING); |
1957 | $self->in_memory (cf::MAP_LOADING); |
1862 | |
1958 | |
1863 | $self->alloc; |
1959 | $self->alloc; |
1864 | |
1960 | |
1865 | $self->pre_load; |
1961 | $self->pre_load; |
1866 | Coro::cede; |
1962 | cf::cede_to_tick; |
1867 | |
1963 | |
|
|
1964 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
|
|
1965 | $f->skip_block; |
1868 | $self->_load_objects ($self->{load_path}, 1) |
1966 | $self->_load_objects ($f) |
1869 | or return; |
1967 | or return; |
1870 | |
1968 | |
1871 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1969 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1872 | if delete $self->{load_original}; |
1970 | if delete $self->{load_original}; |
1873 | |
1971 | |
1874 | if (my $uniq = $self->uniq_path) { |
1972 | if (my $uniq = $self->uniq_path) { |
1875 | utf8::encode $uniq; |
1973 | utf8::encode $uniq; |
1876 | if (aio_open $uniq, O_RDONLY, 0) { |
1974 | unless (aio_stat $uniq) { |
|
|
1975 | if (my $f = new_from_file cf::object::thawer $uniq) { |
1877 | $self->clear_unique_items; |
1976 | $self->clear_unique_items; |
1878 | $self->_load_objects ($uniq, 0); |
1977 | $self->_load_objects ($f); |
|
|
1978 | $f->resolve_delayed_derefs; |
|
|
1979 | } |
1879 | } |
1980 | } |
1880 | } |
1981 | } |
1881 | |
1982 | |
1882 | Coro::cede; |
1983 | $f->resolve_delayed_derefs; |
|
|
1984 | |
|
|
1985 | cf::cede_to_tick; |
1883 | # now do the right thing for maps |
1986 | # now do the right thing for maps |
1884 | $self->link_multipart_objects; |
1987 | $self->link_multipart_objects; |
1885 | $self->difficulty ($self->estimate_difficulty) |
1988 | $self->difficulty ($self->estimate_difficulty) |
1886 | unless $self->difficulty; |
1989 | unless $self->difficulty; |
1887 | Coro::cede; |
1990 | cf::cede_to_tick; |
1888 | |
1991 | |
1889 | unless ($self->{deny_activate}) { |
1992 | unless ($self->{deny_activate}) { |
1890 | $self->decay_objects; |
1993 | $self->decay_objects; |
1891 | $self->fix_auto_apply; |
1994 | $self->fix_auto_apply; |
1892 | $self->update_buttons; |
1995 | $self->update_buttons; |
1893 | Coro::cede; |
1996 | cf::cede_to_tick; |
1894 | $self->set_darkness_map; |
1997 | $self->set_darkness_map; |
1895 | Coro::cede; |
1998 | cf::cede_to_tick; |
1896 | $self->activate; |
1999 | $self->activate; |
1897 | } |
2000 | } |
1898 | |
2001 | |
1899 | $self->{last_save} = $cf::RUNTIME; |
2002 | $self->{last_save} = $cf::RUNTIME; |
1900 | $self->last_access ($cf::RUNTIME); |
2003 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1916 | |
2019 | |
1917 | $self |
2020 | $self |
1918 | } |
2021 | } |
1919 | |
2022 | |
1920 | # find and load all maps in the 3x3 area around a map |
2023 | # find and load all maps in the 3x3 area around a map |
1921 | sub load_diag { |
2024 | sub load_neighbours { |
1922 | my ($map) = @_; |
2025 | my ($map) = @_; |
1923 | |
2026 | |
1924 | my @diag; # diagonal neighbours |
2027 | my @neigh; # diagonal neighbours |
1925 | |
2028 | |
1926 | for (0 .. 3) { |
2029 | for (0 .. 3) { |
1927 | my $neigh = $map->tile_path ($_) |
2030 | my $neigh = $map->tile_path ($_) |
1928 | or next; |
2031 | or next; |
1929 | $neigh = find $neigh, $map |
2032 | $neigh = find $neigh, $map |
1930 | or next; |
2033 | or next; |
1931 | $neigh->load; |
2034 | $neigh->load; |
1932 | |
2035 | |
|
|
2036 | push @neigh, |
1933 | push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], |
2037 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
1934 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
2038 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
1935 | } |
2039 | } |
1936 | |
2040 | |
1937 | for (@diag) { |
2041 | for (grep defined $_->[0], @neigh) { |
|
|
2042 | my ($path, $origin) = @$_; |
1938 | my $neigh = find @$_ |
2043 | my $neigh = find $path, $origin |
1939 | or next; |
2044 | or next; |
1940 | $neigh->load; |
2045 | $neigh->load; |
1941 | } |
2046 | } |
1942 | } |
2047 | } |
1943 | |
2048 | |
… | |
… | |
1948 | } |
2053 | } |
1949 | |
2054 | |
1950 | sub do_load_sync { |
2055 | sub do_load_sync { |
1951 | my ($map) = @_; |
2056 | my ($map) = @_; |
1952 | |
2057 | |
|
|
2058 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
2059 | if $Coro::current == $Coro::main; |
|
|
2060 | |
1953 | cf::sync_job { $map->load }; |
2061 | cf::sync_job { $map->load }; |
1954 | } |
2062 | } |
1955 | |
2063 | |
1956 | our %MAP_PREFETCH; |
2064 | our %MAP_PREFETCH; |
1957 | our $MAP_PREFETCHER = undef; |
2065 | our $MAP_PREFETCHER = undef; |
1958 | |
2066 | |
1959 | sub find_async { |
2067 | sub find_async { |
1960 | my ($path, $origin) = @_; |
2068 | my ($path, $origin, $load) = @_; |
1961 | |
2069 | |
1962 | $path = normalise $path, $origin && $origin->{path}; |
2070 | $path = normalise $path, $origin && $origin->{path}; |
1963 | |
2071 | |
1964 | if (my $map = $cf::MAP{$path}) { |
2072 | if (my $map = $cf::MAP{$path}) { |
1965 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
2073 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1966 | } |
2074 | } |
1967 | |
2075 | |
1968 | undef $MAP_PREFETCH{$path}; |
2076 | $MAP_PREFETCH{$path} |= $load; |
|
|
2077 | |
1969 | $MAP_PREFETCHER ||= cf::async { |
2078 | $MAP_PREFETCHER ||= cf::async { |
|
|
2079 | $Coro::current->{desc} = "map prefetcher"; |
|
|
2080 | |
1970 | while (%MAP_PREFETCH) { |
2081 | while (%MAP_PREFETCH) { |
1971 | for my $path (keys %MAP_PREFETCH) { |
2082 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1972 | if (my $map = find $path) { |
2083 | if (my $map = find $k) { |
1973 | $map->load; |
2084 | $map->load if $v; |
1974 | } |
2085 | } |
1975 | |
2086 | |
1976 | delete $MAP_PREFETCH{$path}; |
2087 | delete $MAP_PREFETCH{$k}; |
1977 | } |
2088 | } |
1978 | } |
2089 | } |
1979 | undef $MAP_PREFETCHER; |
2090 | undef $MAP_PREFETCHER; |
1980 | }; |
2091 | }; |
1981 | $MAP_PREFETCHER->prio (6); |
2092 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
1984 | } |
2095 | } |
1985 | |
2096 | |
1986 | sub save { |
2097 | sub save { |
1987 | my ($self) = @_; |
2098 | my ($self) = @_; |
1988 | |
2099 | |
1989 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2100 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1990 | |
2101 | |
1991 | $self->{last_save} = $cf::RUNTIME; |
2102 | $self->{last_save} = $cf::RUNTIME; |
1992 | |
2103 | |
1993 | return unless $self->dirty; |
2104 | return unless $self->dirty; |
1994 | |
2105 | |
… | |
… | |
2000 | return if $self->{deny_save}; |
2111 | return if $self->{deny_save}; |
2001 | |
2112 | |
2002 | local $self->{last_access} = $self->last_access;#d# |
2113 | local $self->{last_access} = $self->last_access;#d# |
2003 | |
2114 | |
2004 | cf::async { |
2115 | cf::async { |
|
|
2116 | $Coro::current->{desc} = "map player save"; |
2005 | $_->contr->save for $self->players; |
2117 | $_->contr->save for $self->players; |
2006 | }; |
2118 | }; |
2007 | |
2119 | |
2008 | if ($uniq) { |
2120 | if ($uniq) { |
2009 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
2121 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
… | |
… | |
2017 | my ($self) = @_; |
2129 | my ($self) = @_; |
2018 | |
2130 | |
2019 | # save first because save cedes |
2131 | # save first because save cedes |
2020 | $self->save; |
2132 | $self->save; |
2021 | |
2133 | |
2022 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2134 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2023 | |
2135 | |
2024 | return if $self->players; |
2136 | return if $self->players; |
2025 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2137 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2026 | return if $self->{deny_save}; |
2138 | return if $self->{deny_save}; |
2027 | |
2139 | |
|
|
2140 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2141 | |
|
|
2142 | $self->deactivate; |
|
|
2143 | $_->clear_links_to ($self) for values %cf::MAP; |
2028 | $self->clear; |
2144 | $self->clear; |
2029 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2030 | } |
2145 | } |
2031 | |
2146 | |
2032 | sub reset_at { |
2147 | sub reset_at { |
2033 | my ($self) = @_; |
2148 | my ($self) = @_; |
2034 | |
2149 | |
… | |
… | |
2066 | if $uniq; |
2181 | if $uniq; |
2067 | } |
2182 | } |
2068 | |
2183 | |
2069 | delete $cf::MAP{$self->path}; |
2184 | delete $cf::MAP{$self->path}; |
2070 | |
2185 | |
|
|
2186 | $self->deactivate; |
|
|
2187 | $_->clear_links_to ($self) for values %cf::MAP; |
2071 | $self->clear; |
2188 | $self->clear; |
2072 | |
|
|
2073 | $_->clear_links_to ($self) for values %cf::MAP; |
|
|
2074 | |
2189 | |
2075 | $self->unlink_save; |
2190 | $self->unlink_save; |
2076 | $self->destroy; |
2191 | $self->destroy; |
2077 | } |
2192 | } |
2078 | |
2193 | |
2079 | my $nuke_counter = "aaaa"; |
2194 | my $nuke_counter = "aaaa"; |
2080 | |
2195 | |
2081 | sub nuke { |
2196 | sub nuke { |
2082 | my ($self) = @_; |
2197 | my ($self) = @_; |
2083 | |
2198 | |
|
|
2199 | { |
|
|
2200 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2201 | |
2084 | delete $cf::MAP{$self->path}; |
2202 | delete $cf::MAP{$self->path}; |
2085 | |
2203 | |
2086 | $self->unlink_save; |
2204 | $self->unlink_save; |
2087 | |
2205 | |
2088 | bless $self, "cf::map"; |
2206 | bless $self, "cf::map"; |
2089 | delete $self->{deny_reset}; |
2207 | delete $self->{deny_reset}; |
2090 | $self->{deny_save} = 1; |
2208 | $self->{deny_save} = 1; |
2091 | $self->reset_timeout (1); |
2209 | $self->reset_timeout (1); |
2092 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2210 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2093 | |
2211 | |
2094 | $cf::MAP{$self->path} = $self; |
2212 | $cf::MAP{$self->path} = $self; |
|
|
2213 | } |
2095 | |
2214 | |
2096 | $self->reset; # polite request, might not happen |
2215 | $self->reset; # polite request, might not happen |
2097 | } |
2216 | } |
2098 | |
2217 | |
2099 | =item $maps = cf::map::tmp_maps |
2218 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2175 | |
2294 | |
2176 | sub inv_recursive { |
2295 | sub inv_recursive { |
2177 | inv_recursive_ inv $_[0] |
2296 | inv_recursive_ inv $_[0] |
2178 | } |
2297 | } |
2179 | |
2298 | |
|
|
2299 | =item $ref = $ob->ref |
|
|
2300 | |
|
|
2301 | creates and returns a persistent reference to an objetc that can be stored as a string. |
|
|
2302 | |
|
|
2303 | =item $ob = cf::object::deref ($refstring) |
|
|
2304 | |
|
|
2305 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
|
|
2306 | even if the object actually exists. May block. |
|
|
2307 | |
|
|
2308 | =cut |
|
|
2309 | |
|
|
2310 | sub deref { |
|
|
2311 | my ($ref) = @_; |
|
|
2312 | |
|
|
2313 | if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) { |
|
|
2314 | my ($uuid, $name) = ($1, $2); |
|
|
2315 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
|
|
2316 | or return; |
|
|
2317 | $pl->ob->uuid eq $uuid |
|
|
2318 | or return; |
|
|
2319 | |
|
|
2320 | $pl->ob |
|
|
2321 | } else { |
|
|
2322 | warn "$ref: cannot resolve object reference\n"; |
|
|
2323 | undef |
|
|
2324 | } |
|
|
2325 | } |
|
|
2326 | |
2180 | package cf; |
2327 | package cf; |
2181 | |
2328 | |
2182 | =back |
2329 | =back |
2183 | |
2330 | |
2184 | =head3 cf::object::player |
2331 | =head3 cf::object::player |
… | |
… | |
2312 | # use -1 or undef as default coordinates, not 0, 0 |
2459 | # use -1 or undef as default coordinates, not 0, 0 |
2313 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2460 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2314 | if $x <=0 && $y <= 0; |
2461 | if $x <=0 && $y <= 0; |
2315 | |
2462 | |
2316 | $map->load; |
2463 | $map->load; |
2317 | $map->load_diag; |
2464 | $map->load_neighbours; |
2318 | |
2465 | |
2319 | return unless $self->contr->active; |
2466 | return unless $self->contr->active; |
2320 | $self->activate_recursive; |
2467 | $self->activate_recursive; |
2321 | |
2468 | |
2322 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2469 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
… | |
… | |
2342 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2489 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2343 | |
2490 | |
2344 | $self->enter_link; |
2491 | $self->enter_link; |
2345 | |
2492 | |
2346 | (async { |
2493 | (async { |
|
|
2494 | $Coro::current->{desc} = "player::goto $path $x $y"; |
|
|
2495 | |
|
|
2496 | # *tag paths override both path and x|y |
|
|
2497 | if ($path =~ /^\*(.*)$/) { |
|
|
2498 | if (my @obs = grep $_->map, ext::map_tags::find $1) { |
|
|
2499 | my $ob = $obs[rand @obs]; |
|
|
2500 | |
|
|
2501 | # see if we actually can go there |
|
|
2502 | if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { |
|
|
2503 | $ob = $obs[rand @obs]; |
|
|
2504 | } else { |
|
|
2505 | $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
2506 | } |
|
|
2507 | # else put us there anyways for now #d# |
|
|
2508 | |
|
|
2509 | ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); |
|
|
2510 | } else { |
|
|
2511 | ($path, $x, $y) = (undef, undef, undef); |
|
|
2512 | } |
|
|
2513 | } |
|
|
2514 | |
2347 | my $map = eval { |
2515 | my $map = eval { |
2348 | my $map = cf::map::find $path; |
2516 | my $map = defined $path ? cf::map::find $path : undef; |
2349 | |
2517 | |
2350 | if ($map) { |
2518 | if ($map) { |
2351 | $map = $map->customise_for ($self); |
2519 | $map = $map->customise_for ($self); |
2352 | $map = $check->($map) if $check && $map; |
2520 | $map = $check->($map) if $check && $map; |
2353 | } else { |
2521 | } else { |
2354 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
2522 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2355 | } |
2523 | } |
2356 | |
2524 | |
2357 | $map |
2525 | $map |
2358 | }; |
2526 | }; |
2359 | |
2527 | |
… | |
… | |
2449 | # if exit is damned, update players death & WoR home-position |
2617 | # if exit is damned, update players death & WoR home-position |
2450 | $self->contr->savebed ($slaying, $hp, $sp) |
2618 | $self->contr->savebed ($slaying, $hp, $sp) |
2451 | if $exit->flag (FLAG_DAMNED); |
2619 | if $exit->flag (FLAG_DAMNED); |
2452 | |
2620 | |
2453 | (async { |
2621 | (async { |
|
|
2622 | $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; |
|
|
2623 | |
2454 | $self->deactivate_recursive; # just to be sure |
2624 | $self->deactivate_recursive; # just to be sure |
2455 | unless (eval { |
2625 | unless (eval { |
2456 | $self->goto ($slaying, $hp, $sp); |
2626 | $self->goto ($slaying, $hp, $sp); |
2457 | |
2627 | |
2458 | 1; |
2628 | 1; |
… | |
… | |
2493 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2663 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2494 | the message unless the client supports the msg packet. |
2664 | the message unless the client supports the msg packet. |
2495 | |
2665 | |
2496 | =cut |
2666 | =cut |
2497 | |
2667 | |
|
|
2668 | our %CHANNEL = ( |
|
|
2669 | "c/identify" => { |
|
|
2670 | id => "infobox", |
|
|
2671 | title => "Identify", |
|
|
2672 | reply => undef, |
|
|
2673 | tooltip => "Items recently identified", |
|
|
2674 | }, |
|
|
2675 | "c/examine" => { |
|
|
2676 | id => "infobox", |
|
|
2677 | title => "Examine", |
|
|
2678 | reply => undef, |
|
|
2679 | tooltip => "Signs and other items you examined", |
|
|
2680 | }, |
|
|
2681 | "c/lookat" => { |
|
|
2682 | id => "infobox", |
|
|
2683 | title => "Look", |
|
|
2684 | reply => undef, |
|
|
2685 | tooltip => "What you saw there", |
|
|
2686 | }, |
|
|
2687 | ); |
|
|
2688 | |
2498 | sub cf::client::send_msg { |
2689 | sub cf::client::send_msg { |
2499 | my ($self, $channel, $msg, $color, @extra) = @_; |
2690 | my ($self, $channel, $msg, $color, @extra) = @_; |
2500 | |
2691 | |
2501 | $msg = $self->pl->expand_cfpod ($msg); |
2692 | $msg = $self->pl->expand_cfpod ($msg); |
2502 | |
2693 | |
2503 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2694 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2504 | |
2695 | |
|
|
2696 | # check predefined channels, for the benefit of C |
|
|
2697 | if ($CHANNEL{$channel}) { |
|
|
2698 | $channel = $CHANNEL{$channel}; |
|
|
2699 | |
|
|
2700 | $self->ext_msg (channel_info => $channel) |
|
|
2701 | if $self->can_msg; |
|
|
2702 | |
|
|
2703 | $channel = $channel->{id}; |
|
|
2704 | |
2505 | if (ref $channel) { |
2705 | } elsif (ref $channel) { |
2506 | # send meta info to client, if not yet sent |
2706 | # send meta info to client, if not yet sent |
2507 | unless (exists $self->{channel}{$channel->{id}}) { |
2707 | unless (exists $self->{channel}{$channel->{id}}) { |
2508 | $self->{channel}{$channel->{id}} = $channel; |
2708 | $self->{channel}{$channel->{id}} = $channel; |
2509 | $self->ext_msg (channel_info => $channel); |
2709 | $self->ext_msg (channel_info => $channel) |
|
|
2710 | if $self->can_msg; |
2510 | } |
2711 | } |
2511 | |
2712 | |
2512 | $channel = $channel->{id}; |
2713 | $channel = $channel->{id}; |
2513 | } |
2714 | } |
2514 | |
2715 | |
… | |
… | |
2555 | =cut |
2756 | =cut |
2556 | |
2757 | |
2557 | sub cf::client::ext_msg($$@) { |
2758 | sub cf::client::ext_msg($$@) { |
2558 | my ($self, $type, @msg) = @_; |
2759 | my ($self, $type, @msg) = @_; |
2559 | |
2760 | |
2560 | my $extcmd = $self->extcmd; |
|
|
2561 | |
|
|
2562 | if ($extcmd == 2) { |
2761 | if ($self->extcmd == 2) { |
2563 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2762 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2564 | } elsif ($extcmd == 1) { # TODO: remove |
2763 | } elsif ($self->extcmd == 1) { # TODO: remove |
2565 | push @msg, msgtype => "event_$type"; |
2764 | push @msg, msgtype => "event_$type"; |
|
|
2765 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2766 | } |
|
|
2767 | } |
|
|
2768 | |
|
|
2769 | =item $client->ext_reply ($msgid, @msg) |
|
|
2770 | |
|
|
2771 | Sends an ext reply to the client. |
|
|
2772 | |
|
|
2773 | =cut |
|
|
2774 | |
|
|
2775 | sub cf::client::ext_reply($$@) { |
|
|
2776 | my ($self, $id, @msg) = @_; |
|
|
2777 | |
|
|
2778 | if ($self->extcmd == 2) { |
|
|
2779 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2780 | } elsif ($self->extcmd == 1) { |
|
|
2781 | #TODO: version 1, remove |
|
|
2782 | unshift @msg, msgtype => "reply", msgid => $id; |
2566 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2783 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2567 | } |
2784 | } |
2568 | } |
2785 | } |
2569 | |
2786 | |
2570 | =item $success = $client->query ($flags, "text", \&cb) |
2787 | =item $success = $client->query ($flags, "text", \&cb) |
… | |
… | |
2632 | my ($type, $reply, @payload) = |
2849 | my ($type, $reply, @payload) = |
2633 | "ARRAY" eq ref $msg |
2850 | "ARRAY" eq ref $msg |
2634 | ? @$msg |
2851 | ? @$msg |
2635 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2852 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
2636 | |
2853 | |
|
|
2854 | my @reply; |
|
|
2855 | |
2637 | if (my $cb = $EXTICMD{$type}) { |
2856 | if (my $cb = $EXTICMD{$type}) { |
2638 | my @reply = $cb->($ns, @payload); |
2857 | @reply = $cb->($ns, @payload); |
2639 | |
|
|
2640 | $ns->ext_reply ($reply, @reply) |
|
|
2641 | if $reply; |
|
|
2642 | } |
2858 | } |
|
|
2859 | |
|
|
2860 | $ns->ext_reply ($reply, @reply) |
|
|
2861 | if $reply; |
|
|
2862 | |
2643 | } else { |
2863 | } else { |
2644 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2864 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
2645 | } |
2865 | } |
2646 | |
2866 | |
2647 | cf::override; |
2867 | cf::override; |
… | |
… | |
2707 | =pod |
2927 | =pod |
2708 | |
2928 | |
2709 | The following functions and methods are available within a safe environment: |
2929 | The following functions and methods are available within a safe environment: |
2710 | |
2930 | |
2711 | cf::object |
2931 | cf::object |
2712 | contr pay_amount pay_player map x y force_find force_add |
2932 | contr pay_amount pay_player map x y force_find force_add destroy |
2713 | insert remove name archname title slaying race |
2933 | insert remove name archname title slaying race decrease_ob_nr |
2714 | |
2934 | |
2715 | cf::object::player |
2935 | cf::object::player |
2716 | player |
2936 | player |
2717 | |
2937 | |
2718 | cf::player |
2938 | cf::player |
… | |
… | |
2723 | |
2943 | |
2724 | =cut |
2944 | =cut |
2725 | |
2945 | |
2726 | for ( |
2946 | for ( |
2727 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2947 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
2728 | insert remove inv name archname title slaying race)], |
2948 | insert remove inv name archname title slaying race |
|
|
2949 | decrease_ob_nr destroy)], |
2729 | ["cf::object::player" => qw(player)], |
2950 | ["cf::object::player" => qw(player)], |
2730 | ["cf::player" => qw(peaceful)], |
2951 | ["cf::player" => qw(peaceful)], |
2731 | ["cf::map" => qw(trigger)], |
2952 | ["cf::map" => qw(trigger)], |
2732 | ) { |
2953 | ) { |
2733 | no strict 'refs'; |
2954 | no strict 'refs'; |
… | |
… | |
2809 | # the server's init and main functions |
3030 | # the server's init and main functions |
2810 | |
3031 | |
2811 | sub load_facedata($) { |
3032 | sub load_facedata($) { |
2812 | my ($path) = @_; |
3033 | my ($path) = @_; |
2813 | |
3034 | |
|
|
3035 | # HACK to clear player env face cache, we need some signal framework |
|
|
3036 | # for this (global event?) |
|
|
3037 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3038 | |
|
|
3039 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
3040 | |
2814 | warn "loading facedata from $path\n"; |
3041 | warn "loading facedata from $path\n"; |
2815 | |
3042 | |
2816 | my $facedata; |
3043 | my $facedata; |
2817 | 0 < aio_load $path, $facedata |
3044 | 0 < aio_load $path, $facedata |
2818 | or die "$path: $!"; |
3045 | or die "$path: $!"; |
2819 | |
3046 | |
2820 | $facedata = Coro::Storable::thaw $facedata; |
3047 | $facedata = Coro::Storable::thaw $facedata; |
2821 | |
3048 | |
2822 | $facedata->{version} == 2 |
3049 | $facedata->{version} == 2 |
2823 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3050 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
|
|
3051 | |
|
|
3052 | # patch in the exptable |
|
|
3053 | $facedata->{resource}{"res/exp_table"} = { |
|
|
3054 | type => FT_RSRC, |
|
|
3055 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
|
|
3056 | }; |
|
|
3057 | cf::cede_to_tick; |
2824 | |
3058 | |
2825 | { |
3059 | { |
2826 | my $faces = $facedata->{faceinfo}; |
3060 | my $faces = $facedata->{faceinfo}; |
2827 | |
3061 | |
2828 | while (my ($face, $info) = each %$faces) { |
3062 | while (my ($face, $info) = each %$faces) { |
2829 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3063 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2830 | cf::face::set_visibility $idx, $info->{visibility}; |
3064 | cf::face::set_visibility $idx, $info->{visibility}; |
2831 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3065 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2832 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
3066 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
2833 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
3067 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
2834 | |
3068 | |
2835 | cf::cede_to_tick; |
3069 | cf::cede_to_tick; |
2836 | } |
3070 | } |
2837 | |
3071 | |
2838 | while (my ($face, $info) = each %$faces) { |
3072 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
2863 | |
3097 | |
2864 | { |
3098 | { |
2865 | # TODO: for gcfclient pleasure, we should give resources |
3099 | # TODO: for gcfclient pleasure, we should give resources |
2866 | # that gcfclient doesn't grok a >10000 face index. |
3100 | # that gcfclient doesn't grok a >10000 face index. |
2867 | my $res = $facedata->{resource}; |
3101 | my $res = $facedata->{resource}; |
2868 | my $enc = JSON::XS->new->utf8->canonical; |
|
|
2869 | |
3102 | |
2870 | my $soundconf = delete $res->{"res/sound.conf"}; |
3103 | my $soundconf = delete $res->{"res/sound.conf"}; |
2871 | |
3104 | |
2872 | while (my ($name, $info) = each %$res) { |
3105 | while (my ($name, $info) = each %$res) { |
2873 | my $meta = $enc->encode ({ |
|
|
2874 | name => $name, |
|
|
2875 | %{ $info->{meta} || {} }, |
|
|
2876 | }); |
|
|
2877 | |
|
|
2878 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3106 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
3107 | my $data; |
2879 | |
3108 | |
2880 | if ($info->{type} & 1) { |
3109 | if ($info->{type} & 1) { |
2881 | # prepend meta info |
3110 | # prepend meta info |
2882 | |
3111 | |
|
|
3112 | my $meta = $enc->encode ({ |
|
|
3113 | name => $name, |
|
|
3114 | %{ $info->{meta} || {} }, |
|
|
3115 | }); |
|
|
3116 | |
2883 | my $data = pack "(w/a*)*", $meta, $info->{data}; |
3117 | $data = pack "(w/a*)*", $meta, $info->{data}; |
2884 | my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata |
|
|
2885 | |
|
|
2886 | cf::face::set_data $idx, 0, $data, $chk; |
|
|
2887 | } else { |
3118 | } else { |
2888 | cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; |
3119 | $data = $info->{data}; |
2889 | } |
3120 | } |
2890 | |
3121 | |
|
|
3122 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
2891 | cf::face::set_type $idx, $info->{type}; |
3123 | cf::face::set_type $idx, $info->{type}; |
2892 | |
3124 | |
2893 | cf::cede_to_tick; |
3125 | cf::cede_to_tick; |
2894 | } |
3126 | } |
2895 | |
3127 | |
… | |
… | |
2922 | $ns->fx_want ($k, $v); |
3154 | $ns->fx_want ($k, $v); |
2923 | } |
3155 | } |
2924 | }; |
3156 | }; |
2925 | |
3157 | |
2926 | sub reload_regions { |
3158 | sub reload_regions { |
|
|
3159 | # HACK to clear player env face cache, we need some signal framework |
|
|
3160 | # for this (global event?) |
|
|
3161 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3162 | |
2927 | load_resource_file "$MAPDIR/regions" |
3163 | load_resource_file "$MAPDIR/regions" |
2928 | or die "unable to load regions file\n"; |
3164 | or die "unable to load regions file\n"; |
2929 | |
3165 | |
2930 | for (cf::region::list) { |
3166 | for (cf::region::list) { |
2931 | $_->{match} = qr/$_->{match}/ |
3167 | $_->{match} = qr/$_->{match}/ |
… | |
… | |
2967 | |
3203 | |
2968 | sub init { |
3204 | sub init { |
2969 | reload_resources; |
3205 | reload_resources; |
2970 | } |
3206 | } |
2971 | |
3207 | |
2972 | sub cfg_load { |
3208 | sub reload_config { |
2973 | open my $fh, "<:utf8", "$CONFDIR/config" |
3209 | open my $fh, "<:utf8", "$CONFDIR/config" |
2974 | or return; |
3210 | or return; |
2975 | |
3211 | |
2976 | local $/; |
3212 | local $/; |
2977 | *CFG = YAML::Syck::Load <$fh>; |
3213 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
2993 | sub main { |
3229 | sub main { |
2994 | # we must not ever block the main coroutine |
3230 | # we must not ever block the main coroutine |
2995 | local $Coro::idle = sub { |
3231 | local $Coro::idle = sub { |
2996 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
3232 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
2997 | (async { |
3233 | (async { |
|
|
3234 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
2998 | Event::one_event; |
3235 | Event::one_event; |
2999 | })->prio (Coro::PRIO_MAX); |
3236 | })->prio (Coro::PRIO_MAX); |
3000 | }; |
3237 | }; |
3001 | |
3238 | |
3002 | cfg_load; |
3239 | reload_config; |
3003 | db_init; |
3240 | db_init; |
3004 | load_extensions; |
3241 | load_extensions; |
3005 | |
3242 | |
3006 | $TICK_WATCHER->start; |
3243 | $TICK_WATCHER->start; |
3007 | Event::loop; |
3244 | Event::loop; |
… | |
… | |
3074 | # and maps saved/destroyed asynchronously. |
3311 | # and maps saved/destroyed asynchronously. |
3075 | warn "begin emergency player save\n"; |
3312 | warn "begin emergency player save\n"; |
3076 | for my $login (keys %cf::PLAYER) { |
3313 | for my $login (keys %cf::PLAYER) { |
3077 | my $pl = $cf::PLAYER{$login} or next; |
3314 | my $pl = $cf::PLAYER{$login} or next; |
3078 | $pl->valid or next; |
3315 | $pl->valid or next; |
|
|
3316 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3079 | $pl->save; |
3317 | $pl->save; |
3080 | } |
3318 | } |
3081 | warn "end emergency player save\n"; |
3319 | warn "end emergency player save\n"; |
3082 | |
3320 | |
3083 | warn "begin emergency map save\n"; |
3321 | warn "begin emergency map save\n"; |
… | |
… | |
3200 | warn "reloading cf.pm"; |
3438 | warn "reloading cf.pm"; |
3201 | require cf; |
3439 | require cf; |
3202 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3440 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3203 | |
3441 | |
3204 | warn "loading config and database again"; |
3442 | warn "loading config and database again"; |
3205 | cf::cfg_load; |
3443 | cf::reload_config; |
3206 | |
3444 | |
3207 | warn "loading extensions"; |
3445 | warn "loading extensions"; |
3208 | cf::load_extensions; |
3446 | cf::load_extensions; |
3209 | |
3447 | |
3210 | warn "reattaching attachments to objects/players"; |
3448 | warn "reattaching attachments to objects/players"; |
… | |
… | |
3246 | register_command "reload" => sub { |
3484 | register_command "reload" => sub { |
3247 | my ($who, $arg) = @_; |
3485 | my ($who, $arg) = @_; |
3248 | |
3486 | |
3249 | if ($who->flag (FLAG_WIZ)) { |
3487 | if ($who->flag (FLAG_WIZ)) { |
3250 | $who->message ("reloading server."); |
3488 | $who->message ("reloading server."); |
|
|
3489 | async { |
|
|
3490 | $Coro::current->{desc} = "perl_reload"; |
3251 | async { reload_perl }; |
3491 | reload_perl; |
|
|
3492 | }; |
3252 | } |
3493 | } |
3253 | }; |
3494 | }; |
3254 | |
3495 | |
3255 | unshift @INC, $LIBDIR; |
3496 | unshift @INC, $LIBDIR; |
3256 | |
3497 | |
… | |
… | |
3275 | my $signal = new Coro::Signal; |
3516 | my $signal = new Coro::Signal; |
3276 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3517 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3277 | $signal->wait; |
3518 | $signal->wait; |
3278 | } |
3519 | } |
3279 | |
3520 | |
3280 | my $min = 1e6;#d# |
|
|
3281 | my $avg = 10; |
|
|
3282 | $TICK_WATCHER = Event->timer ( |
3521 | $TICK_WATCHER = Event->timer ( |
3283 | reentrant => 0, |
3522 | reentrant => 0, |
3284 | parked => 1, |
3523 | parked => 1, |
3285 | prio => 0, |
3524 | prio => 0, |
3286 | at => $NEXT_TICK || $TICK, |
3525 | at => $NEXT_TICK || $TICK, |
… | |
… | |
3294 | |
3533 | |
3295 | $NOW = $tick_start = Event::time; |
3534 | $NOW = $tick_start = Event::time; |
3296 | |
3535 | |
3297 | cf::server_tick; # one server iteration |
3536 | cf::server_tick; # one server iteration |
3298 | |
3537 | |
3299 | 0 && sync_job {#d# |
|
|
3300 | for(1..10) { |
|
|
3301 | my $t = Event::time; |
|
|
3302 | my $map = my $map = new_from_path cf::map "/tmp/x.map" |
|
|
3303 | or die; |
|
|
3304 | |
|
|
3305 | $map->width (50); |
|
|
3306 | $map->height (50); |
|
|
3307 | $map->alloc; |
|
|
3308 | $map->_load_objects ("/tmp/x.map", 1); |
|
|
3309 | my $t = Event::time - $t; |
|
|
3310 | |
|
|
3311 | #next unless $t < 0.0013;#d# |
|
|
3312 | if ($t < $min) { |
|
|
3313 | $min = $t; |
|
|
3314 | } |
|
|
3315 | $avg = $avg * 0.99 + $t * 0.01; |
|
|
3316 | } |
|
|
3317 | warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d# |
|
|
3318 | exit 0; |
|
|
3319 | # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477 |
|
|
3320 | }; |
|
|
3321 | |
|
|
3322 | $RUNTIME += $TICK; |
3538 | $RUNTIME += $TICK; |
3323 | $NEXT_TICK += $TICK; |
3539 | $NEXT_TICK += $TICK; |
3324 | |
3540 | |
3325 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3541 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3326 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
3542 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
3327 | Coro::async_pool { |
3543 | Coro::async_pool { |
|
|
3544 | $Coro::current->{desc} = "runtime saver"; |
3328 | write_runtime |
3545 | write_runtime |
3329 | or warn "ERROR: unable to write runtime file: $!"; |
3546 | or warn "ERROR: unable to write runtime file: $!"; |
3330 | }; |
3547 | }; |
3331 | } |
3548 | } |
3332 | |
3549 | |
3333 | # my $AFTER = Event::time; |
|
|
3334 | # warn $AFTER - $NOW;#d# |
|
|
3335 | |
|
|
3336 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3550 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3337 | $sig->send; |
3551 | $sig->send; |
3338 | } |
3552 | } |
3339 | while (my $sig = shift @WAIT_FOR_TICK) { |
3553 | while (my $sig = shift @WAIT_FOR_TICK) { |
3340 | $sig->send; |
3554 | $sig->send; |
… | |
… | |
3350 | |
3564 | |
3351 | $LOAD = ($NOW - $tick_start) / $TICK; |
3565 | $LOAD = ($NOW - $tick_start) / $TICK; |
3352 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3566 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3353 | |
3567 | |
3354 | _post_tick; |
3568 | _post_tick; |
3355 | |
|
|
3356 | |
|
|
3357 | }, |
3569 | }, |
3358 | ); |
3570 | ); |
3359 | |
3571 | |
3360 | { |
3572 | { |
|
|
3573 | BDB::min_parallel 8; |
3361 | BDB::max_poll_time $TICK * 0.1; |
3574 | BDB::max_poll_time $TICK * 0.1; |
3362 | $BDB_POLL_WATCHER = Event->io ( |
3575 | $BDB_POLL_WATCHER = Event->io ( |
3363 | reentrant => 0, |
3576 | reentrant => 0, |
3364 | fd => BDB::poll_fileno, |
3577 | fd => BDB::poll_fileno, |
3365 | poll => 'r', |
3578 | poll => 'r', |
3366 | prio => 0, |
3579 | prio => 0, |
3367 | data => WF_AUTOCANCEL, |
3580 | data => WF_AUTOCANCEL, |
3368 | cb => \&BDB::poll_cb, |
3581 | cb => \&BDB::poll_cb, |
3369 | ); |
3582 | ); |
3370 | BDB::min_parallel 8; |
|
|
3371 | |
3583 | |
3372 | BDB::set_sync_prepare { |
3584 | BDB::set_sync_prepare { |
3373 | my $status; |
3585 | my $status; |
3374 | my $current = $Coro::current; |
3586 | my $current = $Coro::current; |
3375 | ( |
3587 | ( |
… | |
… | |
3384 | ) |
3596 | ) |
3385 | }; |
3597 | }; |
3386 | |
3598 | |
3387 | unless ($DB_ENV) { |
3599 | unless ($DB_ENV) { |
3388 | $DB_ENV = BDB::db_env_create; |
3600 | $DB_ENV = BDB::db_env_create; |
|
|
3601 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC |
|
|
3602 | | BDB::LOG_AUTOREMOVE, 1); |
|
|
3603 | $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); |
|
|
3604 | $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); |
3389 | |
3605 | |
3390 | cf::sync_job { |
3606 | cf::sync_job { |
3391 | eval { |
3607 | eval { |
3392 | BDB::db_env_open |
3608 | BDB::db_env_open |
3393 | $DB_ENV, |
3609 | $DB_ENV, |
… | |
… | |
3395 | BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN |
3611 | BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN |
3396 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3612 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3397 | 0666; |
3613 | 0666; |
3398 | |
3614 | |
3399 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3615 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3400 | |
|
|
3401 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); |
|
|
3402 | $DB_ENV->set_lk_detect; |
|
|
3403 | }; |
3616 | }; |
3404 | |
3617 | |
3405 | cf::cleanup "db_env_open(db): $@" if $@; |
3618 | cf::cleanup "db_env_open(db): $@" if $@; |
3406 | }; |
3619 | }; |
3407 | } |
3620 | } |
|
|
3621 | |
|
|
3622 | $BDB_DEADLOCK_WATCHER = Event->timer ( |
|
|
3623 | after => 3, |
|
|
3624 | interval => 1, |
|
|
3625 | hard => 1, |
|
|
3626 | prio => 0, |
|
|
3627 | data => WF_AUTOCANCEL, |
|
|
3628 | cb => sub { |
|
|
3629 | BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; |
|
|
3630 | }, |
|
|
3631 | ); |
|
|
3632 | $BDB_CHECKPOINT_WATCHER = Event->timer ( |
|
|
3633 | after => 11, |
|
|
3634 | interval => 60, |
|
|
3635 | hard => 1, |
|
|
3636 | prio => 0, |
|
|
3637 | data => WF_AUTOCANCEL, |
|
|
3638 | cb => sub { |
|
|
3639 | BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; |
|
|
3640 | }, |
|
|
3641 | ); |
|
|
3642 | $BDB_TRICKLE_WATCHER = Event->timer ( |
|
|
3643 | after => 5, |
|
|
3644 | interval => 10, |
|
|
3645 | hard => 1, |
|
|
3646 | prio => 0, |
|
|
3647 | data => WF_AUTOCANCEL, |
|
|
3648 | cb => sub { |
|
|
3649 | BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; |
|
|
3650 | }, |
|
|
3651 | ); |
3408 | } |
3652 | } |
3409 | |
3653 | |
3410 | { |
3654 | { |
3411 | IO::AIO::min_parallel 8; |
3655 | IO::AIO::min_parallel 8; |
3412 | |
3656 | |
… | |
… | |
3415 | $AIO_POLL_WATCHER = Event->io ( |
3659 | $AIO_POLL_WATCHER = Event->io ( |
3416 | reentrant => 0, |
3660 | reentrant => 0, |
3417 | data => WF_AUTOCANCEL, |
3661 | data => WF_AUTOCANCEL, |
3418 | fd => IO::AIO::poll_fileno, |
3662 | fd => IO::AIO::poll_fileno, |
3419 | poll => 'r', |
3663 | poll => 'r', |
3420 | prio => 6, |
3664 | prio => 0, |
3421 | cb => \&IO::AIO::poll_cb, |
3665 | cb => \&IO::AIO::poll_cb, |
3422 | ); |
3666 | ); |
3423 | } |
3667 | } |
3424 | |
3668 | |
3425 | my $_log_backtrace; |
3669 | my $_log_backtrace; |
… | |
… | |
3431 | |
3675 | |
3432 | # limit the # of concurrent backtraces |
3676 | # limit the # of concurrent backtraces |
3433 | if ($_log_backtrace < 2) { |
3677 | if ($_log_backtrace < 2) { |
3434 | ++$_log_backtrace; |
3678 | ++$_log_backtrace; |
3435 | async { |
3679 | async { |
|
|
3680 | $Coro::current->{desc} = "abt $msg"; |
|
|
3681 | |
3436 | my @bt = fork_call { |
3682 | my @bt = fork_call { |
3437 | @addr = map { sprintf "%x", $_ } @addr; |
3683 | @addr = map { sprintf "%x", $_ } @addr; |
3438 | my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; |
3684 | my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; |
3439 | open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" |
3685 | open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" |
3440 | or die "addr2line: $!"; |
3686 | or die "addr2line: $!"; |