1 | # |
1 | # |
2 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | # |
3 | # |
4 | # Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | # Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | # |
5 | # |
6 | # Deliantra is free software: you can redistribute it and/or modify it under |
6 | # Deliantra is free software: you can redistribute it and/or modify it under |
7 | # the terms of the Affero GNU General Public License as published by the |
7 | # the terms of the Affero GNU General Public License as published by the |
8 | # Free Software Foundation, either version 3 of the License, or (at your |
8 | # Free Software Foundation, either version 3 of the License, or (at your |
9 | # option) any later version. |
9 | # option) any later version. |
… | |
… | |
93 | our @EVENT; |
93 | our @EVENT; |
94 | our @REFLECT; # set by XS |
94 | our @REFLECT; # set by XS |
95 | our %REFLECT; # set by us |
95 | our %REFLECT; # set by us |
96 | |
96 | |
97 | our $CONFDIR = confdir; |
97 | our $CONFDIR = confdir; |
|
|
98 | |
98 | our $DATADIR = datadir; |
99 | our $DATADIR = datadir; |
99 | our $LIBDIR = "$DATADIR/ext"; |
100 | our $LIBDIR = "$DATADIR/ext"; |
100 | our $PODDIR = "$DATADIR/pod"; |
101 | our $PODDIR = "$DATADIR/pod"; |
101 | our $MAPDIR = "$DATADIR/" . mapdir; |
102 | our $MAPDIR = "$DATADIR/" . mapdir; |
|
|
103 | |
102 | our $LOCALDIR = localdir; |
104 | our $LOCALDIR = localdir; |
103 | our $TMPDIR = "$LOCALDIR/" . tmpdir; |
105 | our $TMPDIR = "$LOCALDIR/" . tmpdir; |
104 | our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; |
106 | our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; |
105 | our $PLAYERDIR = "$LOCALDIR/" . playerdir; |
107 | our $PLAYERDIR = "$LOCALDIR/" . playerdir; |
106 | our $RANDOMDIR = "$LOCALDIR/random"; |
108 | our $RANDOMDIR = "$LOCALDIR/random"; |
… | |
… | |
312 | } |
314 | } |
313 | |
315 | |
314 | $EV::DIED = sub { |
316 | $EV::DIED = sub { |
315 | Carp::cluck "error in event callback: @_"; |
317 | Carp::cluck "error in event callback: @_"; |
316 | }; |
318 | }; |
|
|
319 | |
|
|
320 | ############################################################################# |
|
|
321 | |
|
|
322 | sub fork_call(&@); |
|
|
323 | sub get_slot($;$$); |
317 | |
324 | |
318 | ############################################################################# |
325 | ############################################################################# |
319 | |
326 | |
320 | =head2 UTILITY FUNCTIONS |
327 | =head2 UTILITY FUNCTIONS |
321 | |
328 | |
… | |
… | |
342 | $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; |
343 | $d |
350 | $d |
344 | } || "[unable to dump $_[0]: '$@']"; |
351 | } || "[unable to dump $_[0]: '$@']"; |
345 | } |
352 | } |
346 | |
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 | |
347 | =item $ref = cf::decode_json $json |
368 | =item $ref = cf::decode_json $json |
348 | |
369 | |
349 | Converts a JSON string into the corresponding perl data structure. |
370 | Converts a JSON string into the corresponding perl data structure. |
350 | |
371 | |
351 | =item $json = cf::encode_json $ref |
372 | =item $json = cf::encode_json $ref |
… | |
… | |
357 | 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 |
358 | |
379 | |
359 | sub encode_json($) { $json_coder->encode ($_[0]) } |
380 | sub encode_json($) { $json_coder->encode ($_[0]) } |
360 | sub decode_json($) { $json_coder->decode ($_[0]) } |
381 | sub decode_json($) { $json_coder->decode ($_[0]) } |
361 | |
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 | |
362 | =item cf::post_init { BLOCK } |
414 | =item cf::post_init { BLOCK } |
363 | |
415 | |
364 | 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, |
365 | but I<before> the server starts ticking again. |
417 | but I<before> the server starts ticking again. |
366 | |
418 | |
367 | 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 |
368 | is a reload or not. |
420 | is a reload or not. |
369 | |
421 | |
370 | =cut |
422 | =cut |
371 | |
423 | |
372 | sub post_init(&) { |
424 | sub post_init(&) { |
373 | 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 | } |
374 | } |
443 | } |
375 | |
444 | |
376 | =item cf::lock_wait $string |
445 | =item cf::lock_wait $string |
377 | |
446 | |
378 | Wait until the given lock is available. See cf::lock_acquire. |
447 | Wait until the given lock is available. See cf::lock_acquire. |
… | |
… | |
431 | EV::periodic $start, $interval, 0, $cb |
500 | EV::periodic $start, $interval, 0, $cb |
432 | } |
501 | } |
433 | |
502 | |
434 | =item cf::get_slot $time[, $priority[, $name]] |
503 | =item cf::get_slot $time[, $priority[, $name]] |
435 | |
504 | |
436 | Allocate $time seconds of blocking CPU time at priority C<$priority>: |
505 | Allocate $time seconds of blocking CPU time at priority C<$priority> |
437 | 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 |
438 | 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. |
439 | |
512 | |
440 | 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 |
441 | used for statistical purposes and should identify the same time-class. |
514 | used for statistical purposes and should identify the same time-class. |
442 | |
515 | |
443 | Useful for short background jobs. |
516 | Useful for short background jobs. |
… | |
… | |
583 | $EXT_CORO{$coro+0} = $coro; |
656 | $EXT_CORO{$coro+0} = $coro; |
584 | |
657 | |
585 | $coro |
658 | $coro |
586 | } |
659 | } |
587 | |
660 | |
588 | =item fork_call { }, $args |
661 | =item fork_call { }, @args |
589 | |
662 | |
590 | 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 |
591 | process, returning the results. Everything must be serialisable with |
664 | process, returning the results. Everything must be serialisable with |
592 | 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 |
593 | never block itself or use any form of event handling. |
666 | never block itself or use any form of event handling. |
… | |
… | |
606 | # TODO: investigate and fix (likely this will be rather laborious) |
679 | # TODO: investigate and fix (likely this will be rather laborious) |
607 | |
680 | |
608 | my @res = Coro::Util::fork_eval { |
681 | my @res = Coro::Util::fork_eval { |
609 | cf::post_fork; |
682 | cf::post_fork; |
610 | &$cb |
683 | &$cb |
611 | }, @args; |
684 | } @args; |
612 | |
685 | |
613 | wantarray ? @res : $res[-1] |
686 | wantarray ? @res : $res[-1] |
614 | } |
687 | } |
615 | |
688 | |
616 | sub objinfo { |
689 | sub objinfo { |
… | |
… | |
738 | |
811 | |
739 | my @data; |
812 | my @data; |
740 | my $md5; |
813 | my $md5; |
741 | |
814 | |
742 | for (0 .. $#$src) { |
815 | for (0 .. $#$src) { |
743 | 0 <= aio_load $src->[$_], $data[$_] |
816 | $data[$_] = load_file $src->[$_]; |
744 | or Carp::croak "$src->[$_]: $!"; |
|
|
745 | } |
817 | } |
746 | |
818 | |
747 | # if processing is expensive, check |
819 | # if processing is expensive, check |
748 | # checksum first |
820 | # checksum first |
749 | if (1) { |
821 | if (1) { |
… | |
… | |
1483 | |
1555 | |
1484 | while (my ($k, $v) = each %todo) { |
1556 | while (my ($k, $v) = each %todo) { |
1485 | cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." |
1557 | cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." |
1486 | if exists $v->{meta}{mandatory}; |
1558 | if exists $v->{meta}{mandatory}; |
1487 | } |
1559 | } |
|
|
1560 | |
|
|
1561 | last; |
1488 | } |
1562 | } |
1489 | } |
1563 | } |
1490 | }; |
1564 | }; |
1491 | } |
1565 | } |
1492 | |
1566 | |
… | |
… | |
1650 | my $name = $pl->ob->name; |
1724 | my $name = $pl->ob->name; |
1651 | |
1725 | |
1652 | $pl->{deny_save} = 1; |
1726 | $pl->{deny_save} = 1; |
1653 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1727 | $pl->password ("*"); # this should lock out the player until we have nuked the dir |
1654 | |
1728 | |
1655 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; |
1729 | $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns; |
1656 | $pl->deactivate; |
1730 | $pl->deactivate; |
1657 | |
1731 | |
1658 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
1732 | my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; |
|
|
1733 | $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns; |
1659 | ext::highscore::check ($pl->ob); |
1734 | ext::highscore::check ($pl->ob); |
1660 | |
1735 | |
1661 | $pl->invoke (cf::EVENT_PLAYER_QUIT); |
|
|
1662 | $pl->ns->destroy if $pl->ns; |
1736 | $pl->ns->destroy if $pl->ns; |
1663 | |
1737 | |
1664 | my $path = playerdir $pl; |
1738 | my $path = playerdir $pl; |
1665 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1739 | my $temp = "$path~$cf::RUNTIME~deleting~"; |
1666 | aio_rename $path, $temp; |
1740 | aio_rename $path, $temp; |
… | |
… | |
1832 | sub generate_random_map { |
1906 | sub generate_random_map { |
1833 | my ($self, $rmp) = @_; |
1907 | my ($self, $rmp) = @_; |
1834 | |
1908 | |
1835 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1909 | my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM |
1836 | |
1910 | |
1837 | # mit "rum" bekleckern, nicht |
|
|
1838 | $self->_create_random_map ( |
1911 | $self->_create_random_map ($rmp); |
1839 | $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, |
|
|
1840 | $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle}, |
|
|
1841 | $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, |
|
|
1842 | $rmp->{exit_on_final_map}, |
|
|
1843 | $rmp->{xsize}, $rmp->{ysize}, |
|
|
1844 | $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, |
|
|
1845 | $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, |
|
|
1846 | $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, |
|
|
1847 | $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, |
|
|
1848 | $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, |
|
|
1849 | (cf::region::find $rmp->{region}), $rmp->{custom} |
|
|
1850 | ) |
|
|
1851 | } |
1912 | } |
1852 | |
1913 | |
1853 | =item cf::map->register ($regex, $prio) |
1914 | =item cf::map->register ($regex, $prio) |
1854 | |
1915 | |
1855 | Register a handler for the map path matching the given regex at the |
1916 | Register a handler for the map path matching the given regex at the |
… | |
… | |
1893 | # {... are special paths that are not being touched |
1954 | # {... are special paths that are not being touched |
1894 | # ?xxx/... are special absolute paths |
1955 | # ?xxx/... are special absolute paths |
1895 | # ?random/... random maps |
1956 | # ?random/... random maps |
1896 | # /... normal maps |
1957 | # /... normal maps |
1897 | # ~user/... per-player map of a specific user |
1958 | # ~user/... per-player map of a specific user |
|
|
1959 | # !up !down for quad maps, or other maps with up/down layers |
1898 | |
1960 | |
1899 | $path =~ s/$PATH_SEP/\//go; |
1961 | $path =~ s/$PATH_SEP/\//go; |
1900 | |
1962 | |
1901 | # treat it as relative path if it starts with |
1963 | # treat it as relative path if it starts with |
1902 | # something that looks reasonable |
1964 | # something that looks reasonable |
1903 | if ($path =~ m{^(?:\./|\.\./|\w)}) { |
1965 | if ($path =~ m{^(?:\./|\.\./|\w)}) { |
1904 | $base or Carp::carp "normalise called with relative path and no base: '$path'"; |
1966 | $base or Carp::carp "normalise called with relative path and no base: '$path'"; |
1905 | |
1967 | |
1906 | $base =~ s{[^/]+/?$}{}; |
1968 | $base =~ s{[^/]+/?$}{}; |
1907 | $path = "$base/$path"; |
1969 | $path = "$base/$path"; |
|
|
1970 | |
|
|
1971 | } elsif ($path eq '!up') { |
|
|
1972 | $base && ref $base |
|
|
1973 | or Carp::carp "normalise called with relative tile path and no base: '$path'"; |
|
|
1974 | |
|
|
1975 | my $uppth = $base->tile_path (cf::TILE_UP); |
|
|
1976 | $path = $uppth if $uppth; |
|
|
1977 | |
|
|
1978 | } elsif ($path eq '!down') { |
|
|
1979 | $base && ref $base |
|
|
1980 | or Carp::carp "normalise called with relative tile path and no base: '$path'"; |
|
|
1981 | |
|
|
1982 | my $dpth = $base->tile_path (cf::TILE_DOWN); |
|
|
1983 | $path = $dpth if $dpth; |
1908 | } |
1984 | } |
1909 | |
1985 | |
1910 | for ($path) { |
1986 | for ($path) { |
1911 | redo if s{//}{/}; |
|
|
1912 | redo if s{/\.?/}{/}; |
1987 | redo if s{/\.?/}{/}; |
1913 | redo if s{/[^/]+/\.\./}{/}; |
1988 | redo if s{/[^/]+/\.\./}{/}; |
1914 | } |
1989 | } |
1915 | |
1990 | |
1916 | $path |
1991 | $path |
… | |
… | |
1934 | |
2009 | |
1935 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
2010 | Carp::cluck "unable to resolve path '$path' (base '$base')"; |
1936 | () |
2011 | () |
1937 | } |
2012 | } |
1938 | |
2013 | |
|
|
2014 | # may re-bless or do other evil things |
1939 | sub init { |
2015 | sub init { |
1940 | my ($self) = @_; |
2016 | my ($self) = @_; |
1941 | |
2017 | |
1942 | $self |
2018 | $self |
1943 | } |
2019 | } |
… | |
… | |
2065 | sub find { |
2141 | sub find { |
2066 | my ($path, $origin) = @_; |
2142 | my ($path, $origin) = @_; |
2067 | |
2143 | |
2068 | cf::cede_to_tick; |
2144 | cf::cede_to_tick; |
2069 | |
2145 | |
2070 | $path = normalise $path, $origin && $origin->path; |
2146 | $path = normalise $path, $origin; |
2071 | |
2147 | |
2072 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2148 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
2073 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2149 | my $guard2 = cf::lock_acquire "map_find:$path"; |
2074 | |
2150 | |
2075 | $cf::MAP{$path} || do { |
2151 | $cf::MAP{$path} || do { |
… | |
… | |
2115 | $self->alloc; |
2191 | $self->alloc; |
2116 | |
2192 | |
2117 | $self->pre_load; |
2193 | $self->pre_load; |
2118 | cf::cede_to_tick; |
2194 | cf::cede_to_tick; |
2119 | |
2195 | |
|
|
2196 | if (exists $self->{load_path}) { |
2120 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2197 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
2121 | $f->skip_block; |
2198 | $f->skip_block; |
2122 | $self->_load_objects ($f) |
2199 | $self->_load_objects ($f) |
2123 | or return; |
2200 | or return; |
2124 | |
2201 | |
2125 | $self->post_load_original |
2202 | $self->post_load_original |
2126 | if delete $self->{load_original}; |
2203 | if delete $self->{load_original}; |
2127 | |
2204 | |
2128 | if (my $uniq = $self->uniq_path) { |
2205 | if (my $uniq = $self->uniq_path) { |
2129 | utf8::encode $uniq; |
2206 | utf8::encode $uniq; |
2130 | unless (aio_stat $uniq) { |
2207 | unless (aio_stat $uniq) { |
2131 | if (my $f = new_from_file cf::object::thawer $uniq) { |
2208 | if (my $f = new_from_file cf::object::thawer $uniq) { |
2132 | $self->clear_unique_items; |
2209 | $self->clear_unique_items; |
2133 | $self->_load_objects ($f); |
2210 | $self->_load_objects ($f); |
2134 | $f->resolve_delayed_derefs; |
2211 | $f->resolve_delayed_derefs; |
|
|
2212 | } |
2135 | } |
2213 | } |
2136 | } |
2214 | } |
2137 | } |
|
|
2138 | |
2215 | |
2139 | $f->resolve_delayed_derefs; |
2216 | $f->resolve_delayed_derefs; |
|
|
2217 | } |
2140 | |
2218 | |
2141 | cf::cede_to_tick; |
2219 | cf::cede_to_tick; |
2142 | # now do the right thing for maps |
2220 | # now do the right thing for maps |
2143 | $self->link_multipart_objects; |
2221 | $self->link_multipart_objects; |
2144 | $self->difficulty ($self->estimate_difficulty) |
2222 | $self->difficulty ($self->estimate_difficulty) |
… | |
… | |
2158 | |
2236 | |
2159 | $self->in_memory (cf::MAP_ACTIVE); |
2237 | $self->in_memory (cf::MAP_ACTIVE); |
2160 | } |
2238 | } |
2161 | |
2239 | |
2162 | $self->post_load; |
2240 | $self->post_load; |
|
|
2241 | |
|
|
2242 | 1 |
2163 | } |
2243 | } |
2164 | |
2244 | |
2165 | # customize the map for a given player, i.e. |
2245 | # customize the map for a given player, i.e. |
2166 | # return the _real_ map. used by e.g. per-player |
2246 | # return the _real_ map. used by e.g. per-player |
2167 | # maps to change the path to ~playername/mappath |
2247 | # maps to change the path to ~playername/mappath |
… | |
… | |
2226 | our $MAP_PREFETCHER = undef; |
2306 | our $MAP_PREFETCHER = undef; |
2227 | |
2307 | |
2228 | sub find_async { |
2308 | sub find_async { |
2229 | my ($path, $origin, $load) = @_; |
2309 | my ($path, $origin, $load) = @_; |
2230 | |
2310 | |
2231 | $path = normalise $path, $origin && $origin->{path}; |
2311 | $path = normalise $path, $origin; |
2232 | |
2312 | |
2233 | if (my $map = $cf::MAP{$path}) { |
2313 | if (my $map = $cf::MAP{$path}) { |
2234 | return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; |
2314 | return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; |
2235 | } |
2315 | } |
2236 | |
2316 | |
… | |
… | |
2747 | ($path, $x, $y) = (undef, undef, undef); |
2827 | ($path, $x, $y) = (undef, undef, undef); |
2748 | } |
2828 | } |
2749 | } |
2829 | } |
2750 | |
2830 | |
2751 | my $map = eval { |
2831 | my $map = eval { |
2752 | my $map = defined $path ? cf::map::find $path : undef; |
2832 | my $map = defined $path ? cf::map::find $path, $self->map : undef; |
2753 | |
2833 | |
2754 | if ($map) { |
2834 | if ($map) { |
2755 | $map = $map->customise_for ($self); |
2835 | $map = $map->customise_for ($self); |
2756 | $map = $check->($map, $x, $y, $self) if $check && $map; |
2836 | $map = $check->($map, $x, $y, $self) if $check && $map; |
2757 | } else { |
2837 | } else { |
… | |
… | |
2855 | |
2935 | |
2856 | prepare_random_map $exit |
2936 | prepare_random_map $exit |
2857 | if $exit->slaying eq "/!"; |
2937 | if $exit->slaying eq "/!"; |
2858 | } |
2938 | } |
2859 | |
2939 | |
2860 | my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; |
2940 | my $map = cf::map::normalise $exit->slaying, $exit->map; |
2861 | my $x = $exit->stats->hp; |
2941 | my $x = $exit->stats->hp; |
2862 | my $y = $exit->stats->sp; |
2942 | my $y = $exit->stats->sp; |
2863 | |
2943 | |
2864 | $self->goto ($map, $x, $y); |
2944 | $self->goto ($map, $x, $y); |
2865 | |
2945 | |
… | |
… | |
3382 | |
3462 | |
3383 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3463 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
3384 | |
3464 | |
3385 | trace "loading facedata from $path\n"; |
3465 | trace "loading facedata from $path\n"; |
3386 | |
3466 | |
3387 | 0 < aio_load $path, my $facedata |
3467 | my $facedata = decode_storable load_file $path; |
3388 | or die "$path: $!"; |
|
|
3389 | |
|
|
3390 | $facedata = Coro::Storable::thaw $facedata; |
|
|
3391 | |
3468 | |
3392 | $facedata->{version} == 2 |
3469 | $facedata->{version} == 2 |
3393 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3470 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
3394 | |
3471 | |
3395 | # patch in the exptable |
3472 | # patch in the exptable |
… | |
… | |
3409 | |
3486 | |
3410 | cf::face::set_visibility $idx, $info->{visibility}; |
3487 | cf::face::set_visibility $idx, $info->{visibility}; |
3411 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3488 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3412 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3489 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3413 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3490 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
|
|
3491 | cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ; |
3414 | |
3492 | |
3415 | cf::cede_to_tick; |
3493 | cf::cede_to_tick; |
3416 | } |
3494 | } |
3417 | |
3495 | |
3418 | while (my ($face, $info) = each %$faces) { |
3496 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
3513 | } |
3591 | } |
3514 | |
3592 | |
3515 | sub reload_sound { |
3593 | sub reload_sound { |
3516 | trace "loading sound config from $DATADIR/sound\n"; |
3594 | trace "loading sound config from $DATADIR/sound\n"; |
3517 | |
3595 | |
3518 | 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data |
|
|
3519 | or die "$DATADIR/sound $!"; |
|
|
3520 | |
|
|
3521 | my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); |
3596 | my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound"); |
3522 | |
3597 | |
3523 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3598 | for (0 .. SOUND_CAST_SPELL_0 - 1) { |
3524 | my $sound = $soundconf->{compat}[$_] |
3599 | my $sound = $soundconf->{compat}[$_] |
3525 | or next; |
3600 | or next; |
3526 | |
3601 | |
… | |
… | |
3550 | } |
3625 | } |
3551 | |
3626 | |
3552 | sub reload_config { |
3627 | sub reload_config { |
3553 | trace "reloading config file...\n"; |
3628 | trace "reloading config file...\n"; |
3554 | |
3629 | |
3555 | 0 < aio_load "$CONFDIR/config", my $config |
3630 | my $config = load_file "$CONFDIR/config"; |
3556 | or die "$CONFDIR/config: $!"; |
|
|
3557 | |
|
|
3558 | utf8::decode $config; |
3631 | utf8::decode $config; |
3559 | |
3632 | *CFG = decode_yaml $config; |
3560 | cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow... |
|
|
3561 | *CFG = YAML::XS::Load $config; |
|
|
3562 | |
3633 | |
3563 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3634 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; |
3564 | |
3635 | |
3565 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3636 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3566 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3637 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
… | |
… | |
3604 | |
3675 | |
3605 | sub main { |
3676 | sub main { |
3606 | cf::init_globals; # initialise logging |
3677 | cf::init_globals; # initialise logging |
3607 | |
3678 | |
3608 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3679 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3609 | LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3680 | LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3610 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3681 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
3611 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3682 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
3612 | |
3683 | |
3613 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3684 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3614 | |
3685 | |
… | |
… | |
3650 | |
3721 | |
3651 | # no (long-running) fork's whatsoever before this point(!) |
3722 | # no (long-running) fork's whatsoever before this point(!) |
3652 | use POSIX (); |
3723 | use POSIX (); |
3653 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3724 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3654 | |
3725 | |
3655 | (pop @POST_INIT)->(0) while @POST_INIT; |
3726 | cf::_post_init 0; |
3656 | }; |
3727 | }; |
3657 | |
3728 | |
3658 | cf::object::thawer::errors_are_fatal 0; |
3729 | cf::object::thawer::errors_are_fatal 0; |
3659 | info "parse errors in files are no longer fatal from this point on.\n"; |
3730 | info "parse errors in files are no longer fatal from this point on.\n"; |
3660 | |
3731 | |
… | |
… | |
3883 | |
3954 | |
3884 | my $t1 = AE::time; |
3955 | my $t1 = AE::time; |
3885 | |
3956 | |
3886 | while ($RELOAD) { |
3957 | while ($RELOAD) { |
3887 | cf::get_slot 0.1, -1, "reload_perl"; |
3958 | cf::get_slot 0.1, -1, "reload_perl"; |
3888 | info "reloading..."; |
3959 | info "perl_reload: reloading..."; |
3889 | |
3960 | |
3890 | trace "entering sync_job"; |
3961 | trace "perl_reload: entering sync_job"; |
3891 | |
3962 | |
3892 | cf::sync_job { |
3963 | cf::sync_job { |
3893 | #cf::emergency_save; |
3964 | #cf::emergency_save; |
3894 | |
3965 | |
3895 | trace "cancelling all extension coros"; |
3966 | trace "perl_reload: cancelling all extension coros"; |
3896 | $_->cancel for values %EXT_CORO; |
3967 | $_->cancel for values %EXT_CORO; |
3897 | %EXT_CORO = (); |
3968 | %EXT_CORO = (); |
3898 | |
3969 | |
3899 | trace "removing commands"; |
3970 | trace "perl_reload: removing commands"; |
3900 | %COMMAND = (); |
3971 | %COMMAND = (); |
3901 | |
3972 | |
3902 | trace "removing ext/exti commands"; |
3973 | trace "perl_reload: removing ext/exti commands"; |
3903 | %EXTCMD = (); |
3974 | %EXTCMD = (); |
3904 | %EXTICMD = (); |
3975 | %EXTICMD = (); |
3905 | |
3976 | |
3906 | trace "unloading/nuking all extensions"; |
3977 | trace "perl_reload: unloading/nuking all extensions"; |
3907 | for my $pkg (@EXTS) { |
3978 | for my $pkg (@EXTS) { |
3908 | trace "... unloading $pkg"; |
3979 | trace "... unloading $pkg"; |
3909 | |
3980 | |
3910 | if (my $cb = $pkg->can ("unload")) { |
3981 | if (my $cb = $pkg->can ("unload")) { |
3911 | eval { |
3982 | eval { |
… | |
… | |
3916 | |
3987 | |
3917 | trace "... clearing $pkg"; |
3988 | trace "... clearing $pkg"; |
3918 | clear_package $pkg; |
3989 | clear_package $pkg; |
3919 | } |
3990 | } |
3920 | |
3991 | |
3921 | trace "unloading all perl modules loaded from $LIBDIR"; |
3992 | trace "perl_reload: unloading all perl modules loaded from $LIBDIR"; |
3922 | while (my ($k, $v) = each %INC) { |
3993 | while (my ($k, $v) = each %INC) { |
3923 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3994 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
3924 | |
3995 | |
3925 | trace "... unloading $k"; |
3996 | trace "... unloading $k"; |
3926 | delete $INC{$k}; |
3997 | delete $INC{$k}; |
… | |
… | |
3933 | } |
4004 | } |
3934 | |
4005 | |
3935 | clear_package $k; |
4006 | clear_package $k; |
3936 | } |
4007 | } |
3937 | |
4008 | |
3938 | trace "getting rid of safe::, as good as possible"; |
4009 | trace "perl_reload: getting rid of safe::, as good as possible"; |
3939 | clear_package "safe::$_" |
4010 | clear_package "safe::$_" |
3940 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
4011 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3941 | |
4012 | |
3942 | trace "unloading cf.pm \"a bit\""; |
4013 | trace "perl_reload: unloading cf.pm \"a bit\""; |
3943 | delete $INC{"cf.pm"}; |
4014 | delete $INC{"cf.pm"}; |
3944 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
4015 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3945 | |
4016 | |
3946 | # don't, removes xs symbols, too, |
4017 | # don't, removes xs symbols, too, |
3947 | # and global variables created in xs |
4018 | # and global variables created in xs |
3948 | #clear_package __PACKAGE__; |
4019 | #clear_package __PACKAGE__; |
3949 | |
4020 | |
3950 | info "unload completed, starting to reload now"; |
4021 | info "perl_reload: unload completed, starting to reload now"; |
3951 | |
4022 | |
3952 | trace "reloading cf.pm"; |
4023 | trace "perl_reload: reloading cf.pm"; |
3953 | require cf; |
4024 | require cf; |
3954 | cf::_connect_to_perl_1; |
4025 | cf::_connect_to_perl_1; |
3955 | |
4026 | |
3956 | trace "loading config and database again"; |
4027 | trace "perl_reload: loading config and database again"; |
3957 | cf::reload_config; |
4028 | cf::reload_config; |
3958 | |
4029 | |
3959 | trace "loading extensions"; |
4030 | trace "perl_reload: loading extensions"; |
3960 | cf::load_extensions; |
4031 | cf::load_extensions; |
3961 | |
4032 | |
3962 | if ($REATTACH_ON_RELOAD) { |
4033 | if ($REATTACH_ON_RELOAD) { |
3963 | trace "reattaching attachments to objects/players"; |
4034 | trace "perl_reload: reattaching attachments to objects/players"; |
3964 | _global_reattach; # objects, sockets |
4035 | _global_reattach; # objects, sockets |
3965 | trace "reattaching attachments to maps"; |
4036 | trace "perl_reload: reattaching attachments to maps"; |
3966 | reattach $_ for values %MAP; |
4037 | reattach $_ for values %MAP; |
3967 | trace "reattaching attachments to players"; |
4038 | trace "perl_reload: reattaching attachments to players"; |
3968 | reattach $_ for values %PLAYER; |
4039 | reattach $_ for values %PLAYER; |
3969 | } |
4040 | } |
3970 | |
4041 | |
3971 | trace "running post_init jobs"; |
4042 | cf::_post_init 1; |
3972 | (pop @POST_INIT)->(1) while @POST_INIT; |
|
|
3973 | |
4043 | |
3974 | trace "leaving sync_job"; |
4044 | trace "perl_reload: leaving sync_job"; |
3975 | |
4045 | |
3976 | 1 |
4046 | 1 |
3977 | } or do { |
4047 | } or do { |
3978 | error $@; |
4048 | error $@; |
3979 | cf::cleanup "error while reloading, exiting."; |
4049 | cf::cleanup "perl_reload: error, exiting."; |
3980 | }; |
4050 | }; |
3981 | |
4051 | |
3982 | info "reloaded"; |
|
|
3983 | --$RELOAD; |
4052 | --$RELOAD; |
3984 | } |
4053 | } |
3985 | |
4054 | |
3986 | $t1 = AE::time - $t1; |
4055 | $t1 = AE::time - $t1; |
3987 | info "reload completed in ${t1}s\n"; |
4056 | info "perl_reload: completed in ${t1}s\n"; |
3988 | }; |
4057 | }; |
3989 | |
4058 | |
3990 | our $RELOAD_WATCHER; # used only during reload |
4059 | our $RELOAD_WATCHER; # used only during reload |
3991 | |
4060 | |
3992 | sub reload_perl() { |
4061 | sub reload_perl() { |
… | |
… | |
4125 | IO::AIO::min_parallel 8; |
4194 | IO::AIO::min_parallel 8; |
4126 | IO::AIO::max_poll_time $TICK * 0.1; |
4195 | IO::AIO::max_poll_time $TICK * 0.1; |
4127 | undef $AnyEvent::AIO::WATCHER; |
4196 | undef $AnyEvent::AIO::WATCHER; |
4128 | } |
4197 | } |
4129 | |
4198 | |
4130 | my $_log_backtrace; |
4199 | our $_log_backtrace; |
|
|
4200 | our $_log_backtrace_last; |
4131 | |
4201 | |
4132 | sub _log_backtrace { |
4202 | sub _log_backtrace { |
4133 | my ($msg, @addr) = @_; |
4203 | my ($msg, @addr) = @_; |
4134 | |
4204 | |
4135 | $msg =~ s/\n//; |
4205 | $msg =~ s/\n$//; |
4136 | |
4206 | |
|
|
4207 | if ($_log_backtrace_last eq $msg) { |
|
|
4208 | LOG llevInfo, "[ABT] $msg\n"; |
|
|
4209 | LOG llevInfo, "[ABT] [duplicate, suppressed]\n"; |
4137 | # limit the # of concurrent backtraces |
4210 | # limit the # of concurrent backtraces |
4138 | if ($_log_backtrace < 2) { |
4211 | } elsif ($_log_backtrace < 2) { |
|
|
4212 | $_log_backtrace_last = $msg; |
4139 | ++$_log_backtrace; |
4213 | ++$_log_backtrace; |
4140 | my $perl_bt = Carp::longmess $msg; |
4214 | my $perl_bt = Carp::longmess $msg; |
4141 | async { |
4215 | async { |
4142 | $Coro::current->{desc} = "abt $msg"; |
4216 | $Coro::current->{desc} = "abt $msg"; |
4143 | |
4217 | |
… | |
… | |
4163 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4237 | LOG llevInfo, "[ABT] $_\n" for @bt; |
4164 | --$_log_backtrace; |
4238 | --$_log_backtrace; |
4165 | }; |
4239 | }; |
4166 | } else { |
4240 | } else { |
4167 | LOG llevInfo, "[ABT] $msg\n"; |
4241 | LOG llevInfo, "[ABT] $msg\n"; |
4168 | LOG llevInfo, "[ABT] [suppressed]\n"; |
4242 | LOG llevInfo, "[ABT] [overload, suppressed]\n"; |
4169 | } |
4243 | } |
4170 | } |
4244 | } |
4171 | |
4245 | |
4172 | # load additional modules |
4246 | # load additional modules |
4173 | require "cf/$_.pm" for @EXTRA_MODULES; |
4247 | require "cf/$_.pm" for @EXTRA_MODULES; |