ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.536 by root, Thu Apr 29 08:26:38 2010 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

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.
… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
… …
124our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 129our $DB_ENV;
128 130
129our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 132
131our %CFG; 133our %CFG;
132 134
133our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 136our $RUNTIME;
… …
233from wherever your confdir points to. 235from wherever your confdir points to.
234 236
235=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
236 238
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
240 247
241=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
242 249
243This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
307} 314}
308 315
309$EV::DIED = sub { 316$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
311}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
312 324
313############################################################################# 325#############################################################################
314 326
315=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
316 328
… …
337 $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;
338 $d 350 $d
339 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
340} 352}
341 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
342=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
343 369
344Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
345 371
346=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 379
354sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
356 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub 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
357=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
358 415
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
361 418
362The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 420is a reload or not.
364 421
365=cut 422=cut
366 423
367sub post_init(&) { 424sub post_init(&) {
368 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _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 }
369} 443}
370 444
371=item cf::lock_wait $string 445=item cf::lock_wait $string
372 446
373Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
427} 501}
428 502
429=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
430 504
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
432This 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
433of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
434 512
435The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
437 515
438Useful for short background jobs. 516Useful for short background jobs.
… …
578 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
579 657
580 $coro 658 $coro
581} 659}
582 660
583=item fork_call { }, $args 661=item fork_call { }, @args
584 662
585Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 666never block itself or use any form of event handling.
589 667
590=cut 668=cut
591 669
670sub post_fork {
671 reset_signals;
672}
673
592sub fork_call(&@) { 674sub fork_call(&@) {
593 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
594 676
595 # 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,
596 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
598 680
599 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
600 reset_signals; 682 cf::post_fork;
601 &$cb 683 &$cb
602 }, @args; 684 } @args;
603 685
604 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
605} 687}
606 688
607sub objinfo { 689sub objinfo {
… …
729 811
730 my @data; 812 my @data;
731 my $md5; 813 my $md5;
732 814
733 for (0 .. $#$src) { 815 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 817 }
737 818
738 # if processing is expensive, check 819 # if processing is expensive, check
739 # checksum first 820 # checksum first
740 if (1) { 821 if (1) {
… …
1423 1504
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426 1507
1427 $ext{source} = 1508 $ext{source} =
1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1430 . $source 1511 . $source
1431 . "\n};\n1"; 1512 . "\n};\n1";
1432 1513
1433 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1474 1555
1475 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1478 } 1559 }
1560
1561 last;
1479 } 1562 }
1480 } 1563 }
1481 }; 1564 };
1482} 1565}
1483 1566
… …
1641 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1642 1725
1643 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1644 $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
1645 1728
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1730 $pl->deactivate;
1731
1648 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;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1650 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1651 1737
1652 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1906sub generate_random_map {
1821 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1822 1908
1823 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
1824 1910
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1912}
1840 1913
1841=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1842 1915
1843Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
… …
1848 1921
1849sub register { 1922sub register {
1850 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1851 my $pkg = caller; 1924 my $pkg = caller;
1852 1925
1853 no strict;
1854 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1855 1927
1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1857} 1929}
1858 1930
… …
1870} 1942}
1871 1943
1872sub normalise { 1944sub normalise {
1873 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1874 1946
1875 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1876 1948
1877 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1878 1950
1879 # map plan: 1951 # map plan:
1880 # 1952 #
… …
1882 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1883 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1884 # ?random/... random maps 1956 # ?random/... random maps
1885 # /... normal maps 1957 # /... normal maps
1886 # ~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
1887 1960
1888 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1889 1962
1890 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1891 # something that looks reasonable 1964 # something that looks reasonable
1892 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1893 $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'";
1894 1967
1895 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1896 $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;
1897 } 1984 }
1898 1985
1899 for ($path) { 1986 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1903 } 1989 }
1904 1990
1905 $path 1991 $path
… …
1919 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1920 return $self; 2006 return $self;
1921 } 2007 }
1922 } 2008 }
1923 2009
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 2011 ()
1926} 2012}
1927 2013
2014# may re-bless or do other evil things
1928sub init { 2015sub init {
1929 my ($self) = @_; 2016 my ($self) = @_;
1930 2017
1931 $self 2018 $self
1932} 2019}
… …
1997 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1998 2085
1999 1 2086 1
2000} 2087}
2001 2088
2089# used to laod the header of an original map
2002sub load_header_orig { 2090sub load_header_orig {
2003 my ($self) = @_; 2091 my ($self) = @_;
2004 2092
2005 $self->load_header_from ($self->load_path) 2093 $self->load_header_from ($self->load_path)
2006} 2094}
2007 2095
2096# used to laod the header of an instantiated map
2008sub load_header_temp { 2097sub load_header_temp {
2009 my ($self) = @_; 2098 my ($self) = @_;
2010 2099
2011 $self->load_header_from ($self->save_path) 2100 $self->load_header_from ($self->save_path)
2012} 2101}
2013 2102
2103# called after loading the header from an instantiated map
2014sub prepare_temp { 2104sub prepare_temp {
2015 my ($self) = @_; 2105 my ($self) = @_;
2016 2106
2017 $self->last_access ((delete $self->{last_access}) 2107 $self->last_access ((delete $self->{last_access})
2018 || $cf::RUNTIME); #d# 2108 || $cf::RUNTIME); #d#
2019 # safety 2109 # safety
2020 $self->{instantiate_time} = $cf::RUNTIME 2110 $self->{instantiate_time} = $cf::RUNTIME
2021 if $self->{instantiate_time} > $cf::RUNTIME; 2111 if $self->{instantiate_time} > $cf::RUNTIME;
2022} 2112}
2023 2113
2114# called after loading the header from an original map
2024sub prepare_orig { 2115sub prepare_orig {
2025 my ($self) = @_; 2116 my ($self) = @_;
2026 2117
2027 $self->{load_original} = 1; 2118 $self->{load_original} = 1;
2028 $self->{instantiate_time} = $cf::RUNTIME; 2119 $self->{instantiate_time} = $cf::RUNTIME;
… …
2052 2143
2053sub find; 2144sub find;
2054sub find { 2145sub find {
2055 my ($path, $origin) = @_; 2146 my ($path, $origin) = @_;
2056 2147
2148 cf::cede_to_tick;
2149
2057 $path = normalise $path, $origin && $origin->path; 2150 $path = normalise $path, $origin;
2058 2151
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2152 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2153 my $guard2 = cf::lock_acquire "map_find:$path";
2061 2154
2062 $cf::MAP{$path} || do { 2155 $cf::MAP{$path} || do {
… …
2102 $self->alloc; 2195 $self->alloc;
2103 2196
2104 $self->pre_load; 2197 $self->pre_load;
2105 cf::cede_to_tick; 2198 cf::cede_to_tick;
2106 2199
2200 if (exists $self->{load_path}) {
2107 my $f = new_from_file cf::object::thawer $self->{load_path}; 2201 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block; 2202 $f->skip_block;
2109 $self->_load_objects ($f) 2203 $self->_load_objects ($f)
2110 or return; 2204 or return;
2111 2205
2112 $self->post_load_original 2206 $self->post_load_original
2113 if delete $self->{load_original}; 2207 if delete $self->{load_original};
2114 2208
2115 if (my $uniq = $self->uniq_path) { 2209 if (my $uniq = $self->uniq_path) {
2116 utf8::encode $uniq; 2210 utf8::encode $uniq;
2117 unless (aio_stat $uniq) { 2211 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) { 2212 if (my $f = new_from_file cf::object::thawer $uniq) {
2119 $self->clear_unique_items; 2213 $self->clear_unique_items;
2120 $self->_load_objects ($f); 2214 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs; 2215 $f->resolve_delayed_derefs;
2216 }
2122 } 2217 }
2123 } 2218 }
2124 }
2125 2219
2126 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 } else {
2222 $self->post_load_original
2223 if delete $self->{load_original};
2224 }
2127 2225
2128 cf::cede_to_tick; 2226 cf::cede_to_tick;
2129 # now do the right thing for maps 2227 # now do the right thing for maps
2130 $self->link_multipart_objects; 2228 $self->link_multipart_objects;
2131 $self->difficulty ($self->estimate_difficulty) 2229 $self->difficulty ($self->estimate_difficulty)
… …
2145 2243
2146 $self->in_memory (cf::MAP_ACTIVE); 2244 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2245 }
2148 2246
2149 $self->post_load; 2247 $self->post_load;
2248
2249 1
2150} 2250}
2151 2251
2152# customize the map for a given player, i.e. 2252# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2253# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2254# maps to change the path to ~playername/mappath
… …
2213our $MAP_PREFETCHER = undef; 2313our $MAP_PREFETCHER = undef;
2214 2314
2215sub find_async { 2315sub find_async {
2216 my ($path, $origin, $load) = @_; 2316 my ($path, $origin, $load) = @_;
2217 2317
2218 $path = normalise $path, $origin && $origin->{path}; 2318 $path = normalise $path, $origin;
2219 2319
2220 if (my $map = $cf::MAP{$path}) { 2320 if (my $map = $cf::MAP{$path}) {
2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2222 } 2322 }
2223 2323
… …
2734 ($path, $x, $y) = (undef, undef, undef); 2834 ($path, $x, $y) = (undef, undef, undef);
2735 } 2835 }
2736 } 2836 }
2737 2837
2738 my $map = eval { 2838 my $map = eval {
2739 my $map = defined $path ? cf::map::find $path : undef; 2839 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740 2840
2741 if ($map) { 2841 if ($map) {
2742 $map = $map->customise_for ($self); 2842 $map = $map->customise_for ($self);
2743 $map = $check->($map, $x, $y, $self) if $check && $map; 2843 $map = $check->($map, $x, $y, $self) if $check && $map;
2744 } else { 2844 } else {
… …
2842 2942
2843 prepare_random_map $exit 2943 prepare_random_map $exit
2844 if $exit->slaying eq "/!"; 2944 if $exit->slaying eq "/!";
2845 } 2945 }
2846 2946
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2848 my $x = $exit->stats->hp; 2948 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp; 2949 my $y = $exit->stats->sp;
2850 2950
2851 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2852 2952
… …
3273 decrease split destroy change_exp value msg lore send_msg)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3274 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3275 ["cf::player" => qw(peaceful send_msg)], 3375 ["cf::player" => qw(peaceful send_msg)],
3276 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3277) { 3377) {
3278 no strict 'refs';
3279 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3281 for @funs; 3380 for @funs;
3282} 3381}
3283 3382
… …
3370 3469
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3471
3373 trace "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3374 3473
3375 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3475
3381 $facedata->{version} == 2 3476 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3478
3384 # patch in the exptable 3479 # patch in the exptable
… …
3398 3493
3399 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3403 3499
3404 cf::cede_to_tick; 3500 cf::cede_to_tick;
3405 } 3501 }
3406 3502
3407 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
… …
3502} 3598}
3503 3599
3504sub reload_sound { 3600sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n"; 3601 trace "loading sound config from $DATADIR/sound\n";
3506 3602
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511 3604
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_] 3606 my $sound = $soundconf->{compat}[$_]
3514 or next; 3607 or next;
3515 3608
… …
3525} 3618}
3526 3619
3527sub reload_resources { 3620sub reload_resources {
3528 trace "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3529 3622
3623 reload_exp_table;
3624 reload_materials;
3530 reload_facedata; 3625 reload_facedata;
3531 reload_sound; 3626 reload_sound;
3532 reload_archetypes; 3627 reload_archetypes;
3533 reload_regions; 3628 reload_regions;
3534 reload_treasures; 3629 reload_treasures;
… …
3537} 3632}
3538 3633
3539sub reload_config { 3634sub reload_config {
3540 trace "reloading config file...\n"; 3635 trace "reloading config file...\n";
3541 3636
3542 open my $fh, "<:utf8", "$CONFDIR/config" 3637 my $config = load_file "$CONFDIR/config";
3543 or return; 3638 utf8::decode $config;
3544 3639 *CFG = decode_yaml $config;
3545 local $/;
3546 *CFG = YAML::XS::Load scalar <$fh>;
3547 3640
3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549 3642
3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3648 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556 and die "WARNING: m(un)lockall failed: $!\n"; 3649 and die "WARNING: m(un)lockall failed: $!\n";
3557 }; 3650 };
3558 warn $@ if $@; 3651 warn $@ if $@;
3559 } 3652 }
3560
3561 trace "finished reloading resource files\n";
3562} 3653}
3563 3654
3564sub pidfile() { 3655sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!"; 3657 or die "$PIDFILE: $!";
… …
3591 3682
3592sub main { 3683sub main {
3593 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3594 3685
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599 3690
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601 3692
… …
3609 }; 3700 };
3610 3701
3611 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3612 3703
3613 cf::sync_job { 3704 cf::sync_job {
3614 cf::init_experience; 3705 cf::incloader::init ();
3706
3615 cf::init_anim; 3707 cf::init_anim;
3616 cf::init_attackmess; 3708 cf::init_attackmess;
3617 cf::init_dynamic; 3709 cf::init_dynamic;
3618 3710
3619 cf::load_settings; 3711 cf::load_settings;
3620 cf::load_materials;
3621 3712
3622 reload_resources; 3713 reload_resources;
3623 reload_config; 3714 reload_config;
3624 db_init; 3715 db_init;
3625 3716
… …
3637 3728
3638 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX (); 3730 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641 3732
3642 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3643 }; 3734 };
3644 3735
3645 cf::object::thawer::errors_are_fatal 0; 3736 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n"; 3737 info "parse errors in files are no longer fatal from this point on.\n";
3647 3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3648 main_loop; 3744 goto &main_loop;
3649} 3745}
3650 3746
3651############################################################################# 3747#############################################################################
3652# initialisation and cleanup 3748# initialisation and cleanup
3653 3749
… …
3820sub post_cleanup { 3916sub post_cleanup {
3821 my ($make_core) = @_; 3917 my ($make_core) = @_;
3822 3918
3823 IO::AIO::flush; 3919 IO::AIO::flush;
3824 3920
3825 IO::AIO::flush;
3826
3827 error Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3828 if $make_core; 3922 if $make_core;
3829 3923
3830 my $fh = pidfile; 3924 my $fh = pidfile;
3831 unlink $PIDFILE if <$fh> == $$; 3925 unlink $PIDFILE if <$fh> == $$;
… …
3856 } 3950 }
3857} 3951}
3858 3952
3859sub do_reload_perl() { 3953sub do_reload_perl() {
3860 # can/must only be called in main 3954 # can/must only be called in main
3861 if (in_main) { 3955 unless (in_main) {
3862 error "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3863 return; 3957 return;
3864 } 3958 }
3865 3959
3866 return if $RELOAD++; 3960 return if $RELOAD++;
3867 3961
3868 my $t1 = AE::time; 3962 my $t1 = AE::time;
3869 3963
3870 while ($RELOAD) { 3964 while ($RELOAD) {
3965 cf::get_slot 0.1, -1, "reload_perl";
3871 info "reloading..."; 3966 info "perl_reload: reloading...";
3872 3967
3873 trace "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3874 3969
3875 cf::sync_job { 3970 cf::sync_job {
3876 cf::emergency_save; 3971 #cf::emergency_save;
3877 3972
3878 trace "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3879 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3880 %EXT_CORO = (); 3975 %EXT_CORO = ();
3881 3976
3882 trace "removing commands"; 3977 trace "perl_reload: removing commands";
3883 %COMMAND = (); 3978 %COMMAND = ();
3884 3979
3885 trace "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3886 %EXTCMD = (); 3981 %EXTCMD = ();
3887 %EXTICMD = (); 3982 %EXTICMD = ();
3888 3983
3889 trace "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3890 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3891 trace "... unloading $pkg"; 3986 trace "... unloading $pkg";
3892 3987
3893 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3894 eval { 3989 eval {
… …
3899 3994
3900 trace "... clearing $pkg"; 3995 trace "... clearing $pkg";
3901 clear_package $pkg; 3996 clear_package $pkg;
3902 } 3997 }
3903 3998
3904 trace "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3905 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3906 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3907 4002
3908 trace "... unloading $k"; 4003 trace "... unloading $k";
3909 delete $INC{$k}; 4004 delete $INC{$k};
… …
3916 } 4011 }
3917 4012
3918 clear_package $k; 4013 clear_package $k;
3919 } 4014 }
3920 4015
3921 trace "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3922 clear_package "safe::$_" 4017 clear_package "safe::$_"
3923 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3924 4019
3925 trace "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3926 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3927 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3928 4023
3929 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3930 # and global variables created in xs 4025 # and global variables created in xs
3931 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3932 4027
3933 info "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3934 4029
3935 trace "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3936 require cf; 4031 require cf;
3937 cf::_connect_to_perl_1; 4032 cf::_connect_to_perl_1;
3938 4033
3939 trace "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3940 cf::reload_config; 4035 cf::reload_config;
3941 4036
3942 trace "loading extensions"; 4037 trace "perl_reload: loading extensions";
3943 cf::load_extensions; 4038 cf::load_extensions;
3944 4039
3945 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3946 trace "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3947 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3948 trace "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3949 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3950 trace "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3951 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3952 } 4047 }
3953 4048
3954 trace "running post_init jobs"; 4049 cf::_post_init 1;
3955 (pop @POST_INIT)->(1) while @POST_INIT;
3956 4050
3957 trace "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3958 4052
3959 1 4053 1
3960 } or do { 4054 } or do {
3961 error $@; 4055 error $@;
3962 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3963 }; 4057 };
3964 4058
3965 info "reloaded";
3966 --$RELOAD; 4059 --$RELOAD;
3967 } 4060 }
3968 4061
3969 $t1 = AE::time - $t1; 4062 $t1 = AE::time - $t1;
3970 info "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3971}; 4064};
3972 4065
3973our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3974 4067
3975sub reload_perl() { 4068sub reload_perl() {
… …
3996 reload_perl; 4089 reload_perl;
3997 }; 4090 };
3998 } 4091 }
3999}; 4092};
4000 4093
4001unshift @INC, $LIBDIR; 4094#############################################################################
4002 4095
4003my $bug_warning = 0; 4096my $bug_warning = 0;
4004 4097
4005our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
4006our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
4007 4100
4008sub wait_for_tick { 4101sub wait_for_tick() {
4009 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4010 4103
4011 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
4012 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
4013 $signal->wait; 4106 $signal->wait;
4014} 4107}
4015 4108
4016sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
4017 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
4018 4111
4019 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
4020 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
4021 $signal->wait; 4114 $signal->wait;
… …
4108 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
4109 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
4110 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
4111} 4204}
4112 4205
4113my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
4114 4208
4115sub _log_backtrace { 4209sub _log_backtrace {
4116 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
4117 4211
4118 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
4119 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4120 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
4121 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
4122 ++$_log_backtrace; 4220 ++$_log_backtrace;
4123 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
4124 async { 4222 async {
4125 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
4126 4224
… …
4146 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
4147 --$_log_backtrace; 4245 --$_log_backtrace;
4148 }; 4246 };
4149 } else { 4247 } else {
4150 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
4151 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4152 } 4250 }
4153} 4251}
4154 4252
4155# load additional modules 4253# load additional modules
4156require "cf/$_.pm" for @EXTRA_MODULES; 4254require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines