… | |
… | |
76 | # strictly for debugging |
76 | # strictly for debugging |
77 | $SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; |
77 | $SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; |
78 | |
78 | |
79 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
79 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
80 | |
80 | |
|
|
81 | our @ORIG_INC; |
|
|
82 | |
81 | our %COMMAND = (); |
83 | our %COMMAND = (); |
82 | our %COMMAND_TIME = (); |
84 | our %COMMAND_TIME = (); |
83 | |
85 | |
84 | our @EXTS = (); # list of extension package names |
86 | our @EXTS = (); # list of extension package names |
85 | our %EXTCMD = (); |
87 | our %EXTCMD = (); |
… | |
… | |
91 | our @EVENT; |
93 | our @EVENT; |
92 | our @REFLECT; # set by XS |
94 | our @REFLECT; # set by XS |
93 | our %REFLECT; # set by us |
95 | our %REFLECT; # set by us |
94 | |
96 | |
95 | our $CONFDIR = confdir; |
97 | our $CONFDIR = confdir; |
|
|
98 | |
96 | our $DATADIR = datadir; |
99 | our $DATADIR = datadir; |
97 | our $LIBDIR = "$DATADIR/ext"; |
100 | our $LIBDIR = "$DATADIR/ext"; |
98 | our $PODDIR = "$DATADIR/pod"; |
101 | our $PODDIR = "$DATADIR/pod"; |
99 | our $MAPDIR = "$DATADIR/" . mapdir; |
102 | our $MAPDIR = "$DATADIR/" . mapdir; |
|
|
103 | |
100 | our $LOCALDIR = localdir; |
104 | our $LOCALDIR = localdir; |
101 | our $TMPDIR = "$LOCALDIR/" . tmpdir; |
105 | our $TMPDIR = "$LOCALDIR/" . tmpdir; |
102 | our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; |
106 | our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; |
103 | our $PLAYERDIR = "$LOCALDIR/" . playerdir; |
107 | our $PLAYERDIR = "$LOCALDIR/" . playerdir; |
104 | our $RANDOMDIR = "$LOCALDIR/random"; |
108 | our $RANDOMDIR = "$LOCALDIR/random"; |
… | |
… | |
122 | our $BDB_DEADLOCK_WATCHER; |
126 | our $BDB_DEADLOCK_WATCHER; |
123 | our $BDB_CHECKPOINT_WATCHER; |
127 | our $BDB_CHECKPOINT_WATCHER; |
124 | our $BDB_TRICKLE_WATCHER; |
128 | our $BDB_TRICKLE_WATCHER; |
125 | our $DB_ENV; |
129 | our $DB_ENV; |
126 | |
130 | |
127 | our @EXTRA_MODULES = qw(pod match mapscript); |
131 | our @EXTRA_MODULES = qw(pod match mapscript incloader); |
128 | |
132 | |
129 | our %CFG; |
133 | our %CFG; |
130 | |
134 | |
131 | our $UPTIME; $UPTIME ||= time; |
135 | our $UPTIME; $UPTIME ||= time; |
132 | our $RUNTIME; |
136 | our $RUNTIME; |
… | |
… | |
231 | from wherever your confdir points to. |
235 | from wherever your confdir points to. |
232 | |
236 | |
233 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
237 | =item cf::wait_for_tick, cf::wait_for_tick_begin |
234 | |
238 | |
235 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
239 | These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only |
236 | returns directly I<after> the tick processing (and consequently, can only wake one process |
240 | returns directly I<after> the tick processing (and consequently, can only wake one thread |
237 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
241 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
|
|
242 | |
|
|
243 | =cut |
|
|
244 | |
|
|
245 | sub wait_for_tick(); |
|
|
246 | sub wait_for_tick_begin(); |
238 | |
247 | |
239 | =item @cf::INVOKE_RESULTS |
248 | =item @cf::INVOKE_RESULTS |
240 | |
249 | |
241 | This array contains the results of the last C<invoke ()> call. When |
250 | This array contains the results of the last C<invoke ()> call. When |
242 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
251 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
… | |
… | |
305 | } |
314 | } |
306 | |
315 | |
307 | $EV::DIED = sub { |
316 | $EV::DIED = sub { |
308 | Carp::cluck "error in event callback: @_"; |
317 | Carp::cluck "error in event callback: @_"; |
309 | }; |
318 | }; |
|
|
319 | |
|
|
320 | ############################################################################# |
|
|
321 | |
|
|
322 | sub fork_call(&@); |
|
|
323 | sub get_slot($;$$); |
310 | |
324 | |
311 | ############################################################################# |
325 | ############################################################################# |
312 | |
326 | |
313 | =head2 UTILITY FUNCTIONS |
327 | =head2 UTILITY FUNCTIONS |
314 | |
328 | |
… | |
… | |
335 | $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; |
349 | $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; |
336 | $d |
350 | $d |
337 | } || "[unable to dump $_[0]: '$@']"; |
351 | } || "[unable to dump $_[0]: '$@']"; |
338 | } |
352 | } |
339 | |
353 | |
|
|
354 | =item $scalar = load_file $path |
|
|
355 | |
|
|
356 | Loads the given file from path and returns its contents. Croaks on error |
|
|
357 | and can block. |
|
|
358 | |
|
|
359 | =cut |
|
|
360 | |
|
|
361 | sub load_file($) { |
|
|
362 | 0 <= aio_load $_[0], my $data |
|
|
363 | or Carp::croak "$_[0]: $!"; |
|
|
364 | |
|
|
365 | $data |
|
|
366 | } |
|
|
367 | |
340 | =item $ref = cf::decode_json $json |
368 | =item $ref = cf::decode_json $json |
341 | |
369 | |
342 | Converts a JSON string into the corresponding perl data structure. |
370 | Converts a JSON string into the corresponding perl data structure. |
343 | |
371 | |
344 | =item $json = cf::encode_json $ref |
372 | =item $json = cf::encode_json $ref |
… | |
… | |
350 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
378 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
351 | |
379 | |
352 | sub encode_json($) { $json_coder->encode ($_[0]) } |
380 | sub encode_json($) { $json_coder->encode ($_[0]) } |
353 | sub decode_json($) { $json_coder->decode ($_[0]) } |
381 | sub decode_json($) { $json_coder->decode ($_[0]) } |
354 | |
382 | |
|
|
383 | =item $ref = cf::decode_storable $scalar |
|
|
384 | |
|
|
385 | Same as Coro::Storable::thaw, so blocks. |
|
|
386 | |
|
|
387 | =cut |
|
|
388 | |
|
|
389 | BEGIN { *decode_storable = \&Coro::Storable::thaw } |
|
|
390 | |
|
|
391 | =item $ref = cf::decode_yaml $scalar |
|
|
392 | |
|
|
393 | Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks). |
|
|
394 | |
|
|
395 | =cut |
|
|
396 | |
|
|
397 | sub decode_yaml($) { |
|
|
398 | fork_call { YAML::XS::Load $_[0] } @_ |
|
|
399 | } |
|
|
400 | |
|
|
401 | =item $scalar = cf::unlzf $scalar |
|
|
402 | |
|
|
403 | Same as Compress::LZF::compress, but takes server ticks into account, so |
|
|
404 | blocks. |
|
|
405 | |
|
|
406 | =cut |
|
|
407 | |
|
|
408 | sub unlzf($) { |
|
|
409 | # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine) |
|
|
410 | cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf"; |
|
|
411 | Compress::LZF::decompress $_[0] |
|
|
412 | } |
|
|
413 | |
355 | =item cf::post_init { BLOCK } |
414 | =item cf::post_init { BLOCK } |
356 | |
415 | |
357 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
416 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
358 | but I<before> the server starts ticking again. |
417 | but I<before> the server starts ticking again. |
359 | |
418 | |
360 | The cdoeblock will have a single boolean argument to indicate whether this |
419 | The codeblock will have a single boolean argument to indicate whether this |
361 | is a reload or not. |
420 | is a reload or not. |
362 | |
421 | |
363 | =cut |
422 | =cut |
364 | |
423 | |
365 | sub post_init(&) { |
424 | sub post_init(&) { |
366 | push @POST_INIT, shift; |
425 | push @POST_INIT, shift; |
|
|
426 | } |
|
|
427 | |
|
|
428 | sub _post_init { |
|
|
429 | trace "running post_init jobs"; |
|
|
430 | |
|
|
431 | # run them in parallel... |
|
|
432 | |
|
|
433 | my @join; |
|
|
434 | |
|
|
435 | while () { |
|
|
436 | push @join, map &Coro::async ($_, 0), @POST_INIT; |
|
|
437 | @POST_INIT = (); |
|
|
438 | |
|
|
439 | @join or last; |
|
|
440 | |
|
|
441 | (pop @join)->join; |
|
|
442 | } |
367 | } |
443 | } |
368 | |
444 | |
369 | =item cf::lock_wait $string |
445 | =item cf::lock_wait $string |
370 | |
446 | |
371 | Wait until the given lock is available. See cf::lock_acquire. |
447 | Wait until the given lock is available. See cf::lock_acquire. |
… | |
… | |
424 | EV::periodic $start, $interval, 0, $cb |
500 | EV::periodic $start, $interval, 0, $cb |
425 | } |
501 | } |
426 | |
502 | |
427 | =item cf::get_slot $time[, $priority[, $name]] |
503 | =item cf::get_slot $time[, $priority[, $name]] |
428 | |
504 | |
429 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
505 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
430 | This call blocks and returns only when you have at least C<$time> seconds |
506 | (default: 0): This call blocks and returns only when you have at least |
431 | of cpu time till the next tick. The slot is only valid till the next cede. |
507 | C<$time> seconds of cpu time till the next tick. The slot is only valid |
|
|
508 | till the next cede. |
|
|
509 | |
|
|
510 | Background jobs should use a priority les than zero, interactive jobs |
|
|
511 | should use 100 or more. |
432 | |
512 | |
433 | The optional C<$name> can be used to identify the job to run. It might be |
513 | The optional C<$name> can be used to identify the job to run. It might be |
434 | used for statistical purposes and should identify the same time-class. |
514 | used for statistical purposes and should identify the same time-class. |
435 | |
515 | |
436 | Useful for short background jobs. |
516 | Useful for short background jobs. |
… | |
… | |
576 | $EXT_CORO{$coro+0} = $coro; |
656 | $EXT_CORO{$coro+0} = $coro; |
577 | |
657 | |
578 | $coro |
658 | $coro |
579 | } |
659 | } |
580 | |
660 | |
581 | =item fork_call { }, $args |
661 | =item fork_call { }, @args |
582 | |
662 | |
583 | Executes the given code block with the given arguments in a seperate |
663 | Executes the given code block with the given arguments in a seperate |
584 | process, returning the results. Everything must be serialisable with |
664 | process, returning the results. Everything must be serialisable with |
585 | Coro::Storable. May, of course, block. Note that the executed sub may |
665 | Coro::Storable. May, of course, block. Note that the executed sub may |
586 | never block itself or use any form of event handling. |
666 | never block itself or use any form of event handling. |
587 | |
667 | |
588 | =cut |
668 | =cut |
589 | |
669 | |
|
|
670 | sub post_fork { |
|
|
671 | reset_signals; |
|
|
672 | } |
|
|
673 | |
590 | sub fork_call(&@) { |
674 | sub fork_call(&@) { |
591 | my ($cb, @args) = @_; |
675 | my ($cb, @args) = @_; |
592 | |
676 | |
593 | # we seemingly have to make a local copy of the whole thing, |
677 | # we seemingly have to make a local copy of the whole thing, |
594 | # otherwise perl prematurely frees the stuff :/ |
678 | # otherwise perl prematurely frees the stuff :/ |
595 | # TODO: investigate and fix (likely this will be rather laborious) |
679 | # TODO: investigate and fix (likely this will be rather laborious) |
596 | |
680 | |
597 | my @res = Coro::Util::fork_eval { |
681 | my @res = Coro::Util::fork_eval { |
598 | reset_signals; |
682 | cf::post_fork; |
599 | &$cb |
683 | &$cb |
600 | }, @args; |
684 | } @args; |
601 | |
685 | |
602 | wantarray ? @res : $res[-1] |
686 | wantarray ? @res : $res[-1] |
603 | } |
687 | } |
604 | |
688 | |
605 | sub objinfo { |
689 | sub objinfo { |
… | |
… | |
727 | |
811 | |
728 | my @data; |
812 | my @data; |
729 | my $md5; |
813 | my $md5; |
730 | |
814 | |
731 | for (0 .. $#$src) { |
815 | for (0 .. $#$src) { |
732 | 0 <= aio_load $src->[$_], $data[$_] |
816 | $data[$_] = load_file $src->[$_]; |
733 | or Carp::croak "$src->[$_]: $!"; |
|
|
734 | } |
817 | } |
735 | |
818 | |
736 | # if processing is expensive, check |
819 | # if processing is expensive, check |
737 | # checksum first |
820 | # checksum first |
738 | if (1) { |
821 | if (1) { |
… | |
… | |
1449 | |
1532 | |
1450 | my $active = eval $v->{source}; |
1533 | my $active = eval $v->{source}; |
1451 | |
1534 | |
1452 | if (length $@) { |
1535 | if (length $@) { |
1453 | error "$v->{path}: $@\n"; |
1536 | error "$v->{path}: $@\n"; |
1454 | undef $@; # work around perl 5.10.0 utf-8 caching bug |
|
|
1455 | |
1537 | |
1456 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1538 | cf::cleanup "mandatory extension '$k' failed to load, exiting." |
1457 | if exists $v->{meta}{mandatory}; |
1539 | if exists $v->{meta}{mandatory}; |
1458 | |
1540 | |
1459 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
1541 | warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; |
… | |
… | |
1640 | my $name = $pl->ob->name; |
1722 | my $name = $pl->ob->name; |
1641 | |
1723 | |
1642 | $pl->{deny_save} = 1; |
1724 | $pl->{deny_save} = 1; |
1643 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1725 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1644 | |
1726 | |
1645 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1727 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns; |
1646 | $pl->deactivate; |
1728 | $pl->deactivate; |
|
|
1729 | |
1647 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1730 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1648 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
1731 | $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns; |
|
|
1732 | ext::highscore::check ($pl->ob); |
|
|
1733 | |
1649 | $pl->ns->destroy if $pl->ns; |
1734 | $pl->ns->destroy if $pl->ns; |
1650 | |
1735 | |
1651 | my $path = playerdir $pl; |
1736 | my $path = playerdir $pl; |
1652 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1737 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1653 | aio_rename $path, $temp; |
1738 | aio_rename $path, $temp; |
… | |
… | |
1819 | sub generate_random_map { |
1904 | sub generate_random_map { |
1820 | my ($self, $rmp) = @_; |
1905 | my ($self, $rmp) = @_; |
1821 | |
1906 | |
1822 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1907 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1823 | |
1908 | |
1824 | # mit "rum" bekleckern, nicht |
|
|
1825 | $self->_create_random_map ( |
1909 | $self->_create_random_map ($rmp); |
1826 | $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, |
|
|
1827 | $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle}, |
|
|
1828 | $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, |
|
|
1829 | $rmp->{exit_on_final_map}, |
|
|
1830 | $rmp->{xsize}, $rmp->{ysize}, |
|
|
1831 | $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, |
|
|
1832 | $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, |
|
|
1833 | $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, |
|
|
1834 | $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, |
|
|
1835 | $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, |
|
|
1836 | (cf::region::find $rmp->{region}), $rmp->{custom} |
|
|
1837 | ) |
|
|
1838 | } |
1910 | } |
1839 | |
1911 | |
1840 | =item cf::map->register ($regex, $prio) |
1912 | =item cf::map->register ($regex, $prio) |
1841 | |
1913 | |
1842 | Register a handler for the map path matching the given regex at the |
1914 | Register a handler for the map path matching the given regex at the |
… | |
… | |
1868 | } |
1940 | } |
1869 | |
1941 | |
1870 | sub normalise { |
1942 | sub normalise { |
1871 | my ($path, $base) = @_; |
1943 | my ($path, $base) = @_; |
1872 | |
1944 | |
1873 | $path = "$path"; # make sure its a string |
1945 | $path = "$path"; # make sure it's a string |
1874 | |
1946 | |
1875 | $path =~ s/\.map$//; |
1947 | $path =~ s/\.map$//; |
1876 | |
1948 | |
1877 | # map plan: |
1949 | # map plan: |
1878 | # |
1950 | # |
… | |
… | |
1893 | $base =~ s{[^/]+/?$}{}; |
1965 | $base =~ s{[^/]+/?$}{}; |
1894 | $path = "$base/$path"; |
1966 | $path = "$base/$path"; |
1895 | } |
1967 | } |
1896 | |
1968 | |
1897 | for ($path) { |
1969 | for ($path) { |
1898 | redo if s{//}{/}; |
|
|
1899 | redo if s{/\.?/}{/}; |
1970 | redo if s{/\.?/}{/}; |
1900 | redo if s{/[^/]+/\.\./}{/}; |
1971 | redo if s{/[^/]+/\.\./}{/}; |
1901 | } |
1972 | } |
1902 | |
1973 | |
1903 | $path |
1974 | $path |
… | |
… | |
1917 | $self->init; # pass $1 etc. |
1988 | $self->init; # pass $1 etc. |
1918 | return $self; |
1989 | return $self; |
1919 | } |
1990 | } |
1920 | } |
1991 | } |
1921 | |
1992 | |
1922 | Carp::cluck "unable to resolve path '$path' (base '$base')."; |
1993 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1923 | () |
1994 | () |
1924 | } |
1995 | } |
1925 | |
1996 | |
1926 | sub init { |
1997 | sub init { |
1927 | my ($self) = @_; |
1998 | my ($self) = @_; |
… | |
… | |
2049 | } |
2120 | } |
2050 | |
2121 | |
2051 | sub find; |
2122 | sub find; |
2052 | sub find { |
2123 | sub find { |
2053 | my ($path, $origin) = @_; |
2124 | my ($path, $origin) = @_; |
|
|
2125 | |
|
|
2126 | cf::cede_to_tick; |
2054 | |
2127 | |
2055 | $path = normalise $path, $origin && $origin->path; |
2128 | $path = normalise $path, $origin && $origin->path; |
2056 | |
2129 | |
2057 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2130 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2058 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2131 | my $guard2 = cf::lock_acquire "map_find:$path"; |
… | |
… | |
2143 | |
2216 | |
2144 | $self->in_memory (cf::MAP_ACTIVE); |
2217 | $self->in_memory (cf::MAP_ACTIVE); |
2145 | } |
2218 | } |
2146 | |
2219 | |
2147 | $self->post_load; |
2220 | $self->post_load; |
|
|
2221 | |
|
|
2222 | 1 |
2148 | } |
2223 | } |
2149 | |
2224 | |
2150 | # customize the map for a given player, i.e. |
2225 | # customize the map for a given player, i.e. |
2151 | # return the _real_ map. used by e.g. per-player |
2226 | # return the _real_ map. used by e.g. per-player |
2152 | # maps to change the path to ~playername/mappath |
2227 | # maps to change the path to ~playername/mappath |
… | |
… | |
3367 | |
3442 | |
3368 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3443 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3369 | |
3444 | |
3370 | trace "loading facedata from $path\n"; |
3445 | trace "loading facedata from $path\n"; |
3371 | |
3446 | |
3372 | my $facedata; |
3447 | my $facedata = decode_storable load_file $path; |
3373 | 0 < aio_load $path, $facedata |
|
|
3374 | or die "$path: $!"; |
|
|
3375 | |
|
|
3376 | $facedata = Coro::Storable::thaw $facedata; |
|
|
3377 | |
3448 | |
3378 | $facedata->{version} == 2 |
3449 | $facedata->{version} == 2 |
3379 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3450 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3380 | |
3451 | |
3381 | # patch in the exptable |
3452 | # patch in the exptable |
… | |
… | |
3395 | |
3466 | |
3396 | cf::face::set_visibility $idx, $info->{visibility}; |
3467 | cf::face::set_visibility $idx, $info->{visibility}; |
3397 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3468 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3398 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3469 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3399 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3470 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
|
|
3471 | cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; |
3400 | |
3472 | |
3401 | cf::cede_to_tick; |
3473 | cf::cede_to_tick; |
3402 | } |
3474 | } |
3403 | |
3475 | |
3404 | while (my ($face, $info) = each %$faces) { |
3476 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
3499 | } |
3571 | } |
3500 | |
3572 | |
3501 | sub reload_sound { |
3573 | sub reload_sound { |
3502 | trace "loading sound config from $DATADIR/sound\n"; |
3574 | trace "loading sound config from $DATADIR/sound\n"; |
3503 | |
3575 | |
3504 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
|
|
3505 | or die "$DATADIR/sound $!"; |
|
|
3506 | |
|
|
3507 | my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); |
3576 | my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound"); |
3508 | |
3577 | |
3509 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3578 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3510 | my $sound = $soundconf->{compat}[$_] |
3579 | my $sound = $soundconf->{compat}[$_] |
3511 | or next; |
3580 | or next; |
3512 | |
3581 | |
… | |
… | |
3522 | } |
3591 | } |
3523 | |
3592 | |
3524 | sub reload_resources { |
3593 | sub reload_resources { |
3525 | trace "reloading resource files...\n"; |
3594 | trace "reloading resource files...\n"; |
3526 | |
3595 | |
|
|
3596 | reload_exp_table; |
|
|
3597 | reload_materials; |
3527 | reload_facedata; |
3598 | reload_facedata; |
3528 | reload_sound; |
3599 | reload_sound; |
3529 | reload_archetypes; |
3600 | reload_archetypes; |
3530 | reload_regions; |
3601 | reload_regions; |
3531 | reload_treasures; |
3602 | reload_treasures; |
… | |
… | |
3534 | } |
3605 | } |
3535 | |
3606 | |
3536 | sub reload_config { |
3607 | sub reload_config { |
3537 | trace "reloading config file...\n"; |
3608 | trace "reloading config file...\n"; |
3538 | |
3609 | |
3539 | open my $fh, "<:utf8", "$CONFDIR/config" |
3610 | my $config = load_file "$CONFDIR/config"; |
3540 | or return; |
3611 | utf8::decode $config; |
3541 | |
3612 | *CFG = decode_yaml $config; |
3542 | local $/; |
|
|
3543 | *CFG = YAML::XS::Load scalar <$fh>; |
|
|
3544 | |
3613 | |
3545 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3614 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3546 | |
3615 | |
3547 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3616 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3548 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3617 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
… | |
… | |
3552 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3621 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3553 | and die "WARNING: m(un)lockall failed: $!\n"; |
3622 | and die "WARNING: m(un)lockall failed: $!\n"; |
3554 | }; |
3623 | }; |
3555 | warn $@ if $@; |
3624 | warn $@ if $@; |
3556 | } |
3625 | } |
3557 | |
|
|
3558 | trace "finished reloading resource files\n"; |
|
|
3559 | } |
3626 | } |
3560 | |
3627 | |
3561 | sub pidfile() { |
3628 | sub pidfile() { |
3562 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3629 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3563 | or die "$PIDFILE: $!"; |
3630 | or die "$PIDFILE: $!"; |
… | |
… | |
3588 | |
3655 | |
3589 | sub main { |
3656 | sub main { |
3590 | cf::init_globals; # initialise logging |
3657 | cf::init_globals; # initialise logging |
3591 | |
3658 | |
3592 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3659 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3593 | LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3660 | LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3594 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3661 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3595 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3662 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3596 | |
3663 | |
3597 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3664 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3598 | |
3665 | |
… | |
… | |
3606 | }; |
3673 | }; |
3607 | |
3674 | |
3608 | evthread_start IO::AIO::poll_fileno; |
3675 | evthread_start IO::AIO::poll_fileno; |
3609 | |
3676 | |
3610 | cf::sync_job { |
3677 | cf::sync_job { |
3611 | cf::init_experience; |
3678 | cf::incloader::init (); |
|
|
3679 | |
3612 | cf::init_anim; |
3680 | cf::init_anim; |
3613 | cf::init_attackmess; |
3681 | cf::init_attackmess; |
3614 | cf::init_dynamic; |
3682 | cf::init_dynamic; |
3615 | |
3683 | |
3616 | cf::load_settings; |
3684 | cf::load_settings; |
3617 | cf::load_materials; |
|
|
3618 | |
3685 | |
3619 | reload_resources; |
3686 | reload_resources; |
3620 | reload_config; |
3687 | reload_config; |
3621 | db_init; |
3688 | db_init; |
3622 | |
3689 | |
… | |
… | |
3634 | |
3701 | |
3635 | # no (long-running) fork's whatsoever before this point(!) |
3702 | # no (long-running) fork's whatsoever before this point(!) |
3636 | use POSIX (); |
3703 | use POSIX (); |
3637 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3704 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3638 | |
3705 | |
3639 | (pop @POST_INIT)->(0) while @POST_INIT; |
3706 | cf::_post_init 0; |
3640 | }; |
3707 | }; |
3641 | |
3708 | |
3642 | cf::object::thawer::errors_are_fatal 0; |
3709 | cf::object::thawer::errors_are_fatal 0; |
3643 | info "parse errors in files are no longer fatal from this point on.\n"; |
3710 | info "parse errors in files are no longer fatal from this point on.\n"; |
3644 | |
3711 | |
|
|
3712 | my $free_main; $free_main = EV::idle sub { |
|
|
3713 | undef $free_main; |
|
|
3714 | undef &main; # free gobs of memory :) |
|
|
3715 | }; |
|
|
3716 | |
3645 | main_loop; |
3717 | goto &main_loop; |
3646 | } |
3718 | } |
3647 | |
3719 | |
3648 | ############################################################################# |
3720 | ############################################################################# |
3649 | # initialisation and cleanup |
3721 | # initialisation and cleanup |
3650 | |
3722 | |
… | |
… | |
3851 | } |
3923 | } |
3852 | } |
3924 | } |
3853 | |
3925 | |
3854 | sub do_reload_perl() { |
3926 | sub do_reload_perl() { |
3855 | # can/must only be called in main |
3927 | # can/must only be called in main |
3856 | if (in_main) { |
3928 | unless (in_main) { |
3857 | error "can only reload from main coroutine"; |
3929 | error "can only reload from main coroutine"; |
3858 | return; |
3930 | return; |
3859 | } |
3931 | } |
3860 | |
3932 | |
3861 | return if $RELOAD++; |
3933 | return if $RELOAD++; |
3862 | |
3934 | |
3863 | my $t1 = AE::time; |
3935 | my $t1 = AE::time; |
3864 | |
3936 | |
3865 | while ($RELOAD) { |
3937 | while ($RELOAD) { |
|
|
3938 | cf::get_slot 0.1, -1, "reload_perl"; |
3866 | info "reloading..."; |
3939 | info "perl_reload: reloading..."; |
3867 | |
3940 | |
3868 | trace "entering sync_job"; |
3941 | trace "perl_reload: entering sync_job"; |
3869 | |
3942 | |
3870 | cf::sync_job { |
3943 | cf::sync_job { |
3871 | cf::emergency_save; |
3944 | #cf::emergency_save; |
3872 | |
3945 | |
3873 | trace "cancelling all extension coros"; |
3946 | trace "perl_reload: cancelling all extension coros"; |
3874 | $_->cancel for values %EXT_CORO; |
3947 | $_->cancel for values %EXT_CORO; |
3875 | %EXT_CORO = (); |
3948 | %EXT_CORO = (); |
3876 | |
3949 | |
3877 | trace "removing commands"; |
3950 | trace "perl_reload: removing commands"; |
3878 | %COMMAND = (); |
3951 | %COMMAND = (); |
3879 | |
3952 | |
3880 | trace "removing ext/exti commands"; |
3953 | trace "perl_reload: removing ext/exti commands"; |
3881 | %EXTCMD = (); |
3954 | %EXTCMD = (); |
3882 | %EXTICMD = (); |
3955 | %EXTICMD = (); |
3883 | |
3956 | |
3884 | trace "unloading/nuking all extensions"; |
3957 | trace "perl_reload: unloading/nuking all extensions"; |
3885 | for my $pkg (@EXTS) { |
3958 | for my $pkg (@EXTS) { |
3886 | trace "... unloading $pkg"; |
3959 | trace "... unloading $pkg"; |
3887 | |
3960 | |
3888 | if (my $cb = $pkg->can ("unload")) { |
3961 | if (my $cb = $pkg->can ("unload")) { |
3889 | eval { |
3962 | eval { |
… | |
… | |
3894 | |
3967 | |
3895 | trace "... clearing $pkg"; |
3968 | trace "... clearing $pkg"; |
3896 | clear_package $pkg; |
3969 | clear_package $pkg; |
3897 | } |
3970 | } |
3898 | |
3971 | |
3899 | trace "unloading all perl modules loaded from $LIBDIR"; |
3972 | trace "perl_reload: unloading all perl modules loaded from $LIBDIR"; |
3900 | while (my ($k, $v) = each %INC) { |
3973 | while (my ($k, $v) = each %INC) { |
3901 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3974 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3902 | |
3975 | |
3903 | trace "... unloading $k"; |
3976 | trace "... unloading $k"; |
3904 | delete $INC{$k}; |
3977 | delete $INC{$k}; |
… | |
… | |
3911 | } |
3984 | } |
3912 | |
3985 | |
3913 | clear_package $k; |
3986 | clear_package $k; |
3914 | } |
3987 | } |
3915 | |
3988 | |
3916 | trace "getting rid of safe::, as good as possible"; |
3989 | trace "perl_reload: getting rid of safe::, as good as possible"; |
3917 | clear_package "safe::$_" |
3990 | clear_package "safe::$_" |
3918 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3991 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3919 | |
3992 | |
3920 | trace "unloading cf.pm \"a bit\""; |
3993 | trace "perl_reload: unloading cf.pm \"a bit\""; |
3921 | delete $INC{"cf.pm"}; |
3994 | delete $INC{"cf.pm"}; |
3922 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3995 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3923 | |
3996 | |
3924 | # don't, removes xs symbols, too, |
3997 | # don't, removes xs symbols, too, |
3925 | # and global variables created in xs |
3998 | # and global variables created in xs |
3926 | #clear_package __PACKAGE__; |
3999 | #clear_package __PACKAGE__; |
3927 | |
4000 | |
3928 | info "unload completed, starting to reload now"; |
4001 | info "perl_reload: unload completed, starting to reload now"; |
3929 | |
4002 | |
3930 | trace "reloading cf.pm"; |
4003 | trace "perl_reload: reloading cf.pm"; |
3931 | require cf; |
4004 | require cf; |
3932 | cf::_connect_to_perl_1; |
4005 | cf::_connect_to_perl_1; |
3933 | |
4006 | |
3934 | trace "loading config and database again"; |
4007 | trace "perl_reload: loading config and database again"; |
3935 | cf::reload_config; |
4008 | cf::reload_config; |
3936 | |
4009 | |
3937 | trace "loading extensions"; |
4010 | trace "perl_reload: loading extensions"; |
3938 | cf::load_extensions; |
4011 | cf::load_extensions; |
3939 | |
4012 | |
3940 | if ($REATTACH_ON_RELOAD) { |
4013 | if ($REATTACH_ON_RELOAD) { |
3941 | trace "reattaching attachments to objects/players"; |
4014 | trace "perl_reload: reattaching attachments to objects/players"; |
3942 | _global_reattach; # objects, sockets |
4015 | _global_reattach; # objects, sockets |
3943 | trace "reattaching attachments to maps"; |
4016 | trace "perl_reload: reattaching attachments to maps"; |
3944 | reattach $_ for values %MAP; |
4017 | reattach $_ for values %MAP; |
3945 | trace "reattaching attachments to players"; |
4018 | trace "perl_reload: reattaching attachments to players"; |
3946 | reattach $_ for values %PLAYER; |
4019 | reattach $_ for values %PLAYER; |
3947 | } |
4020 | } |
3948 | |
4021 | |
3949 | trace "running post_init jobs"; |
4022 | cf::_post_init 1; |
3950 | (pop @POST_INIT)->(1) while @POST_INIT; |
|
|
3951 | |
4023 | |
3952 | trace "leaving sync_job"; |
4024 | trace "perl_reload: leaving sync_job"; |
3953 | |
4025 | |
3954 | 1 |
4026 | 1 |
3955 | } or do { |
4027 | } or do { |
3956 | error $@; |
4028 | error $@; |
3957 | cf::cleanup "error while reloading, exiting."; |
4029 | cf::cleanup "perl_reload: error, exiting."; |
3958 | }; |
4030 | }; |
3959 | |
4031 | |
3960 | info "reloaded"; |
|
|
3961 | --$RELOAD; |
4032 | --$RELOAD; |
3962 | } |
4033 | } |
3963 | |
4034 | |
3964 | $t1 = AE::time - $t1; |
4035 | $t1 = AE::time - $t1; |
3965 | info "reload completed in ${t1}s\n"; |
4036 | info "perl_reload: completed in ${t1}s\n"; |
3966 | }; |
4037 | }; |
3967 | |
4038 | |
3968 | our $RELOAD_WATCHER; # used only during reload |
4039 | our $RELOAD_WATCHER; # used only during reload |
3969 | |
4040 | |
3970 | sub reload_perl() { |
4041 | sub reload_perl() { |
… | |
… | |
3991 | reload_perl; |
4062 | reload_perl; |
3992 | }; |
4063 | }; |
3993 | } |
4064 | } |
3994 | }; |
4065 | }; |
3995 | |
4066 | |
3996 | unshift @INC, $LIBDIR; |
4067 | ############################################################################# |
3997 | |
4068 | |
3998 | my $bug_warning = 0; |
4069 | my $bug_warning = 0; |
3999 | |
4070 | |
4000 | our @WAIT_FOR_TICK; |
4071 | our @WAIT_FOR_TICK; |
4001 | our @WAIT_FOR_TICK_BEGIN; |
4072 | our @WAIT_FOR_TICK_BEGIN; |
4002 | |
4073 | |
4003 | sub wait_for_tick { |
4074 | sub wait_for_tick() { |
4004 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4075 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4005 | |
4076 | |
4006 | my $signal = new Coro::Signal; |
4077 | my $signal = new Coro::Signal; |
4007 | push @WAIT_FOR_TICK, $signal; |
4078 | push @WAIT_FOR_TICK, $signal; |
4008 | $signal->wait; |
4079 | $signal->wait; |
4009 | } |
4080 | } |
4010 | |
4081 | |
4011 | sub wait_for_tick_begin { |
4082 | sub wait_for_tick_begin() { |
4012 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4083 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
4013 | |
4084 | |
4014 | my $signal = new Coro::Signal; |
4085 | my $signal = new Coro::Signal; |
4015 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4086 | push @WAIT_FOR_TICK_BEGIN, $signal; |
4016 | $signal->wait; |
4087 | $signal->wait; |
… | |
… | |
4103 | IO::AIO::min_parallel 8; |
4174 | IO::AIO::min_parallel 8; |
4104 | IO::AIO::max_poll_time $TICK * 0.1; |
4175 | IO::AIO::max_poll_time $TICK * 0.1; |
4105 | undef $AnyEvent::AIO::WATCHER; |
4176 | undef $AnyEvent::AIO::WATCHER; |
4106 | } |
4177 | } |
4107 | |
4178 | |
4108 | my $_log_backtrace; |
4179 | our $_log_backtrace; |
|
|
4180 | our $_log_backtrace_last; |
4109 | |
4181 | |
4110 | sub _log_backtrace { |
4182 | sub _log_backtrace { |
4111 | my ($msg, @addr) = @_; |
4183 | my ($msg, @addr) = @_; |
4112 | |
4184 | |
4113 | $msg =~ s/\n//; |
4185 | $msg =~ s/\n$//; |
4114 | |
4186 | |
|
|
4187 | if ($_log_backtrace_last eq $msg) { |
|
|
4188 | LOG llevInfo, "[ABT] $msg\n"; |
|
|
4189 | LOG llevInfo, "[ABT] [duplicate, suppressed]\n"; |
4115 | # limit the # of concurrent backtraces |
4190 | # limit the # of concurrent backtraces |
4116 | if ($_log_backtrace < 2) { |
4191 | } elsif ($_log_backtrace < 2) { |
|
|
4192 | $_log_backtrace_last = $msg; |
4117 | ++$_log_backtrace; |
4193 | ++$_log_backtrace; |
4118 | my $perl_bt = Carp::longmess $msg; |
4194 | my $perl_bt = Carp::longmess $msg; |
4119 | async { |
4195 | async { |
4120 | $Coro::current->{desc} = "abt $msg"; |
4196 | $Coro::current->{desc} = "abt $msg"; |
4121 | |
4197 | |
… | |
… | |
4141 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4217 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4142 | --$_log_backtrace; |
4218 | --$_log_backtrace; |
4143 | }; |
4219 | }; |
4144 | } else { |
4220 | } else { |
4145 | LOG llevInfo, "[ABT] $msg\n"; |
4221 | LOG llevInfo, "[ABT] $msg\n"; |
4146 | LOG llevInfo, "[ABT] [suppressed]\n"; |
4222 | LOG llevInfo, "[ABT] [overload, suppressed]\n"; |
4147 | } |
4223 | } |
4148 | } |
4224 | } |
4149 | |
4225 | |
4150 | # load additional modules |
4226 | # load additional modules |
4151 | require "cf/$_.pm" for @EXTRA_MODULES; |
4227 | require "cf/$_.pm" for @EXTRA_MODULES; |