… | |
… | |
10 | use Event; |
10 | use Event; |
11 | use Opcode; |
11 | use Opcode; |
12 | use Safe; |
12 | use Safe; |
13 | use Safe::Hole; |
13 | use Safe::Hole; |
14 | |
14 | |
15 | use Coro 3.61 (); |
15 | use Coro 3.64 (); |
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 | |
25 | |
|
|
26 | use JSON::XS (); |
25 | use BDB (); |
27 | use BDB (); |
26 | use Data::Dumper; |
28 | use Data::Dumper; |
27 | use Digest::MD5; |
29 | use Digest::MD5; |
28 | use Fcntl; |
30 | use Fcntl; |
29 | use YAML::Syck (); |
31 | use YAML::Syck (); |
30 | use IO::AIO 2.32 (); |
32 | use IO::AIO 2.32 (); |
31 | use Time::HiRes; |
33 | use Time::HiRes; |
32 | use Compress::LZF; |
34 | use Compress::LZF; |
|
|
35 | use 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 |
37 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
40 | Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator |
… | |
… | |
49 | our %COMMAND = (); |
52 | our %COMMAND = (); |
50 | our %COMMAND_TIME = (); |
53 | our %COMMAND_TIME = (); |
51 | |
54 | |
52 | our @EXTS = (); # list of extension package names |
55 | our @EXTS = (); # list of extension package names |
53 | our %EXTCMD = (); |
56 | our %EXTCMD = (); |
|
|
57 | our %EXTICMD = (); |
54 | our %EXT_CORO = (); # coroutines bound to extensions |
58 | our %EXT_CORO = (); # coroutines bound to extensions |
55 | our %EXT_MAP = (); # pluggable maps |
59 | our %EXT_MAP = (); # pluggable maps |
56 | |
60 | |
57 | our $RELOAD; # number of reloads so far |
61 | our $RELOAD; # number of reloads so far |
58 | our @EVENT; |
62 | our @EVENT; |
… | |
… | |
76 | our $NEXT_TICK; |
80 | our $NEXT_TICK; |
77 | our $NOW; |
81 | our $NOW; |
78 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
79 | |
83 | |
80 | our $BDB_POLL_WATCHER; |
84 | our $BDB_POLL_WATCHER; |
|
|
85 | our $BDB_DEADLOCK_WATCHER; |
|
|
86 | our $BDB_CHECKPOINT_WATCHER; |
|
|
87 | our $BDB_TRICKLE_WATCHER; |
81 | our $DB_ENV; |
88 | our $DB_ENV; |
82 | |
89 | |
83 | our %CFG; |
90 | our %CFG; |
84 | |
91 | |
85 | our $UPTIME; $UPTIME ||= time; |
92 | our $UPTIME; $UPTIME ||= time; |
86 | our $RUNTIME; |
93 | our $RUNTIME; |
87 | |
94 | |
88 | our %PLAYER; # all users |
95 | our (%PLAYER, %PLAYER_LOADING); # all users |
89 | our %MAP; # all maps |
96 | our (%MAP, %MAP_LOADING ); # all maps |
90 | our $LINK_MAP; # the special {link} map, which is always available |
97 | our $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 ∕ |
93 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
100 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
94 | |
101 | |
… | |
… | |
164 | |
171 | |
165 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
172 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
166 | returns directly I<after> the tick processing (and consequently, can only wake one process |
173 | returns directly I<after> the tick processing (and consequently, can only wake one process |
167 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
174 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
168 | |
175 | |
|
|
176 | =item @cf::INVOKE_RESULTS |
|
|
177 | |
|
|
178 | This array contains the results of the last C<invoke ()> call. When |
|
|
179 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
|
|
180 | that call. |
|
|
181 | |
169 | =back |
182 | =back |
170 | |
183 | |
171 | =cut |
184 | =cut |
172 | |
185 | |
173 | BEGIN { |
186 | BEGIN { |
… | |
… | |
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 | |
241 | use 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 | |
245 | Converts a JSON string into the corresponding perl data structure. |
255 | Converts 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 | |
249 | Converts a perl data structure into its JSON representation. |
259 | Converts a perl data structure into its JSON representation. |
|
|
260 | |
|
|
261 | =cut |
|
|
262 | |
|
|
263 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
|
|
264 | |
|
|
265 | sub to_json ($) { $json_coder->encode ($_[0]) } |
|
|
266 | sub from_json ($) { $json_coder->decode ($_[0]) } |
250 | |
267 | |
251 | =item cf::lock_wait $string |
268 | =item cf::lock_wait $string |
252 | |
269 | |
253 | Wait until the given lock is available. See cf::lock_acquire. |
270 | Wait until the given lock is available. See cf::lock_acquire. |
254 | |
271 | |
… | |
… | |
257 | 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 |
258 | 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, |
259 | for example when the coroutine gets canceled), the lock is automatically |
276 | for example when the coroutine gets canceled), the lock is automatically |
260 | returned. |
277 | returned. |
261 | |
278 | |
|
|
279 | Locks are *not* recursive, locking from the same coro twice results in a |
|
|
280 | deadlocked coro. |
|
|
281 | |
262 | 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 |
263 | uses map_find and cf::map::load uses map_load). |
283 | uses 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 | |
267 | 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. |
268 | |
288 | |
269 | =cut |
289 | =cut |
270 | |
290 | |
271 | our %LOCK; |
291 | our %LOCK; |
|
|
292 | our %LOCKER;#d# |
272 | |
293 | |
273 | sub lock_wait($) { |
294 | sub 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 | |
… | |
… | |
306 | my $guard = Coro::guard { |
334 | my $guard = Coro::guard { |
307 | $TICK_WATCHER->start; |
335 | $TICK_WATCHER->start; |
308 | }; |
336 | }; |
309 | $TICK_WATCHER->stop; |
337 | $TICK_WATCHER->stop; |
310 | $guard |
338 | $guard |
|
|
339 | } |
|
|
340 | |
|
|
341 | =item cf::get_slot $time[, $priority[, $name]] |
|
|
342 | |
|
|
343 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
|
|
344 | This call blocks and returns only when you have at least C<$time> seconds |
|
|
345 | of cpu time till the next tick. The slot is only valid till the next cede. |
|
|
346 | |
|
|
347 | The optional C<$name> can be used to identify the job to run. It might be |
|
|
348 | used for statistical purposes and should identify the same time-class. |
|
|
349 | |
|
|
350 | Useful for short background jobs. |
|
|
351 | |
|
|
352 | =cut |
|
|
353 | |
|
|
354 | our @SLOT_QUEUE; |
|
|
355 | our $SLOT_QUEUE; |
|
|
356 | |
|
|
357 | $SLOT_QUEUE->cancel if $SLOT_QUEUE; |
|
|
358 | $SLOT_QUEUE = Coro::async { |
|
|
359 | my $signal = new Coro::Signal; |
|
|
360 | |
|
|
361 | while () { |
|
|
362 | next_job: |
|
|
363 | my $avail = cf::till_tick; |
|
|
364 | if ($avail > 0.01) { |
|
|
365 | for (0 .. $#SLOT_QUEUE) { |
|
|
366 | if ($SLOT_QUEUE[$_][0] < $avail) { |
|
|
367 | my $job = splice @SLOT_QUEUE, $_, 1, (); |
|
|
368 | $job->[2]->send; |
|
|
369 | Coro::cede; |
|
|
370 | goto next_job; |
|
|
371 | } |
|
|
372 | } |
|
|
373 | } |
|
|
374 | |
|
|
375 | if (@SLOT_QUEUE) { |
|
|
376 | # we do not use wait_For_tick() as it returns immediately when tick is inactive |
|
|
377 | push @cf::WAIT_FOR_TICK, $signal; |
|
|
378 | $signal->wait; |
|
|
379 | } else { |
|
|
380 | Coro::schedule; |
|
|
381 | } |
|
|
382 | } |
|
|
383 | }; |
|
|
384 | |
|
|
385 | sub get_slot($;$$) { |
|
|
386 | my ($time, $pri, $name) = @_; |
|
|
387 | |
|
|
388 | $time = $TICK * .6 if $time > $TICK * .6; |
|
|
389 | my $sig = new Coro::Signal; |
|
|
390 | |
|
|
391 | push @SLOT_QUEUE, [$time, $pri, $sig, $name]; |
|
|
392 | @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; |
|
|
393 | $SLOT_QUEUE->ready; |
|
|
394 | $sig->wait; |
311 | } |
395 | } |
312 | |
396 | |
313 | =item cf::async { BLOCK } |
397 | =item cf::async { BLOCK } |
314 | |
398 | |
315 | Currently the same as Coro::async_pool, meaning you cannot use |
399 | Currently the same as Coro::async_pool, meaning you cannot use |
… | |
… | |
405 | =cut |
489 | =cut |
406 | |
490 | |
407 | sub fork_call(&@) { |
491 | sub fork_call(&@) { |
408 | my ($cb, @args) = @_; |
492 | my ($cb, @args) = @_; |
409 | |
493 | |
410 | # socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC |
494 | # we seemingly have to make a local copy of the whole thing, |
411 | # or die "socketpair: $!"; |
495 | # otherwise perl prematurely frees the stuff :/ |
412 | pipe my $fh1, my $fh2 |
496 | # TODO: investigate and fix (likely this will be rather laborious) |
413 | or die "pipe: $!"; |
|
|
414 | |
497 | |
415 | if (my $pid = fork) { |
498 | 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; |
499 | reset_signals; |
428 | local $SIG{__WARN__}; |
500 | &$cb |
429 | local $SIG{__DIE__}; |
501 | }, @args; |
430 | eval { |
|
|
431 | close $fh1; |
|
|
432 | |
502 | |
433 | my @res = eval { $cb->(@args) }; |
503 | wantarray ? @res : $res[-1] |
434 | syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); |
|
|
435 | }; |
|
|
436 | |
|
|
437 | warn $@ if $@; |
|
|
438 | _exit 0; |
|
|
439 | } |
|
|
440 | } |
504 | } |
441 | |
505 | |
442 | =item $value = cf::db_get $family => $key |
506 | =item $value = cf::db_get $family => $key |
443 | |
507 | |
444 | Returns a single value from the environment database. |
508 | Returns a single value from the environment database. |
… | |
… | |
446 | =item cf::db_put $family => $key => $value |
510 | =item cf::db_put $family => $key => $value |
447 | |
511 | |
448 | Stores the given C<$value> in the family. It can currently store binary |
512 | Stores the given C<$value> in the family. It can currently store binary |
449 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
513 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
450 | |
514 | |
|
|
515 | =item $db = cf::db_table "name" |
|
|
516 | |
|
|
517 | Create and/or open a new database table. The string must not be "db" and must be unique |
|
|
518 | within each server. |
|
|
519 | |
451 | =cut |
520 | =cut |
|
|
521 | |
|
|
522 | sub db_table($) { |
|
|
523 | my ($name) = @_; |
|
|
524 | my $db = BDB::db_create $DB_ENV; |
|
|
525 | |
|
|
526 | eval { |
|
|
527 | $db->set_flags (BDB::CHKSUM); |
|
|
528 | |
|
|
529 | utf8::encode $name; |
|
|
530 | BDB::db_open $db, undef, $name, undef, BDB::BTREE, |
|
|
531 | BDB::CREATE | BDB::AUTO_COMMIT, 0666; |
|
|
532 | cf::cleanup "db_open(db): $!" if $!; |
|
|
533 | }; |
|
|
534 | cf::cleanup "db_open(db): $@" if $@; |
|
|
535 | |
|
|
536 | $db |
|
|
537 | } |
452 | |
538 | |
453 | our $DB; |
539 | our $DB; |
454 | |
540 | |
455 | sub db_init { |
541 | sub db_init { |
456 | unless ($DB) { |
|
|
457 | $DB = BDB::db_create $DB_ENV; |
|
|
458 | |
|
|
459 | cf::sync_job { |
542 | cf::sync_job { |
460 | eval { |
543 | $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 | } |
544 | }; |
470 | } |
545 | } |
471 | |
546 | |
472 | sub db_get($$) { |
547 | sub db_get($$) { |
473 | my $key = "$_[0]/$_[1]"; |
548 | my $key = "$_[0]/$_[1]"; |
474 | |
549 | |
… | |
… | |
524 | if (1) { |
599 | if (1) { |
525 | $md5 = |
600 | $md5 = |
526 | join "\x00", |
601 | join "\x00", |
527 | $processversion, |
602 | $processversion, |
528 | map { |
603 | map { |
529 | Coro::cede; |
604 | cf::cede_to_tick; |
530 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
605 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
531 | } 0.. $#$src; |
606 | } 0.. $#$src; |
532 | |
607 | |
533 | |
608 | |
534 | my $dbmd5 = db_get cache => "$id/md5"; |
609 | my $dbmd5 = db_get cache => "$id/md5"; |
… | |
… | |
840 | "; |
915 | "; |
841 | die if $@; |
916 | die if $@; |
842 | } |
917 | } |
843 | |
918 | |
844 | our $override; |
919 | our $override; |
845 | our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
920 | our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals? |
846 | |
921 | |
847 | sub override { |
922 | sub override { |
848 | $override = 1; |
923 | $override = 1; |
849 | @invoke_results = (); |
924 | @INVOKE_RESULTS = (@_); |
850 | } |
925 | } |
851 | |
926 | |
852 | sub do_invoke { |
927 | sub do_invoke { |
853 | my $event = shift; |
928 | my $event = shift; |
854 | my $callbacks = shift; |
929 | my $callbacks = shift; |
855 | |
930 | |
856 | @invoke_results = (); |
931 | @INVOKE_RESULTS = (); |
857 | |
932 | |
858 | local $override; |
933 | local $override; |
859 | |
934 | |
860 | for (@$callbacks) { |
935 | for (@$callbacks) { |
861 | eval { &{$_->[1]} }; |
936 | eval { &{$_->[1]} }; |
… | |
… | |
878 | |
953 | |
879 | Generate an object-specific event with the given arguments. |
954 | Generate an object-specific event with the given arguments. |
880 | |
955 | |
881 | This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be |
956 | This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be |
882 | removed in future versions), and there is no public API to access override |
957 | removed in future versions), and there is no public API to access override |
883 | results (if you must, access C<@cf::invoke_results> directly). |
958 | results (if you must, access C<@cf::INVOKE_RESULTS> directly). |
884 | |
959 | |
885 | =back |
960 | =back |
886 | |
961 | |
887 | =cut |
962 | =cut |
888 | |
963 | |
889 | ############################################################################# |
964 | ############################################################################# |
890 | # object support |
965 | # object support |
|
|
966 | # |
|
|
967 | |
|
|
968 | sub _can_merge { |
|
|
969 | my ($ob1, $ob2) = @_; |
|
|
970 | |
|
|
971 | local $Storable::canonical = 1; |
|
|
972 | my $fob1 = Storable::freeze $ob1; |
|
|
973 | my $fob2 = Storable::freeze $ob2; |
|
|
974 | |
|
|
975 | $fob1 eq $fob2 |
|
|
976 | } |
891 | |
977 | |
892 | sub reattach { |
978 | sub reattach { |
893 | # basically do the same as instantiate, without calling instantiate |
979 | # basically do the same as instantiate, without calling instantiate |
894 | my ($obj) = @_; |
980 | my ($obj) = @_; |
895 | |
981 | |
… | |
… | |
940 | ); |
1026 | ); |
941 | |
1027 | |
942 | sub object_freezer_save { |
1028 | sub object_freezer_save { |
943 | my ($filename, $rdata, $objs) = @_; |
1029 | my ($filename, $rdata, $objs) = @_; |
944 | |
1030 | |
|
|
1031 | my $guard = cf::lock_acquire "io"; |
|
|
1032 | |
945 | sync_job { |
1033 | sync_job { |
946 | if (length $$rdata) { |
1034 | if (length $$rdata) { |
|
|
1035 | utf8::decode (my $decname = $filename); |
947 | warn sprintf "saving %s (%d,%d)\n", |
1036 | warn sprintf "saving %s (%d,%d)\n", |
948 | $filename, length $$rdata, scalar @$objs; |
1037 | $decname, length $$rdata, scalar @$objs; |
949 | |
1038 | |
950 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1039 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
951 | chmod SAVE_MODE, $fh; |
1040 | chmod SAVE_MODE, $fh; |
952 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1041 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
953 | aio_fsync $fh if $cf::USE_FSYNC; |
1042 | aio_fsync $fh if $cf::USE_FSYNC; |
… | |
… | |
972 | } |
1061 | } |
973 | } else { |
1062 | } else { |
974 | aio_unlink $filename; |
1063 | aio_unlink $filename; |
975 | aio_unlink "$filename.pst"; |
1064 | aio_unlink "$filename.pst"; |
976 | } |
1065 | } |
977 | } |
1066 | }; |
|
|
1067 | |
|
|
1068 | undef $guard; |
978 | } |
1069 | } |
979 | |
1070 | |
980 | sub object_freezer_as_string { |
1071 | sub object_freezer_as_string { |
981 | my ($rdata, $objs) = @_; |
1072 | my ($rdata, $objs) = @_; |
982 | |
1073 | |
… | |
… | |
987 | |
1078 | |
988 | sub object_thawer_load { |
1079 | sub object_thawer_load { |
989 | my ($filename) = @_; |
1080 | my ($filename) = @_; |
990 | |
1081 | |
991 | my ($data, $av); |
1082 | my ($data, $av); |
|
|
1083 | |
|
|
1084 | my $guard = cf::lock_acquire "io"; |
992 | |
1085 | |
993 | (aio_load $filename, $data) >= 0 |
1086 | (aio_load $filename, $data) >= 0 |
994 | or return; |
1087 | or return; |
995 | |
1088 | |
996 | unless (aio_stat "$filename.pst") { |
1089 | unless (aio_stat "$filename.pst") { |
997 | (aio_load "$filename.pst", $av) >= 0 |
1090 | (aio_load "$filename.pst", $av) >= 0 |
998 | or return; |
1091 | or return; |
|
|
1092 | |
|
|
1093 | undef $guard; |
999 | $av = eval { (Storable::thaw $av)->{objs} }; |
1094 | $av = eval { (Storable::thaw $av)->{objs} }; |
1000 | } |
1095 | } |
1001 | |
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 | |
1034 | Register a callback fro execution when the client sends an extcmd packet. |
1131 | Register a callback for execution when the client sends an (synchronous) |
|
|
1132 | extcmd packet. Ext commands will be processed in the order they are |
|
|
1133 | received by the server, like other user commands. The first argument is |
|
|
1134 | the logged-in player. Ext commands can only be processed after a player |
|
|
1135 | has logged in successfully. |
1035 | |
1136 | |
1036 | If the callback returns something, it is sent back as if reply was being |
1137 | If the callback returns something, it is sent back as if reply was being |
1037 | called. |
1138 | called. |
1038 | |
1139 | |
|
|
1140 | =item cf::register_exticmd $name => \&callback($ns,$packet); |
|
|
1141 | |
|
|
1142 | Register a callback for execution when the client sends an (asynchronous) |
|
|
1143 | exticmd packet. Exti commands are processed by the server as soon as they |
|
|
1144 | are received, i.e. out of order w.r.t. other commands. The first argument |
|
|
1145 | is a client socket. Exti commands can be received anytime, even before |
|
|
1146 | log-in. |
|
|
1147 | |
|
|
1148 | If the callback returns something, it is sent back as if reply was being |
|
|
1149 | called. |
|
|
1150 | |
1039 | =cut |
1151 | =cut |
1040 | |
1152 | |
1041 | sub register_extcmd { |
1153 | sub register_extcmd { |
1042 | my ($name, $cb) = @_; |
1154 | my ($name, $cb) = @_; |
1043 | |
1155 | |
1044 | $EXTCMD{$name} = $cb; |
1156 | $EXTCMD{$name} = $cb; |
|
|
1157 | } |
|
|
1158 | |
|
|
1159 | sub register_exticmd { |
|
|
1160 | my ($name, $cb) = @_; |
|
|
1161 | |
|
|
1162 | $EXTICMD{$name} = $cb; |
1045 | } |
1163 | } |
1046 | |
1164 | |
1047 | cf::player->attach ( |
1165 | cf::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 | |
|
|
1299 | Returns the official number of playing players, as per the Crossfire metaserver rules. |
|
|
1300 | |
|
|
1301 | =cut |
|
|
1302 | |
|
|
1303 | sub 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 | |
1172 | Returns the given player object, loading it if necessary (might block). |
1313 | Returns 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 | |
1238 | sub new($) { |
1384 | sub 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 | |
|
|
1401 | sub 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 | |
1253 | Nukes the player without looking back. If logged in, the connection will |
1409 | Nukes 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 | |
… | |
… | |
1358 | sub expand_cfpod { |
1519 | sub expand_cfpod { |
1359 | ((my $self), (local $_)) = @_; |
1520 | ((my $self), (local $_)) = @_; |
1360 | |
1521 | |
1361 | # escape & and < |
1522 | # escape & and < |
1362 | s/&/&/g; |
1523 | s/&/&/g; |
1363 | s/(?<![BIUGH])</</g; |
1524 | s/(?<![BIUGHT])</</g; |
1364 | |
1525 | |
1365 | # this is buggy, it needs to properly take care of nested <'s |
1526 | # this is buggy, it needs to properly take care of nested <'s |
1366 | |
1527 | |
1367 | 1 while |
1528 | 1 while |
1368 | # replace B<>, I<>, U<> etc. |
1529 | # replace B<>, I<>, U<> etc. |
1369 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1530 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1370 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1531 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1371 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1532 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
|
|
1533 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1372 | # replace G<male|female> tags |
1534 | # replace G<male|female> tags |
1373 | || s{G<([^>|]*)\|([^>]*)>}{ |
1535 | || s{G<([^>|]*)\|([^>]*)>}{ |
1374 | $self->gender ? $2 : $1 |
1536 | $self->gender ? $2 : $1 |
1375 | }ge |
1537 | }ge |
1376 | # replace H<hint text> |
1538 | # replace H<hint text> |
1377 | || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; |
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; |
1378 | |
1546 | |
1379 | # create single paragraphs (very hackish) |
1547 | # create single paragraphs (very hackish) |
1380 | s/(?<=\S)\n(?=\w)/ /g; |
1548 | s/(?<=\S)\n(?=\w)/ /g; |
1381 | |
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 | |
1382 | $_ |
1556 | $_ |
1383 | } |
1557 | } |
1384 | |
1558 | |
|
|
1559 | sub hintmode { |
|
|
1560 | $_[0]{hintmode} = $_[1] if @_ > 1; |
|
|
1561 | $_[0]{hintmode} |
|
|
1562 | } |
|
|
1563 | |
1385 | =item $player->ext_reply ($msgid, %msg) |
1564 | =item $player->ext_reply ($msgid, @msg) |
1386 | |
1565 | |
1387 | Sends an ext reply to the player. |
1566 | Sends an ext reply to the player. |
1388 | |
1567 | |
1389 | =cut |
1568 | =cut |
1390 | |
1569 | |
1391 | sub ext_reply($$%) { |
1570 | sub ext_reply($$@) { |
1392 | my ($self, $id, %msg) = @_; |
1571 | my ($self, $id, @msg) = @_; |
1393 | |
1572 | |
1394 | $msg{msgid} = $id; |
1573 | $self->ns->ext_reply ($id, @msg) |
1395 | |
|
|
1396 | $self->send ("ext " . cf::to_json \%msg); |
|
|
1397 | } |
1574 | } |
1398 | |
1575 | |
1399 | =item $player->ext_event ($type, %msg) |
1576 | =item $player->ext_msg ($type, @msg) |
1400 | |
1577 | |
1401 | Sends an ext event to the client. |
1578 | Sends an ext event to the client. |
1402 | |
1579 | |
1403 | =cut |
1580 | =cut |
1404 | |
1581 | |
1405 | sub ext_event($$%) { |
1582 | sub ext_msg($$@) { |
1406 | my ($self, $type, %msg) = @_; |
1583 | my ($self, $type, @msg) = @_; |
1407 | |
1584 | |
1408 | $self->ns->ext_event ($type, %msg); |
1585 | $self->ns->ext_msg ($type, @msg); |
1409 | } |
1586 | } |
1410 | |
1587 | |
1411 | =head3 cf::region |
1588 | =head3 cf::region |
1412 | |
1589 | |
1413 | =over 4 |
1590 | =over 4 |
… | |
… | |
1426 | my ($path) = @_; |
1603 | my ($path) = @_; |
1427 | |
1604 | |
1428 | my ($match, $specificity); |
1605 | my ($match, $specificity); |
1429 | |
1606 | |
1430 | for my $region (list) { |
1607 | for my $region (list) { |
1431 | if ($region->match && $path =~ $region->match) { |
1608 | if ($region->{match} && $path =~ $region->{match}) { |
1432 | ($match, $specificity) = ($region, $region->specificity) |
1609 | ($match, $specificity) = ($region, $region->specificity) |
1433 | if $region->specificity > $specificity; |
1610 | if $region->specificity > $specificity; |
1434 | } |
1611 | } |
1435 | } |
1612 | } |
1436 | |
1613 | |
… | |
… | |
1556 | $self->init; # pass $1 etc. |
1733 | $self->init; # pass $1 etc. |
1557 | return $self; |
1734 | return $self; |
1558 | } |
1735 | } |
1559 | } |
1736 | } |
1560 | |
1737 | |
1561 | Carp::carp "unable to resolve path '$path' (base '$base')."; |
1738 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
1562 | () |
1739 | () |
1563 | } |
1740 | } |
1564 | |
1741 | |
1565 | sub init { |
1742 | sub init { |
1566 | my ($self) = @_; |
1743 | my ($self) = @_; |
… | |
… | |
1629 | |
1806 | |
1630 | sub load_header_from($) { |
1807 | sub load_header_from($) { |
1631 | my ($self, $path) = @_; |
1808 | my ($self, $path) = @_; |
1632 | |
1809 | |
1633 | utf8::encode $path; |
1810 | utf8::encode $path; |
1634 | #aio_open $path, O_RDONLY, 0 |
1811 | my $f = new_from_file cf::object::thawer $path |
1635 | # or return; |
|
|
1636 | |
|
|
1637 | $self->_load_header ($path) |
|
|
1638 | 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; |
1639 | |
1819 | |
1640 | $self->{load_path} = $path; |
1820 | $self->{load_path} = $path; |
1641 | |
1821 | |
1642 | 1 |
1822 | 1 |
1643 | } |
1823 | } |
… | |
… | |
1697 | sub find { |
1877 | sub find { |
1698 | my ($path, $origin) = @_; |
1878 | my ($path, $origin) = @_; |
1699 | |
1879 | |
1700 | $path = normalise $path, $origin && $origin->path; |
1880 | $path = normalise $path, $origin && $origin->path; |
1701 | |
1881 | |
|
|
1882 | cf::lock_wait "map_data:$path";#d#remove |
1702 | cf::lock_wait "map_find:$path"; |
1883 | cf::lock_wait "map_find:$path"; |
1703 | |
1884 | |
1704 | $cf::MAP{$path} || do { |
1885 | $cf::MAP{$path} || do { |
1705 | 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 | |
1706 | my $map = new_from_path cf::map $path |
1889 | my $map = new_from_path cf::map $path |
1707 | or return; |
1890 | or return; |
1708 | |
1891 | |
1709 | $map->{last_save} = $cf::RUNTIME; |
1892 | $map->{last_save} = $cf::RUNTIME; |
1710 | |
1893 | |
… | |
… | |
1712 | or return; |
1895 | or return; |
1713 | |
1896 | |
1714 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1897 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1715 | # doing this can freeze the server in a sync job, obviously |
1898 | # doing this can freeze the server in a sync job, obviously |
1716 | #$cf::WAIT_FOR_TICK->wait; |
1899 | #$cf::WAIT_FOR_TICK->wait; |
|
|
1900 | undef $guard1; |
|
|
1901 | undef $guard2; |
1717 | $map->reset; |
1902 | $map->reset; |
1718 | undef $guard; |
|
|
1719 | return find $path; |
1903 | return find $path; |
1720 | } |
1904 | } |
1721 | |
1905 | |
1722 | $cf::MAP{$path} = $map |
1906 | $cf::MAP{$path} = $map |
1723 | } |
1907 | } |
… | |
… | |
1732 | local $self->{deny_reset} = 1; # loading can take a long time |
1916 | local $self->{deny_reset} = 1; # loading can take a long time |
1733 | |
1917 | |
1734 | my $path = $self->{path}; |
1918 | my $path = $self->{path}; |
1735 | |
1919 | |
1736 | { |
1920 | { |
1737 | my $guard = cf::lock_acquire "map_load:$path"; |
1921 | my $guard = cf::lock_acquire "map_data:$path"; |
1738 | |
1922 | |
|
|
1923 | return unless $self->valid; |
1739 | return if $self->in_memory != cf::MAP_SWAPPED; |
1924 | return unless $self->in_memory == cf::MAP_SWAPPED; |
1740 | |
1925 | |
1741 | $self->in_memory (cf::MAP_LOADING); |
1926 | $self->in_memory (cf::MAP_LOADING); |
1742 | |
1927 | |
1743 | $self->alloc; |
1928 | $self->alloc; |
1744 | |
1929 | |
1745 | $self->pre_load; |
1930 | $self->pre_load; |
1746 | Coro::cede; |
1931 | cf::cede_to_tick; |
1747 | |
1932 | |
|
|
1933 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
|
|
1934 | $f->skip_block; |
1748 | $self->_load_objects ($self->{load_path}, 1) |
1935 | $self->_load_objects ($f) |
1749 | or return; |
1936 | or return; |
1750 | |
1937 | |
1751 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1938 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1752 | if delete $self->{load_original}; |
1939 | if delete $self->{load_original}; |
1753 | |
1940 | |
1754 | if (my $uniq = $self->uniq_path) { |
1941 | if (my $uniq = $self->uniq_path) { |
1755 | utf8::encode $uniq; |
1942 | utf8::encode $uniq; |
1756 | if (aio_open $uniq, O_RDONLY, 0) { |
1943 | unless (aio_stat $uniq) { |
|
|
1944 | if (my $f = new_from_file cf::object::thawer $uniq) { |
1757 | $self->clear_unique_items; |
1945 | $self->clear_unique_items; |
1758 | $self->_load_objects ($uniq, 0); |
1946 | $self->_load_objects ($f); |
|
|
1947 | $f->resolve_delayed_derefs; |
|
|
1948 | } |
1759 | } |
1949 | } |
1760 | } |
1950 | } |
1761 | |
1951 | |
1762 | Coro::cede; |
1952 | $f->resolve_delayed_derefs; |
|
|
1953 | |
|
|
1954 | cf::cede_to_tick; |
1763 | # now do the right thing for maps |
1955 | # now do the right thing for maps |
1764 | $self->link_multipart_objects; |
1956 | $self->link_multipart_objects; |
1765 | $self->difficulty ($self->estimate_difficulty) |
1957 | $self->difficulty ($self->estimate_difficulty) |
1766 | unless $self->difficulty; |
1958 | unless $self->difficulty; |
1767 | Coro::cede; |
1959 | cf::cede_to_tick; |
1768 | |
1960 | |
1769 | unless ($self->{deny_activate}) { |
1961 | unless ($self->{deny_activate}) { |
1770 | $self->decay_objects; |
1962 | $self->decay_objects; |
1771 | $self->fix_auto_apply; |
1963 | $self->fix_auto_apply; |
1772 | $self->update_buttons; |
1964 | $self->update_buttons; |
1773 | Coro::cede; |
1965 | cf::cede_to_tick; |
1774 | $self->set_darkness_map; |
1966 | $self->set_darkness_map; |
1775 | Coro::cede; |
1967 | cf::cede_to_tick; |
1776 | $self->activate; |
1968 | $self->activate; |
1777 | } |
1969 | } |
|
|
1970 | |
|
|
1971 | $self->{last_save} = $cf::RUNTIME; |
|
|
1972 | $self->last_access ($cf::RUNTIME); |
1778 | |
1973 | |
1779 | $self->in_memory (cf::MAP_IN_MEMORY); |
1974 | $self->in_memory (cf::MAP_IN_MEMORY); |
1780 | } |
1975 | } |
1781 | |
1976 | |
1782 | $self->post_load; |
1977 | $self->post_load; |
… | |
… | |
1793 | |
1988 | |
1794 | $self |
1989 | $self |
1795 | } |
1990 | } |
1796 | |
1991 | |
1797 | # 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 |
1798 | sub load_diag { |
1993 | sub load_neighbours { |
1799 | my ($map) = @_; |
1994 | my ($map) = @_; |
1800 | |
1995 | |
1801 | my @diag; # diagonal neighbours |
1996 | my @neigh; # diagonal neighbours |
1802 | |
1997 | |
1803 | for (0 .. 3) { |
1998 | for (0 .. 3) { |
1804 | my $neigh = $map->tile_path ($_) |
1999 | my $neigh = $map->tile_path ($_) |
1805 | or next; |
2000 | or next; |
1806 | $neigh = find $neigh, $map |
2001 | $neigh = find $neigh, $map |
1807 | or next; |
2002 | or next; |
1808 | $neigh->load; |
2003 | $neigh->load; |
1809 | |
2004 | |
|
|
2005 | push @neigh, |
1810 | push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], |
2006 | [$neigh->tile_path (($_ + 3) % 4), $neigh], |
1811 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
2007 | [$neigh->tile_path (($_ + 1) % 4), $neigh]; |
1812 | } |
2008 | } |
1813 | |
2009 | |
1814 | for (@diag) { |
2010 | for (grep defined $_->[0], @neigh) { |
|
|
2011 | my ($path, $origin) = @$_; |
1815 | my $neigh = find @$_ |
2012 | my $neigh = find $path, $origin |
1816 | or next; |
2013 | or next; |
1817 | $neigh->load; |
2014 | $neigh->load; |
1818 | } |
2015 | } |
1819 | } |
2016 | } |
1820 | |
2017 | |
… | |
… | |
1825 | } |
2022 | } |
1826 | |
2023 | |
1827 | sub do_load_sync { |
2024 | sub do_load_sync { |
1828 | my ($map) = @_; |
2025 | my ($map) = @_; |
1829 | |
2026 | |
|
|
2027 | cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" |
|
|
2028 | if $Coro::current == $Coro::main; |
|
|
2029 | |
1830 | cf::sync_job { $map->load }; |
2030 | cf::sync_job { $map->load }; |
1831 | } |
2031 | } |
1832 | |
2032 | |
1833 | our %MAP_PREFETCH; |
2033 | our %MAP_PREFETCH; |
1834 | our $MAP_PREFETCHER = undef; |
2034 | our $MAP_PREFETCHER = undef; |
1835 | |
2035 | |
1836 | sub find_async { |
2036 | sub find_async { |
1837 | my ($path, $origin) = @_; |
2037 | my ($path, $origin, $load) = @_; |
1838 | |
2038 | |
1839 | $path = normalise $path, $origin && $origin->{path}; |
2039 | $path = normalise $path, $origin && $origin->{path}; |
1840 | |
2040 | |
1841 | if (my $map = $cf::MAP{$path}) { |
2041 | if (my $map = $cf::MAP{$path}) { |
1842 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
2042 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
1843 | } |
2043 | } |
1844 | |
2044 | |
1845 | undef $MAP_PREFETCH{$path}; |
2045 | $MAP_PREFETCH{$path} |= $load; |
|
|
2046 | |
1846 | $MAP_PREFETCHER ||= cf::async { |
2047 | $MAP_PREFETCHER ||= cf::async { |
1847 | while (%MAP_PREFETCH) { |
2048 | while (%MAP_PREFETCH) { |
1848 | for my $path (keys %MAP_PREFETCH) { |
2049 | while (my ($k, $v) = each %MAP_PREFETCH) { |
1849 | my $map = find $path |
2050 | if (my $map = find $k) { |
1850 | or next; |
|
|
1851 | $map->load; |
2051 | $map->load if $v; |
|
|
2052 | } |
1852 | |
2053 | |
1853 | delete $MAP_PREFETCH{$path}; |
2054 | delete $MAP_PREFETCH{$k}; |
1854 | } |
2055 | } |
1855 | } |
2056 | } |
1856 | undef $MAP_PREFETCHER; |
2057 | undef $MAP_PREFETCHER; |
1857 | }; |
2058 | }; |
1858 | $MAP_PREFETCHER->prio (6); |
2059 | $MAP_PREFETCHER->prio (6); |
… | |
… | |
1861 | } |
2062 | } |
1862 | |
2063 | |
1863 | sub save { |
2064 | sub save { |
1864 | my ($self) = @_; |
2065 | my ($self) = @_; |
1865 | |
2066 | |
1866 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2067 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1867 | |
2068 | |
1868 | $self->{last_save} = $cf::RUNTIME; |
2069 | $self->{last_save} = $cf::RUNTIME; |
1869 | |
2070 | |
1870 | return unless $self->dirty; |
2071 | return unless $self->dirty; |
1871 | |
2072 | |
… | |
… | |
1894 | my ($self) = @_; |
2095 | my ($self) = @_; |
1895 | |
2096 | |
1896 | # save first because save cedes |
2097 | # save first because save cedes |
1897 | $self->save; |
2098 | $self->save; |
1898 | |
2099 | |
1899 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2100 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1900 | |
2101 | |
1901 | return if $self->players; |
2102 | return if $self->players; |
1902 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2103 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
1903 | return if $self->{deny_save}; |
2104 | return if $self->{deny_save}; |
1904 | |
2105 | |
|
|
2106 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2107 | |
|
|
2108 | $self->deactivate; |
|
|
2109 | $_->clear_links_to ($self) for values %cf::MAP; |
1905 | $self->clear; |
2110 | $self->clear; |
1906 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
1907 | } |
2111 | } |
1908 | |
2112 | |
1909 | sub reset_at { |
2113 | sub reset_at { |
1910 | my ($self) = @_; |
2114 | my ($self) = @_; |
1911 | |
2115 | |
… | |
… | |
1943 | if $uniq; |
2147 | if $uniq; |
1944 | } |
2148 | } |
1945 | |
2149 | |
1946 | delete $cf::MAP{$self->path}; |
2150 | delete $cf::MAP{$self->path}; |
1947 | |
2151 | |
|
|
2152 | $self->deactivate; |
|
|
2153 | $_->clear_links_to ($self) for values %cf::MAP; |
1948 | $self->clear; |
2154 | $self->clear; |
1949 | |
|
|
1950 | $_->clear_links_to ($self) for values %cf::MAP; |
|
|
1951 | |
2155 | |
1952 | $self->unlink_save; |
2156 | $self->unlink_save; |
1953 | $self->destroy; |
2157 | $self->destroy; |
1954 | } |
2158 | } |
1955 | |
2159 | |
1956 | my $nuke_counter = "aaaa"; |
2160 | my $nuke_counter = "aaaa"; |
1957 | |
2161 | |
1958 | sub nuke { |
2162 | sub nuke { |
1959 | my ($self) = @_; |
2163 | my ($self) = @_; |
1960 | |
2164 | |
|
|
2165 | { |
|
|
2166 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2167 | |
1961 | delete $cf::MAP{$self->path}; |
2168 | delete $cf::MAP{$self->path}; |
1962 | |
2169 | |
1963 | $self->unlink_save; |
2170 | $self->unlink_save; |
1964 | |
2171 | |
1965 | bless $self, "cf::map"; |
2172 | bless $self, "cf::map"; |
1966 | delete $self->{deny_reset}; |
2173 | delete $self->{deny_reset}; |
1967 | $self->{deny_save} = 1; |
2174 | $self->{deny_save} = 1; |
1968 | $self->reset_timeout (1); |
2175 | $self->reset_timeout (1); |
1969 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2176 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
1970 | |
2177 | |
1971 | $cf::MAP{$self->path} = $self; |
2178 | $cf::MAP{$self->path} = $self; |
|
|
2179 | } |
1972 | |
2180 | |
1973 | $self->reset; # polite request, might not happen |
2181 | $self->reset; # polite request, might not happen |
1974 | } |
2182 | } |
1975 | |
2183 | |
1976 | =item $maps = cf::map::tmp_maps |
2184 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2052 | |
2260 | |
2053 | sub inv_recursive { |
2261 | sub inv_recursive { |
2054 | inv_recursive_ inv $_[0] |
2262 | inv_recursive_ inv $_[0] |
2055 | } |
2263 | } |
2056 | |
2264 | |
|
|
2265 | =item $ref = $ob->ref |
|
|
2266 | |
|
|
2267 | creates and returns a persistent reference to an objetc that can be stored as a string. |
|
|
2268 | |
|
|
2269 | =item $ob = cf::object::deref ($refstring) |
|
|
2270 | |
|
|
2271 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
|
|
2272 | even if the object actually exists. May block. |
|
|
2273 | |
|
|
2274 | =cut |
|
|
2275 | |
|
|
2276 | sub deref { |
|
|
2277 | my ($ref) = @_; |
|
|
2278 | |
|
|
2279 | # temporary compatibility#TODO#remove |
|
|
2280 | $ref =~ s{^<}{player/<}; |
|
|
2281 | |
|
|
2282 | if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { |
|
|
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 | |
2057 | package cf; |
2296 | package cf; |
2058 | |
2297 | |
2059 | =back |
2298 | =back |
2060 | |
2299 | |
2061 | =head3 cf::object::player |
2300 | =head3 cf::object::player |
… | |
… | |
2083 | |
2322 | |
2084 | } else { |
2323 | } else { |
2085 | my $pl = $self->contr; |
2324 | my $pl = $self->contr; |
2086 | |
2325 | |
2087 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
2326 | if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { |
2088 | my $diag = $pl->{npc_dialog}; |
2327 | my $dialog = $pl->{npc_dialog}; |
2089 | $diag->{pl}->ext_reply ( |
2328 | $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); |
2090 | $diag->{id}, |
|
|
2091 | msgtype => "reply", |
|
|
2092 | msg => $diag->{pl}->expand_cfpod ($msg), |
|
|
2093 | add_topics => [] |
|
|
2094 | ); |
|
|
2095 | |
2329 | |
2096 | } else { |
2330 | } else { |
2097 | $msg = $npc->name . " says: $msg" if $npc; |
2331 | $msg = $npc->name . " says: $msg" if $npc; |
2098 | $self->message ($msg, $flags); |
2332 | $self->message ($msg, $flags); |
2099 | } |
2333 | } |
2100 | } |
2334 | } |
|
|
2335 | } |
|
|
2336 | |
|
|
2337 | =item $object->send_msg ($channel, $msg, $color, [extra...]) |
|
|
2338 | |
|
|
2339 | =cut |
|
|
2340 | |
|
|
2341 | sub cf::object::send_msg { |
|
|
2342 | my $pl = shift->contr |
|
|
2343 | or return; |
|
|
2344 | $pl->send_msg (@_); |
2101 | } |
2345 | } |
2102 | |
2346 | |
2103 | =item $player_object->may ("access") |
2347 | =item $player_object->may ("access") |
2104 | |
2348 | |
2105 | Returns wether the given player is authorized to access resource "access" |
2349 | Returns wether the given player is authorized to access resource "access" |
… | |
… | |
2184 | # use -1 or undef as default coordinates, not 0, 0 |
2428 | # use -1 or undef as default coordinates, not 0, 0 |
2185 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2429 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2186 | if $x <=0 && $y <= 0; |
2430 | if $x <=0 && $y <= 0; |
2187 | |
2431 | |
2188 | $map->load; |
2432 | $map->load; |
2189 | $map->load_diag; |
2433 | $map->load_neighbours; |
2190 | |
2434 | |
2191 | return unless $self->contr->active; |
2435 | return unless $self->contr->active; |
2192 | $self->activate_recursive; |
2436 | $self->activate_recursive; |
2193 | |
2437 | |
2194 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2438 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2195 | $self->enter_map ($map, $x, $y); |
2439 | $self->enter_map ($map, $x, $y); |
2196 | } |
2440 | } |
2197 | |
2441 | |
2198 | =item $player_object->goto ($path, $x, $y[, $check->($map)]) |
2442 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2199 | |
2443 | |
2200 | Moves the player to the given map-path and coordinates by first freezing |
2444 | Moves the player to the given map-path and coordinates by first freezing |
2201 | her, loading and preparing them map, calling the provided $check callback |
2445 | her, loading and preparing them map, calling the provided $check callback |
2202 | that has to return the map if sucecssful, and then unfreezes the player on |
2446 | that has to return the map if sucecssful, and then unfreezes the player on |
2203 | the new (success) or old (failed) map position. |
2447 | the new (success) or old (failed) map position. In either case, $done will |
|
|
2448 | be called at the end of this process. |
2204 | |
2449 | |
2205 | =cut |
2450 | =cut |
2206 | |
2451 | |
2207 | our $GOTOGEN; |
2452 | our $GOTOGEN; |
2208 | |
2453 | |
2209 | sub cf::object::player::goto { |
2454 | sub cf::object::player::goto { |
2210 | my ($self, $path, $x, $y, $check) = @_; |
2455 | my ($self, $path, $x, $y, $check, $done) = @_; |
2211 | |
2456 | |
2212 | # 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 |
2213 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2458 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2214 | |
2459 | |
2215 | $self->enter_link; |
2460 | $self->enter_link; |
2216 | |
2461 | |
2217 | (async { |
2462 | (async { |
|
|
2463 | # *tag paths override both path and x|y |
|
|
2464 | if ($path =~ /^\*(.*)$/) { |
|
|
2465 | if (my @obs = grep $_->map, ext::map_tags::find $1) { |
|
|
2466 | my $ob = $obs[rand @obs]; |
|
|
2467 | |
|
|
2468 | # see if we actually can go there |
|
|
2469 | if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { |
|
|
2470 | $ob = $obs[rand @obs]; |
|
|
2471 | } else { |
|
|
2472 | $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
2473 | } |
|
|
2474 | # else put us there anyways for now #d# |
|
|
2475 | |
|
|
2476 | ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); |
|
|
2477 | } else { |
|
|
2478 | ($path, $x, $y) = (undef, undef, undef); |
|
|
2479 | } |
|
|
2480 | } |
|
|
2481 | |
2218 | my $map = eval { |
2482 | my $map = eval { |
2219 | my $map = cf::map::find $path; |
2483 | my $map = defined $path ? cf::map::find $path : undef; |
2220 | |
2484 | |
2221 | if ($map) { |
2485 | if ($map) { |
2222 | $map = $map->customise_for ($self); |
2486 | $map = $map->customise_for ($self); |
2223 | $map = $check->($map) if $check && $map; |
2487 | $map = $check->($map) if $check && $map; |
2224 | } else { |
2488 | } else { |
2225 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
2489 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2226 | } |
2490 | } |
2227 | |
2491 | |
2228 | $map |
2492 | $map |
2229 | }; |
2493 | }; |
2230 | |
2494 | |
… | |
… | |
2235 | |
2499 | |
2236 | if ($gen == $self->{_goto_generation}) { |
2500 | if ($gen == $self->{_goto_generation}) { |
2237 | delete $self->{_goto_generation}; |
2501 | delete $self->{_goto_generation}; |
2238 | $self->leave_link ($map, $x, $y); |
2502 | $self->leave_link ($map, $x, $y); |
2239 | } |
2503 | } |
|
|
2504 | |
|
|
2505 | $done->() if $done; |
2240 | })->prio (1); |
2506 | })->prio (1); |
2241 | } |
2507 | } |
2242 | |
2508 | |
2243 | =item $player_object->enter_exit ($exit_object) |
2509 | =item $player_object->enter_exit ($exit_object) |
2244 | |
2510 | |
… | |
… | |
2313 | my $hp = $exit->stats->hp; |
2579 | my $hp = $exit->stats->hp; |
2314 | my $sp = $exit->stats->sp; |
2580 | my $sp = $exit->stats->sp; |
2315 | |
2581 | |
2316 | $self->enter_link; |
2582 | $self->enter_link; |
2317 | |
2583 | |
|
|
2584 | # if exit is damned, update players death & WoR home-position |
|
|
2585 | $self->contr->savebed ($slaying, $hp, $sp) |
|
|
2586 | if $exit->flag (FLAG_DAMNED); |
|
|
2587 | |
2318 | (async { |
2588 | (async { |
2319 | $self->deactivate_recursive; # just to be sure |
2589 | $self->deactivate_recursive; # just to be sure |
2320 | unless (eval { |
2590 | unless (eval { |
2321 | $self->goto ($slaying, $hp, $sp); |
2591 | $self->goto ($slaying, $hp, $sp); |
2322 | |
2592 | |
… | |
… | |
2349 | |
2619 | |
2350 | utf8::encode $text; |
2620 | utf8::encode $text; |
2351 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
2621 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
2352 | } |
2622 | } |
2353 | |
2623 | |
2354 | =item $client->send_msg ($color, $type, $msg, [extra...]) |
2624 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
2355 | |
2625 | |
2356 | Send a drawinfo or msg packet to the client, formatting the msg for the |
2626 | Send a drawinfo or msg packet to the client, formatting the msg for the |
2357 | client if neccessary. C<$type> should be a string identifying the type of |
2627 | client if neccessary. C<$type> should be a string identifying the type of |
2358 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2628 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2359 | the message unless the client supports the msg packet. |
2629 | the message unless the client supports the msg packet. |
2360 | |
2630 | |
2361 | =cut |
2631 | =cut |
2362 | |
2632 | |
|
|
2633 | our %CHANNEL = ( |
|
|
2634 | "c/identify" => { |
|
|
2635 | id => "identify", |
|
|
2636 | title => "Identify", |
|
|
2637 | reply => undef, |
|
|
2638 | tooltip => "Items recently identified", |
|
|
2639 | }, |
|
|
2640 | "c/examine" => { |
|
|
2641 | id => "examine", |
|
|
2642 | title => "Examine", |
|
|
2643 | reply => undef, |
|
|
2644 | tooltip => "Signs and other items you examined", |
|
|
2645 | }, |
|
|
2646 | ); |
|
|
2647 | |
2363 | sub cf::client::send_msg { |
2648 | sub cf::client::send_msg { |
2364 | my ($self, $color, $type, $msg, @extra) = @_; |
2649 | my ($self, $channel, $msg, $color, @extra) = @_; |
2365 | |
2650 | |
2366 | $msg = $self->pl->expand_cfpod ($msg); |
2651 | $msg = $self->pl->expand_cfpod ($msg); |
2367 | |
2652 | |
|
|
2653 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
|
|
2654 | |
|
|
2655 | # check predefined channels, for the benefit of C |
|
|
2656 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
|
|
2657 | |
|
|
2658 | if (ref $channel) { |
|
|
2659 | # send meta info to client, if not yet sent |
|
|
2660 | unless (exists $self->{channel}{$channel->{id}}) { |
|
|
2661 | $self->{channel}{$channel->{id}} = $channel; |
|
|
2662 | $self->ext_msg (channel_info => $channel) |
|
|
2663 | if $self->can_msg; |
|
|
2664 | } |
|
|
2665 | |
|
|
2666 | $channel = $channel->{id}; |
|
|
2667 | } |
|
|
2668 | |
|
|
2669 | return unless @extra || length $msg; |
|
|
2670 | |
2368 | if ($self->can_msg) { |
2671 | if ($self->can_msg) { |
2369 | $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); |
2672 | # default colour, mask it out |
|
|
2673 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
|
|
2674 | if $color & cf::NDI_DEF; |
|
|
2675 | |
|
|
2676 | $self->send_packet ("msg " . $self->{json_coder}->encode ( |
|
|
2677 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); |
2370 | } else { |
2678 | } else { |
2371 | # replace some tags by gcfclient-compatible ones |
|
|
2372 | for ($msg) { |
|
|
2373 | 1 while |
|
|
2374 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
2375 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
2376 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
2377 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
2378 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/; |
|
|
2379 | } |
|
|
2380 | |
|
|
2381 | if ($color >= 0) { |
2679 | if ($color >= 0) { |
|
|
2680 | # replace some tags by gcfclient-compatible ones |
|
|
2681 | for ($msg) { |
|
|
2682 | 1 while |
|
|
2683 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
2684 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
2685 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
2686 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
2687 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
2688 | } |
|
|
2689 | |
|
|
2690 | $color &= cf::NDI_COLOR_MASK; |
|
|
2691 | |
|
|
2692 | utf8::encode $msg; |
|
|
2693 | |
2382 | if (0 && $msg =~ /\[/) { |
2694 | if (0 && $msg =~ /\[/) { |
|
|
2695 | # COMMAND/INFO |
2383 | $self->send_packet ("drawextinfo $color 4 0 $msg") |
2696 | $self->send_packet ("drawextinfo $color 10 8 $msg") |
2384 | } else { |
2697 | } else { |
2385 | s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2698 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
2386 | $self->send_packet ("drawinfo $color $msg") |
2699 | $self->send_packet ("drawinfo $color $msg") |
2387 | } |
2700 | } |
2388 | } |
2701 | } |
2389 | } |
2702 | } |
2390 | } |
2703 | } |
2391 | |
2704 | |
2392 | =item $client->ext_event ($type, %msg) |
2705 | =item $client->ext_msg ($type, @msg) |
2393 | |
2706 | |
2394 | Sends an exti event to the client. |
2707 | Sends an ext event to the client. |
2395 | |
2708 | |
2396 | =cut |
2709 | =cut |
2397 | |
2710 | |
2398 | sub cf::client::ext_event($$%) { |
2711 | sub cf::client::ext_msg($$@) { |
2399 | my ($self, $type, %msg) = @_; |
2712 | my ($self, $type, @msg) = @_; |
2400 | |
2713 | |
|
|
2714 | if ($self->extcmd == 2) { |
|
|
2715 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
|
|
2716 | } elsif ($self->extcmd == 1) { # TODO: remove |
2401 | $msg{msgtype} = "event_$type"; |
2717 | push @msg, msgtype => "event_$type"; |
2402 | $self->send_packet ("ext " . cf::to_json \%msg); |
2718 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2719 | } |
|
|
2720 | } |
|
|
2721 | |
|
|
2722 | =item $client->ext_reply ($msgid, @msg) |
|
|
2723 | |
|
|
2724 | Sends an ext reply to the client. |
|
|
2725 | |
|
|
2726 | =cut |
|
|
2727 | |
|
|
2728 | sub cf::client::ext_reply($$@) { |
|
|
2729 | my ($self, $id, @msg) = @_; |
|
|
2730 | |
|
|
2731 | if ($self->extcmd == 2) { |
|
|
2732 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
|
|
2733 | } elsif ($self->extcmd == 1) { |
|
|
2734 | #TODO: version 1, remove |
|
|
2735 | unshift @msg, msgtype => "reply", msgid => $id; |
|
|
2736 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
|
|
2737 | } |
2403 | } |
2738 | } |
2404 | |
2739 | |
2405 | =item $success = $client->query ($flags, "text", \&cb) |
2740 | =item $success = $client->query ($flags, "text", \&cb) |
2406 | |
2741 | |
2407 | Queues a query to the client, calling the given callback with |
2742 | Queues a query to the client, calling the given callback with |
2408 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
2743 | the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, |
2409 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
2744 | C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. |
2410 | |
2745 | |
2411 | Queries can fail, so check the return code. Or don't, as queries will become |
2746 | Queries can fail, so check the return code. Or don't, as queries will |
2412 | reliable at some point in the future. |
2747 | become reliable at some point in the future. |
2413 | |
2748 | |
2414 | =cut |
2749 | =cut |
2415 | |
2750 | |
2416 | sub cf::client::query { |
2751 | sub cf::client::query { |
2417 | my ($self, $flags, $text, $cb) = @_; |
2752 | my ($self, $flags, $text, $cb) = @_; |
… | |
… | |
2425 | utf8::encode $text; |
2760 | utf8::encode $text; |
2426 | push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; |
2761 | push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; |
2427 | |
2762 | |
2428 | $self->send_packet ($self->{query_queue}[0][0]) |
2763 | $self->send_packet ($self->{query_queue}[0][0]) |
2429 | if @{ $self->{query_queue} } == 1; |
2764 | if @{ $self->{query_queue} } == 1; |
|
|
2765 | |
|
|
2766 | 1 |
2430 | } |
2767 | } |
2431 | |
2768 | |
2432 | cf::client->attach ( |
2769 | cf::client->attach ( |
|
|
2770 | on_connect => sub { |
|
|
2771 | my ($ns) = @_; |
|
|
2772 | |
|
|
2773 | $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed; |
|
|
2774 | }, |
2433 | on_reply => sub { |
2775 | on_reply => sub { |
2434 | my ($ns, $msg) = @_; |
2776 | my ($ns, $msg) = @_; |
2435 | |
2777 | |
2436 | # this weird shuffling is so that direct followup queries |
2778 | # this weird shuffling is so that direct followup queries |
2437 | # get handled first |
2779 | # get handled first |
… | |
… | |
2449 | } else { |
2791 | } else { |
2450 | $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; |
2792 | $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; |
2451 | } |
2793 | } |
2452 | } |
2794 | } |
2453 | }, |
2795 | }, |
|
|
2796 | on_exticmd => sub { |
|
|
2797 | my ($ns, $buf) = @_; |
|
|
2798 | |
|
|
2799 | my $msg = eval { $ns->{json_coder}->decode ($buf) }; |
|
|
2800 | |
|
|
2801 | if (ref $msg) { |
|
|
2802 | my ($type, $reply, @payload) = |
|
|
2803 | "ARRAY" eq ref $msg |
|
|
2804 | ? @$msg |
|
|
2805 | : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove |
|
|
2806 | |
|
|
2807 | my @reply; |
|
|
2808 | |
|
|
2809 | if (my $cb = $EXTICMD{$type}) { |
|
|
2810 | @reply = $cb->($ns, @payload); |
|
|
2811 | } |
|
|
2812 | |
|
|
2813 | $ns->ext_reply ($reply, @reply) |
|
|
2814 | if $reply; |
|
|
2815 | |
|
|
2816 | } else { |
|
|
2817 | warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; |
|
|
2818 | } |
|
|
2819 | |
|
|
2820 | cf::override; |
|
|
2821 | }, |
2454 | ); |
2822 | ); |
2455 | |
2823 | |
2456 | =item $client->async (\&cb) |
2824 | =item $client->async (\&cb) |
2457 | |
2825 | |
2458 | Create a new coroutine, running the specified callback. The coroutine will |
2826 | Create a new coroutine, running the specified callback. The coroutine will |
… | |
… | |
2499 | our $safe = new Safe "safe"; |
2867 | our $safe = new Safe "safe"; |
2500 | our $safe_hole = new Safe::Hole; |
2868 | our $safe_hole = new Safe::Hole; |
2501 | |
2869 | |
2502 | $SIG{FPE} = 'IGNORE'; |
2870 | $SIG{FPE} = 'IGNORE'; |
2503 | |
2871 | |
2504 | $safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); |
2872 | $safe->permit_only (Opcode::opset qw( |
|
|
2873 | :base_core :base_mem :base_orig :base_math |
|
|
2874 | grepstart grepwhile mapstart mapwhile |
|
|
2875 | sort time |
|
|
2876 | )); |
2505 | |
2877 | |
2506 | # here we export the classes and methods available to script code |
2878 | # here we export the classes and methods available to script code |
2507 | |
2879 | |
2508 | =pod |
2880 | =pod |
2509 | |
2881 | |
2510 | The following functions and methods are available within a safe environment: |
2882 | The following functions and methods are available within a safe environment: |
2511 | |
2883 | |
2512 | cf::object contr pay_amount pay_player map |
2884 | cf::object |
|
|
2885 | contr pay_amount pay_player map x y force_find force_add |
|
|
2886 | insert remove name archname title slaying race decrease_ob_nr |
|
|
2887 | |
2513 | cf::object::player player |
2888 | cf::object::player |
2514 | cf::player peaceful |
2889 | player |
2515 | cf::map trigger |
2890 | |
|
|
2891 | cf::player |
|
|
2892 | peaceful |
|
|
2893 | |
|
|
2894 | cf::map |
|
|
2895 | trigger |
2516 | |
2896 | |
2517 | =cut |
2897 | =cut |
2518 | |
2898 | |
2519 | for ( |
2899 | for ( |
2520 | ["cf::object" => qw(contr pay_amount pay_player map)], |
2900 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
|
|
2901 | insert remove inv name archname title slaying race |
|
|
2902 | decrease_ob_nr)], |
2521 | ["cf::object::player" => qw(player)], |
2903 | ["cf::object::player" => qw(player)], |
2522 | ["cf::player" => qw(peaceful)], |
2904 | ["cf::player" => qw(peaceful)], |
2523 | ["cf::map" => qw(trigger)], |
2905 | ["cf::map" => qw(trigger)], |
2524 | ) { |
2906 | ) { |
2525 | no strict 'refs'; |
2907 | no strict 'refs'; |
… | |
… | |
2601 | # the server's init and main functions |
2983 | # the server's init and main functions |
2602 | |
2984 | |
2603 | sub load_facedata($) { |
2985 | sub load_facedata($) { |
2604 | my ($path) = @_; |
2986 | my ($path) = @_; |
2605 | |
2987 | |
|
|
2988 | # HACK to clear player env face cache, we need some signal framework |
|
|
2989 | # for this (global event?) |
|
|
2990 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2991 | |
|
|
2992 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
2993 | |
2606 | warn "loading facedata from $path\n"; |
2994 | warn "loading facedata from $path\n"; |
2607 | |
2995 | |
2608 | my $facedata; |
2996 | my $facedata; |
2609 | 0 < aio_load $path, $facedata |
2997 | 0 < aio_load $path, $facedata |
2610 | or die "$path: $!"; |
2998 | or die "$path: $!"; |
… | |
… | |
2612 | $facedata = Coro::Storable::thaw $facedata; |
3000 | $facedata = Coro::Storable::thaw $facedata; |
2613 | |
3001 | |
2614 | $facedata->{version} == 2 |
3002 | $facedata->{version} == 2 |
2615 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3003 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2616 | |
3004 | |
|
|
3005 | # patch in the exptable |
|
|
3006 | $facedata->{resource}{"res/exp_table"} = { |
|
|
3007 | type => FT_RSRC, |
|
|
3008 | data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), |
|
|
3009 | }; |
|
|
3010 | cf::cede_to_tick; |
|
|
3011 | |
2617 | { |
3012 | { |
2618 | my $faces = $facedata->{faceinfo}; |
3013 | my $faces = $facedata->{faceinfo}; |
2619 | |
3014 | |
2620 | while (my ($face, $info) = each %$faces) { |
3015 | while (my ($face, $info) = each %$faces) { |
2621 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3016 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2622 | cf::face::set $idx, $info->{visibility}, $info->{magicmap}; |
3017 | cf::face::set_visibility $idx, $info->{visibility}; |
|
|
3018 | cf::face::set_magicmap $idx, $info->{magicmap}; |
2623 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
3019 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
2624 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
3020 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
2625 | Coro::cede; |
3021 | |
|
|
3022 | cf::cede_to_tick; |
2626 | } |
3023 | } |
2627 | |
3024 | |
2628 | while (my ($face, $info) = each %$faces) { |
3025 | while (my ($face, $info) = each %$faces) { |
2629 | next unless $info->{smooth}; |
3026 | next unless $info->{smooth}; |
2630 | my $idx = cf::face::find $face |
3027 | my $idx = cf::face::find $face |
2631 | or next; |
3028 | or next; |
2632 | if (my $smooth = cf::face::find $info->{smooth}) { |
3029 | if (my $smooth = cf::face::find $info->{smooth}) { |
|
|
3030 | cf::face::set_smooth $idx, $smooth; |
2633 | cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; |
3031 | cf::face::set_smoothlevel $idx, $info->{smoothlevel}; |
2634 | } else { |
3032 | } else { |
2635 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
3033 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2636 | } |
3034 | } |
2637 | Coro::cede; |
3035 | |
|
|
3036 | cf::cede_to_tick; |
2638 | } |
3037 | } |
2639 | } |
3038 | } |
2640 | |
3039 | |
2641 | { |
3040 | { |
2642 | my $anims = $facedata->{animinfo}; |
3041 | my $anims = $facedata->{animinfo}; |
2643 | |
3042 | |
2644 | while (my ($anim, $info) = each %$anims) { |
3043 | while (my ($anim, $info) = each %$anims) { |
2645 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
3044 | cf::anim::set $anim, $info->{frames}, $info->{facings}; |
2646 | Coro::cede; |
3045 | cf::cede_to_tick; |
2647 | } |
3046 | } |
2648 | |
3047 | |
2649 | cf::anim::invalidate_all; # d'oh |
3048 | cf::anim::invalidate_all; # d'oh |
2650 | } |
3049 | } |
2651 | |
3050 | |
|
|
3051 | { |
|
|
3052 | # TODO: for gcfclient pleasure, we should give resources |
|
|
3053 | # that gcfclient doesn't grok a >10000 face index. |
|
|
3054 | my $res = $facedata->{resource}; |
|
|
3055 | |
|
|
3056 | my $soundconf = delete $res->{"res/sound.conf"}; |
|
|
3057 | |
|
|
3058 | while (my ($name, $info) = each %$res) { |
|
|
3059 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
|
|
3060 | my $data; |
|
|
3061 | |
|
|
3062 | if ($info->{type} & 1) { |
|
|
3063 | # prepend meta info |
|
|
3064 | |
|
|
3065 | my $meta = $enc->encode ({ |
|
|
3066 | name => $name, |
|
|
3067 | %{ $info->{meta} || {} }, |
|
|
3068 | }); |
|
|
3069 | |
|
|
3070 | $data = pack "(w/a*)*", $meta, $info->{data}; |
|
|
3071 | } else { |
|
|
3072 | $data = $info->{data}; |
|
|
3073 | } |
|
|
3074 | |
|
|
3075 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
|
|
3076 | cf::face::set_type $idx, $info->{type}; |
|
|
3077 | |
|
|
3078 | cf::cede_to_tick; |
|
|
3079 | } |
|
|
3080 | |
|
|
3081 | if ($soundconf) { |
|
|
3082 | $soundconf = $enc->decode (delete $soundconf->{data}); |
|
|
3083 | |
|
|
3084 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
|
|
3085 | my $sound = $soundconf->{compat}[$_] |
|
|
3086 | or next; |
|
|
3087 | |
|
|
3088 | my $face = cf::face::find "sound/$sound->[1]"; |
|
|
3089 | cf::sound::set $sound->[0] => $face; |
|
|
3090 | cf::sound::old_sound_index $_, $face; # gcfclient-compat |
|
|
3091 | } |
|
|
3092 | |
|
|
3093 | while (my ($k, $v) = each %{$soundconf->{event}}) { |
|
|
3094 | my $face = cf::face::find "sound/$v"; |
|
|
3095 | cf::sound::set $k => $face; |
|
|
3096 | } |
|
|
3097 | } |
|
|
3098 | } |
|
|
3099 | |
2652 | 1 |
3100 | 1 |
2653 | } |
3101 | } |
2654 | |
3102 | |
|
|
3103 | register_exticmd fx_want => sub { |
|
|
3104 | my ($ns, $want) = @_; |
|
|
3105 | |
|
|
3106 | while (my ($k, $v) = each %$want) { |
|
|
3107 | $ns->fx_want ($k, $v); |
|
|
3108 | } |
|
|
3109 | }; |
|
|
3110 | |
2655 | sub reload_regions { |
3111 | sub reload_regions { |
|
|
3112 | # HACK to clear player env face cache, we need some signal framework |
|
|
3113 | # for this (global event?) |
|
|
3114 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3115 | |
2656 | load_resource_file "$MAPDIR/regions" |
3116 | load_resource_file "$MAPDIR/regions" |
2657 | or die "unable to load regions file\n"; |
3117 | or die "unable to load regions file\n"; |
|
|
3118 | |
|
|
3119 | for (cf::region::list) { |
|
|
3120 | $_->{match} = qr/$_->{match}/ |
|
|
3121 | if exists $_->{match}; |
|
|
3122 | } |
2658 | } |
3123 | } |
2659 | |
3124 | |
2660 | sub reload_facedata { |
3125 | sub reload_facedata { |
2661 | load_facedata "$DATADIR/facedata" |
3126 | load_facedata "$DATADIR/facedata" |
2662 | or die "unable to load facedata\n"; |
3127 | or die "unable to load facedata\n"; |
2663 | } |
3128 | } |
2664 | |
3129 | |
2665 | sub reload_archetypes { |
3130 | sub reload_archetypes { |
|
|
3131 | load_resource_file "$DATADIR/archetypes" |
|
|
3132 | or die "unable to load archetypes\n"; |
|
|
3133 | #d# NEED to laod twice to resolve forward references |
|
|
3134 | # this really needs to be done in an extra post-pass |
|
|
3135 | # (which needs to be synchronous, so solve it differently) |
2666 | load_resource_file "$DATADIR/archetypes" |
3136 | load_resource_file "$DATADIR/archetypes" |
2667 | or die "unable to load archetypes\n"; |
3137 | or die "unable to load archetypes\n"; |
2668 | } |
3138 | } |
2669 | |
3139 | |
2670 | sub reload_treasures { |
3140 | sub reload_treasures { |
… | |
… | |
2686 | |
3156 | |
2687 | sub init { |
3157 | sub init { |
2688 | reload_resources; |
3158 | reload_resources; |
2689 | } |
3159 | } |
2690 | |
3160 | |
2691 | sub cfg_load { |
3161 | sub reload_config { |
2692 | open my $fh, "<:utf8", "$CONFDIR/config" |
3162 | open my $fh, "<:utf8", "$CONFDIR/config" |
2693 | or return; |
3163 | or return; |
2694 | |
3164 | |
2695 | local $/; |
3165 | local $/; |
2696 | *CFG = YAML::Syck::Load <$fh>; |
3166 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
2716 | (async { |
3186 | (async { |
2717 | Event::one_event; |
3187 | Event::one_event; |
2718 | })->prio (Coro::PRIO_MAX); |
3188 | })->prio (Coro::PRIO_MAX); |
2719 | }; |
3189 | }; |
2720 | |
3190 | |
2721 | cfg_load; |
3191 | reload_config; |
2722 | db_init; |
3192 | db_init; |
2723 | load_extensions; |
3193 | load_extensions; |
2724 | |
3194 | |
2725 | $TICK_WATCHER->start; |
3195 | $TICK_WATCHER->start; |
2726 | Event::loop; |
3196 | Event::loop; |
… | |
… | |
2864 | %EXT_CORO = (); |
3334 | %EXT_CORO = (); |
2865 | |
3335 | |
2866 | warn "removing commands"; |
3336 | warn "removing commands"; |
2867 | %COMMAND = (); |
3337 | %COMMAND = (); |
2868 | |
3338 | |
2869 | warn "removing ext commands"; |
3339 | warn "removing ext/exti commands"; |
2870 | %EXTCMD = (); |
3340 | %EXTCMD = (); |
|
|
3341 | %EXTICMD = (); |
2871 | |
3342 | |
2872 | warn "unloading/nuking all extensions"; |
3343 | warn "unloading/nuking all extensions"; |
2873 | for my $pkg (@EXTS) { |
3344 | for my $pkg (@EXTS) { |
2874 | warn "... unloading $pkg"; |
3345 | warn "... unloading $pkg"; |
2875 | |
3346 | |
… | |
… | |
2918 | warn "reloading cf.pm"; |
3389 | warn "reloading cf.pm"; |
2919 | require cf; |
3390 | require cf; |
2920 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3391 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
2921 | |
3392 | |
2922 | warn "loading config and database again"; |
3393 | warn "loading config and database again"; |
2923 | cf::cfg_load; |
3394 | cf::reload_config; |
2924 | |
3395 | |
2925 | warn "loading extensions"; |
3396 | warn "loading extensions"; |
2926 | cf::load_extensions; |
3397 | cf::load_extensions; |
2927 | |
3398 | |
2928 | warn "reattaching attachments to objects/players"; |
3399 | warn "reattaching attachments to objects/players"; |
… | |
… | |
2993 | my $signal = new Coro::Signal; |
3464 | my $signal = new Coro::Signal; |
2994 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3465 | push @WAIT_FOR_TICK_BEGIN, $signal; |
2995 | $signal->wait; |
3466 | $signal->wait; |
2996 | } |
3467 | } |
2997 | |
3468 | |
2998 | my $min = 1e6;#d# |
|
|
2999 | my $avg = 10; |
|
|
3000 | $TICK_WATCHER = Event->timer ( |
3469 | $TICK_WATCHER = Event->timer ( |
3001 | reentrant => 0, |
3470 | reentrant => 0, |
3002 | parked => 1, |
3471 | parked => 1, |
3003 | prio => 0, |
3472 | prio => 0, |
3004 | at => $NEXT_TICK || $TICK, |
3473 | at => $NEXT_TICK || $TICK, |
… | |
… | |
3012 | |
3481 | |
3013 | $NOW = $tick_start = Event::time; |
3482 | $NOW = $tick_start = Event::time; |
3014 | |
3483 | |
3015 | cf::server_tick; # one server iteration |
3484 | cf::server_tick; # one server iteration |
3016 | |
3485 | |
3017 | 0 && sync_job {#d# |
|
|
3018 | for(1..10) { |
|
|
3019 | my $t = Event::time; |
|
|
3020 | my $map = my $map = new_from_path cf::map "/tmp/x.map" |
|
|
3021 | or die; |
|
|
3022 | |
|
|
3023 | $map->width (50); |
|
|
3024 | $map->height (50); |
|
|
3025 | $map->alloc; |
|
|
3026 | $map->_load_objects ("/tmp/x.map", 1); |
|
|
3027 | my $t = Event::time - $t; |
|
|
3028 | |
|
|
3029 | #next unless $t < 0.0013;#d# |
|
|
3030 | if ($t < $min) { |
|
|
3031 | $min = $t; |
|
|
3032 | } |
|
|
3033 | $avg = $avg * 0.99 + $t * 0.01; |
|
|
3034 | } |
|
|
3035 | warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d# |
|
|
3036 | exit 0; |
|
|
3037 | # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477 |
|
|
3038 | }; |
|
|
3039 | |
|
|
3040 | $RUNTIME += $TICK; |
3486 | $RUNTIME += $TICK; |
3041 | $NEXT_TICK += $TICK; |
3487 | $NEXT_TICK += $TICK; |
3042 | |
3488 | |
3043 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3489 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3044 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
3490 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
… | |
… | |
3046 | write_runtime |
3492 | write_runtime |
3047 | or warn "ERROR: unable to write runtime file: $!"; |
3493 | or warn "ERROR: unable to write runtime file: $!"; |
3048 | }; |
3494 | }; |
3049 | } |
3495 | } |
3050 | |
3496 | |
3051 | # my $AFTER = Event::time; |
|
|
3052 | # warn $AFTER - $NOW;#d# |
|
|
3053 | |
|
|
3054 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3497 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3055 | $sig->send; |
3498 | $sig->send; |
3056 | } |
3499 | } |
3057 | while (my $sig = shift @WAIT_FOR_TICK) { |
3500 | while (my $sig = shift @WAIT_FOR_TICK) { |
3058 | $sig->send; |
3501 | $sig->send; |
… | |
… | |
3068 | |
3511 | |
3069 | $LOAD = ($NOW - $tick_start) / $TICK; |
3512 | $LOAD = ($NOW - $tick_start) / $TICK; |
3070 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3513 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3071 | |
3514 | |
3072 | _post_tick; |
3515 | _post_tick; |
3073 | |
|
|
3074 | |
|
|
3075 | }, |
3516 | }, |
3076 | ); |
3517 | ); |
3077 | |
3518 | |
3078 | { |
3519 | { |
|
|
3520 | BDB::min_parallel 8; |
3079 | BDB::max_poll_time $TICK * 0.1; |
3521 | BDB::max_poll_time $TICK * 0.1; |
3080 | $BDB_POLL_WATCHER = Event->io ( |
3522 | $BDB_POLL_WATCHER = Event->io ( |
3081 | reentrant => 0, |
3523 | reentrant => 0, |
3082 | fd => BDB::poll_fileno, |
3524 | fd => BDB::poll_fileno, |
3083 | poll => 'r', |
3525 | poll => 'r', |
3084 | prio => 0, |
3526 | prio => 0, |
3085 | data => WF_AUTOCANCEL, |
3527 | data => WF_AUTOCANCEL, |
3086 | cb => \&BDB::poll_cb, |
3528 | cb => \&BDB::poll_cb, |
3087 | ); |
3529 | ); |
3088 | BDB::min_parallel 8; |
|
|
3089 | |
3530 | |
3090 | BDB::set_sync_prepare { |
3531 | BDB::set_sync_prepare { |
3091 | my $status; |
3532 | my $status; |
3092 | my $current = $Coro::current; |
3533 | my $current = $Coro::current; |
3093 | ( |
3534 | ( |
… | |
… | |
3102 | ) |
3543 | ) |
3103 | }; |
3544 | }; |
3104 | |
3545 | |
3105 | unless ($DB_ENV) { |
3546 | unless ($DB_ENV) { |
3106 | $DB_ENV = BDB::db_env_create; |
3547 | $DB_ENV = BDB::db_env_create; |
|
|
3548 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC |
|
|
3549 | | BDB::LOG_AUTOREMOVE, 1); |
|
|
3550 | $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); |
|
|
3551 | $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); |
3107 | |
3552 | |
3108 | cf::sync_job { |
3553 | cf::sync_job { |
3109 | eval { |
3554 | eval { |
3110 | BDB::db_env_open |
3555 | BDB::db_env_open |
3111 | $DB_ENV, |
3556 | $DB_ENV, |
… | |
… | |
3113 | BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN |
3558 | BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN |
3114 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3559 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3115 | 0666; |
3560 | 0666; |
3116 | |
3561 | |
3117 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3562 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3118 | |
|
|
3119 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); |
|
|
3120 | $DB_ENV->set_lk_detect; |
|
|
3121 | }; |
3563 | }; |
3122 | |
3564 | |
3123 | cf::cleanup "db_env_open(db): $@" if $@; |
3565 | cf::cleanup "db_env_open(db): $@" if $@; |
3124 | }; |
3566 | }; |
3125 | } |
3567 | } |
|
|
3568 | |
|
|
3569 | $BDB_DEADLOCK_WATCHER = Event->timer ( |
|
|
3570 | after => 3, |
|
|
3571 | interval => 1, |
|
|
3572 | hard => 1, |
|
|
3573 | prio => 0, |
|
|
3574 | data => WF_AUTOCANCEL, |
|
|
3575 | cb => sub { |
|
|
3576 | BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; |
|
|
3577 | }, |
|
|
3578 | ); |
|
|
3579 | $BDB_CHECKPOINT_WATCHER = Event->timer ( |
|
|
3580 | after => 11, |
|
|
3581 | interval => 60, |
|
|
3582 | hard => 1, |
|
|
3583 | prio => 0, |
|
|
3584 | data => WF_AUTOCANCEL, |
|
|
3585 | cb => sub { |
|
|
3586 | BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; |
|
|
3587 | }, |
|
|
3588 | ); |
|
|
3589 | $BDB_TRICKLE_WATCHER = Event->timer ( |
|
|
3590 | after => 5, |
|
|
3591 | interval => 10, |
|
|
3592 | hard => 1, |
|
|
3593 | prio => 0, |
|
|
3594 | data => WF_AUTOCANCEL, |
|
|
3595 | cb => sub { |
|
|
3596 | BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; |
|
|
3597 | }, |
|
|
3598 | ); |
3126 | } |
3599 | } |
3127 | |
3600 | |
3128 | { |
3601 | { |
3129 | IO::AIO::min_parallel 8; |
3602 | IO::AIO::min_parallel 8; |
3130 | |
3603 | |