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.547 by root, Sun May 9 22:51:13 2010 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 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,2012 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.
… …
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";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; # unused 113#our %RESOURCE; # unused
112 114
113our $OUTPUT_RATE_MIN = 3000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 116our $OUTPUT_RATE_MAX = 1000000;
115 117
116our $MAX_LINKS = 32; # how many chained exits to follow 118our $MAX_LINKS = 32; # how many chained exits to follow
… …
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 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 = 0;
137our $SERVER_TICK = 0;
135our $NOW; 138our $NOW;
136 139
137our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
… …
148 151
149our @POST_INIT; 152our @POST_INIT;
150 153
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
153 159
154binmode STDOUT; 160binmode STDOUT;
155binmode STDERR; 161binmode STDERR;
156 162
157# read virtual server time, if available 163# read virtual server time, if available
… …
191 197
192=over 4 198=over 4
193 199
194=item $cf::UPTIME 200=item $cf::UPTIME
195 201
196The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
197 218
198=item $cf::RUNTIME 219=item $cf::RUNTIME
199 220
200The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 222every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
210database environment. 231database environment.
211 232
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 233=item $cf::LOADAVG
221 234
222The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
… …
235=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
236 249
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These 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 thread 251returns 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. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
240 265
241=cut 266=cut
242 267
243sub wait_for_tick(); 268sub wait_for_tick();
244sub wait_for_tick_begin(); 269sub wait_for_tick_begin();
… …
312} 337}
313 338
314$EV::DIED = sub { 339$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
316}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
317 347
318############################################################################# 348#############################################################################
319 349
320=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
321 351
… …
342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343 $d 373 $d
344 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
345} 375}
346 376
377=item $scalar = cf::load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
347=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
348 430
349Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
350 432
351=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
… …
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358 440
359sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
361 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
452=item $ref = cf::decode_yaml $scalar
453
454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
455
456=cut
457
458sub decode_yaml($) {
459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
473}
474
362=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
363 476
364Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again. 478but I<before> the server starts ticking again.
366 479
367The cdoeblock will have a single boolean argument to indicate whether this 480The codeblock will have a single boolean argument to indicate whether this
368is a reload or not. 481is a reload or not.
369 482
370=cut 483=cut
371 484
372sub post_init(&) { 485sub post_init(&) {
373 push @POST_INIT, shift; 486 push @POST_INIT, shift;
487}
488
489sub _post_init {
490 trace "running post_init jobs";
491
492 # run them in parallel...
493
494 my @join;
495
496 while () {
497 push @join, map &Coro::async ($_, 0), @POST_INIT;
498 @POST_INIT = ();
499
500 @join or last;
501
502 (pop @join)->join;
503 }
374} 504}
375 505
376=item cf::lock_wait $string 506=item cf::lock_wait $string
377 507
378Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
… …
431 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
432} 562}
433 563
434=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
435 565
436Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
437This call blocks and returns only when you have at least C<$time> seconds 567(default: 0): This call blocks and returns only when you have at least
438of cpu time till the next tick. The slot is only valid till the next cede. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
439 573
440The optional C<$name> can be used to identify the job to run. It might be 574The optional C<$name> can be used to identify the job to run. It might be
441used for statistical purposes and should identify the same time-class. 575used for statistical purposes and should identify the same time-class.
442 576
443Useful for short background jobs. 577Useful for short background jobs.
… …
472 } 606 }
473 } 607 }
474 608
475 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
476 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
477 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
478 $signal->wait;
479 } else { 612 } else {
480 $busy = 0; 613 $busy = 0;
481 Coro::schedule; 614 Coro::schedule;
482 } 615 }
483 } 616 }
… …
583 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
584 717
585 $coro 718 $coro
586} 719}
587 720
588=item fork_call { }, $args 721=item fork_call { }, @args
589 722
590Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
591process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
592Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
593never block itself or use any form of event handling. 726never block itself or use any form of event handling.
… …
606 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
607 740
608 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
609 cf::post_fork; 742 cf::post_fork;
610 &$cb 743 &$cb
611 }, @args; 744 } @args;
612 745
613 wantarray ? @res : $res[-1] 746 wantarray ? @res : $res[-1]
614} 747}
615 748
616sub objinfo { 749sub objinfo {
… …
738 871
739 my @data; 872 my @data;
740 my $md5; 873 my $md5;
741 874
742 for (0 .. $#$src) { 875 for (0 .. $#$src) {
743 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
744 or Carp::croak "$src->[$_]: $!";
745 } 877 }
746 878
747 # if processing is expensive, check 879 # if processing is expensive, check
748 # checksum first 880 # checksum first
749 if (1) { 881 if (1) {
… …
1367 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1368 1500
1369 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1370 1502
1371 if (ref $msg) { 1503 if (ref $msg) {
1372 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1373 "ARRAY" eq ref $msg
1374 ? @$msg
1375 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376 1505
1377 my @reply; 1506 my @reply;
1378 1507
1379 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1380 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
… …
1483 1612
1484 while (my ($k, $v) = each %todo) { 1613 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory}; 1615 if exists $v->{meta}{mandatory};
1487 } 1616 }
1617
1618 last;
1488 } 1619 }
1489 } 1620 }
1490 }; 1621 };
1491} 1622}
1492 1623
… …
1650 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1651 1782
1652 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1784 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1654 1785
1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1656 $pl->deactivate; 1787 $pl->deactivate;
1657 1788
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1659 ext::highscore::check ($pl->ob); 1791 ext::highscore::check ($pl->ob);
1660 1792
1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1662 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1663 1794
1664 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1665 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1666 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
… …
1832sub generate_random_map { 1963sub generate_random_map {
1833 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1834 1965
1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836 1967
1837 # mit "rum" bekleckern, nicht
1838 $self->_create_random_map ( 1968 $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} 1969}
1852 1970
1853=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1854 1972
1855Register a handler for the map path matching the given regex at the 1973Register a handler for the map path matching the given regex at the
… …
1906 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1907 $path = "$base/$path"; 2025 $path = "$base/$path";
1908 } 2026 }
1909 2027
1910 for ($path) { 2028 for ($path) {
1911 redo if s{//}{/};
1912 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1913 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1914 } 2031 }
1915 2032
1916 $path 2033 $path
… …
1934 2051
1935 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1936 () 2053 ()
1937} 2054}
1938 2055
2056# may re-bless or do other evil things
1939sub init { 2057sub init {
1940 my ($self) = @_; 2058 my ($self) = @_;
1941 2059
1942 $self 2060 $self
1943} 2061}
… …
2008 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
2009 2127
2010 1 2128 1
2011} 2129}
2012 2130
2131# used to laod the header of an original map
2013sub load_header_orig { 2132sub load_header_orig {
2014 my ($self) = @_; 2133 my ($self) = @_;
2015 2134
2016 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
2017} 2136}
2018 2137
2138# used to laod the header of an instantiated map
2019sub load_header_temp { 2139sub load_header_temp {
2020 my ($self) = @_; 2140 my ($self) = @_;
2021 2141
2022 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
2023} 2143}
2024 2144
2145# called after loading the header from an instantiated map
2025sub prepare_temp { 2146sub prepare_temp {
2026 my ($self) = @_; 2147 my ($self) = @_;
2027 2148
2028 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
2029 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
2030 # safety 2151 # safety
2031 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
2032 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
2033} 2154}
2034 2155
2156# called after loading the header from an original map
2035sub prepare_orig { 2157sub prepare_orig {
2036 my ($self) = @_; 2158 my ($self) = @_;
2037 2159
2038 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
2039 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
… …
2065sub find { 2187sub find {
2066 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
2067 2189
2068 cf::cede_to_tick; 2190 cf::cede_to_tick;
2069 2191
2070 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
2071 2193
2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2073 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
2074 2196
2075 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
… …
2106 2228
2107 { 2229 {
2108 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2109 2231
2110 return unless $self->valid; 2232 return unless $self->valid;
2111 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2112
2113 $self->in_memory (cf::MAP_LOADING);
2114 2234
2115 $self->alloc; 2235 $self->alloc;
2116 2236
2117 $self->pre_load; 2237 $self->pre_load;
2118 cf::cede_to_tick; 2238 cf::cede_to_tick;
2119 2239
2240 if (exists $self->{load_path}) {
2120 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2121 $f->skip_block; 2242 $f->skip_block;
2122 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2123 or return; 2244 or return;
2124 2245
2125 $self->post_load_original 2246 $self->post_load_original
2126 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2127 2248
2128 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2129 utf8::encode $uniq; 2250 utf8::encode $uniq;
2130 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2131 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2132 $self->clear_unique_items; 2253 $self->clear_unique_items;
2133 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2134 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2135 } 2257 }
2136 } 2258 }
2137 }
2138 2259
2139 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2140 2267
2141 cf::cede_to_tick; 2268 cf::cede_to_tick;
2142 # now do the right thing for maps 2269 # now do the right thing for maps
2143 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2144 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
… …
2148 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2149 $self->decay_objects; 2276 $self->decay_objects;
2150 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2151 $self->update_buttons; 2278 $self->update_buttons;
2152 cf::cede_to_tick; 2279 cf::cede_to_tick;
2153 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2154 } 2281 }
2155 2282
2156 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2157 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2158
2159 $self->in_memory (cf::MAP_ACTIVE);
2160 } 2285 }
2161 2286
2162 $self->post_load; 2287 $self->post_load;
2288
2289 1
2163} 2290}
2164 2291
2165# customize the map for a given player, i.e. 2292# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player 2293# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath 2294# maps to change the path to ~playername/mappath
… …
2175# if $self->per_party; 2302# if $self->per_party;
2176 2303
2177 $self 2304 $self
2178} 2305}
2179 2306
2180# find and load all maps in the 3x3 area around a map
2181sub load_neighbours {
2182 my ($map) = @_;
2183
2184 my @neigh; # diagonal neighbours
2185
2186 for (0 .. 3) {
2187 my $neigh = $map->tile_path ($_)
2188 or next;
2189 $neigh = find $neigh, $map
2190 or next;
2191 $neigh->load;
2192
2193 # now find the diagonal neighbours
2194 push @neigh,
2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2197 }
2198
2199 for (grep defined $_->[0], @neigh) {
2200 my ($path, $origin) = @$_;
2201 my $neigh = find $path, $origin
2202 or next;
2203 $neigh->load;
2204 }
2205}
2206
2207sub find_sync { 2307sub find_sync {
2208 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2209 2309
2310 # it's a bug to call this from the main context
2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main; 2312 if $Coro::current == $Coro::main;
2212 2313
2213 find $path, $origin 2314 find $path, $origin
2214} 2315}
2215 2316
2216sub do_load_sync { 2317sub do_load_sync {
2217 my ($map) = @_; 2318 my ($map) = @_;
2218 2319
2320 # it's a bug to call this from the main context
2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2221 2323
2222 $map->load; 2324 $map->load;
2223} 2325}
… …
2226our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2227 2329
2228sub find_async { 2330sub find_async {
2229 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2230 2332
2231 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2232 2334
2233 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2235 } 2337 }
2236 2338
2237 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2238 2340
2239 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
… …
2298sub swap_out { 2400sub swap_out {
2299 my ($self) = @_; 2401 my ($self) = @_;
2300 2402
2301 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2302 2404
2303 return if $self->in_memory != cf::MAP_ACTIVE; 2405 return if !$self->linkable;
2304 return if $self->{deny_save}; 2406 return if $self->{deny_save};
2305 return if $self->players; 2407 return if $self->players;
2306 2408
2307 # first deactivate the map and "unlink" it from the core 2409 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate; 2410 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP; 2411 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->in_memory (cf::MAP_SWAPPED); 2412 $self->state (cf::MAP_SWAPPED);
2311 2413
2312 # then atomically save 2414 # then atomically save
2313 $self->_save; 2415 $self->_save;
2314 2416
2315 # then free the map 2417 # then free the map
… …
2341 2443
2342 return if $self->players; 2444 return if $self->players;
2343 2445
2344 cf::trace "resetting map ", $self->path, "\n"; 2446 cf::trace "resetting map ", $self->path, "\n";
2345 2447
2346 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2347 2449
2348 # need to save uniques path 2450 # need to save uniques path
2349 unless ($self->{deny_save}) { 2451 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq; 2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351 2453
… …
2681 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2682 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2683 if $x <= 0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2684 2786
2685 $map->load; 2787 $map->load;
2686 $map->load_neighbours;
2687 2788
2688 return unless $self->contr->active; 2789 return unless $self->contr->active;
2689 2790
2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2691 if ($self->enter_map ($map, $x, $y)) { 2792 if ($self->enter_map ($map, $x, $y)) {
… …
2747 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2748 } 2849 }
2749 } 2850 }
2750 2851
2751 my $map = eval { 2852 my $map = eval {
2752 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2753 2854
2754 if ($map) { 2855 if ($map) {
2755 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2756 $map = $check->($map, $x, $y, $self) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2757 } else { 2858 } else {
… …
2847 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2848 2949
2849 unless (eval { 2950 unless (eval {
2850 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2851 2952
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2861 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2863 2979
2864 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2865 2981
2866 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
… …
3109=cut 3225=cut
3110 3226
3111sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
3112 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
3113 3229
3114 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3116 } elsif ($self->extcmd == 1) {
3117 #TODO: version 1, remove
3118 unshift @msg, msgtype => "reply", msgid => $id;
3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120 }
3121} 3233}
3122 3234
3123=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
3124 3236
3125Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
… …
3180 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
3181 3293
3182 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183 3295
3184 if (ref $msg) { 3296 if (ref $msg) {
3185 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3186 "ARRAY" eq ref $msg
3187 ? @$msg
3188 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189 3298
3190 my @reply; 3299 my @reply;
3191 3300
3192 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3193 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
… …
3382 3491
3383 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384 3493
3385 trace "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3386 3495
3387 0 < aio_load $path, my $facedata 3496 my $facedata = decode_storable load_file $path;
3388 or die "$path: $!";
3389
3390 $facedata = Coro::Storable::thaw $facedata;
3391 3497
3392 $facedata->{version} == 2 3498 $facedata->{version} == 2
3393 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3394 3500
3395 # patch in the exptable 3501 # patch in the exptable
… …
3409 3515
3410 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3411 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3414 3521
3415 cf::cede_to_tick; 3522 cf::cede_to_tick;
3416 } 3523 }
3417 3524
3418 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
… …
3445 3552
3446 { 3553 {
3447 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3448 3555
3449 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3450 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3451 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452 3560
3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3455 } else { 3564 } else {
3456 $RESOURCE{$name} = $info; # unused 3565# $RESOURCE{$name} = $info; # unused
3457 } 3566 }
3458 3567
3459 cf::cede_to_tick; 3568 cf::cede_to_tick;
3460 } 3569 }
3461 } 3570 }
… …
3513} 3622}
3514 3623
3515sub reload_sound { 3624sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n"; 3625 trace "loading sound config from $DATADIR/sound\n";
3517 3626
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); 3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3522 3628
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_] 3630 my $sound = $soundconf->{compat}[$_]
3525 or next; 3631 or next;
3526 3632
… …
3550} 3656}
3551 3657
3552sub reload_config { 3658sub reload_config {
3553 trace "reloading config file...\n"; 3659 trace "reloading config file...\n";
3554 3660
3555 0 < aio_load "$CONFDIR/config", my $config 3661 my $config = load_file "$CONFDIR/config";
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config; 3662 utf8::decode $config;
3559 3663 *CFG = decode_yaml $config;
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3561 *CFG = YAML::XS::Load $config;
3562 3664
3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3564 3666
3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $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}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3604 3706
3605sub main { 3707sub main {
3606 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3607 3709
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612 3714
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614 3716
… …
3650 3752
3651 # no (long-running) fork's whatsoever before this point(!) 3753 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX (); 3754 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3755 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654 3756
3655 (pop @POST_INIT)->(0) while @POST_INIT; 3757 cf::_post_init 0;
3656 }; 3758 };
3657 3759
3658 cf::object::thawer::errors_are_fatal 0; 3760 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n"; 3761 info "parse errors in files are no longer fatal from this point on.\n";
3660 3762
3661 my $free_main; $free_main = EV::idle sub { 3763 AE::postpone {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :) 3764 undef &main; # free gobs of memory :)
3664 }; 3765 };
3665 3766
3666 goto &main_loop; 3767 goto &main_loop;
3667} 3768}
… …
3824 3925
3825 cf::write_runtime_sync; # external watchdog should not bark 3926 cf::write_runtime_sync; # external watchdog should not bark
3826 3927
3827 trace "emergency_perl_save: flushing outstanding aio requests"; 3928 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) { 3929 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3830 } 3931 }
3831 3932
3832 cf::write_runtime_sync; # external watchdog should not bark 3933 cf::write_runtime_sync; # external watchdog should not bark
3833 }; 3934 };
3834 3935
… …
3883 3984
3884 my $t1 = AE::time; 3985 my $t1 = AE::time;
3885 3986
3886 while ($RELOAD) { 3987 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl"; 3988 cf::get_slot 0.1, -1, "reload_perl";
3888 info "reloading..."; 3989 info "perl_reload: reloading...";
3889 3990
3890 trace "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3891 3992
3892 cf::sync_job { 3993 cf::sync_job {
3893 #cf::emergency_save; 3994 #cf::emergency_save;
3894 3995
3895 trace "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3896 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3897 %EXT_CORO = (); 3998 %EXT_CORO = ();
3898 3999
3899 trace "removing commands"; 4000 trace "perl_reload: removing commands";
3900 %COMMAND = (); 4001 %COMMAND = ();
3901 4002
3902 trace "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3903 %EXTCMD = (); 4004 %EXTCMD = ();
3904 %EXTICMD = (); 4005 %EXTICMD = ();
3905 4006
3906 trace "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3907 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3908 trace "... unloading $pkg"; 4009 trace "... unloading $pkg";
3909 4010
3910 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3911 eval { 4012 eval {
… …
3916 4017
3917 trace "... clearing $pkg"; 4018 trace "... clearing $pkg";
3918 clear_package $pkg; 4019 clear_package $pkg;
3919 } 4020 }
3920 4021
3921 trace "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3922 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3924 4025
3925 trace "... unloading $k"; 4026 trace "... unloading $k";
3926 delete $INC{$k}; 4027 delete $INC{$k};
… …
3933 } 4034 }
3934 4035
3935 clear_package $k; 4036 clear_package $k;
3936 } 4037 }
3937 4038
3938 trace "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3939 clear_package "safe::$_" 4040 clear_package "safe::$_"
3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3941 4042
3942 trace "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3943 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3945 4046
3946 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3947 # and global variables created in xs 4048 # and global variables created in xs
3948 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3949 4050
3950 info "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3951 4052
3952 trace "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3953 require cf; 4054 require cf;
3954 cf::_connect_to_perl_1; 4055 cf::_connect_to_perl_1;
3955 4056
3956 trace "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3957 cf::reload_config; 4058 cf::reload_config;
3958 4059
3959 trace "loading extensions"; 4060 trace "perl_reload: loading extensions";
3960 cf::load_extensions; 4061 cf::load_extensions;
3961 4062
3962 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3963 trace "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3964 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3965 trace "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3966 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3967 trace "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3968 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3969 } 4070 }
3970 4071
3971 trace "running post_init jobs"; 4072 cf::_post_init 1;
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973 4073
3974 trace "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3975 4075
3976 1 4076 1
3977 } or do { 4077 } or do {
3978 error $@; 4078 error $@;
3979 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3980 }; 4080 };
3981 4081
3982 info "reloaded";
3983 --$RELOAD; 4082 --$RELOAD;
3984 } 4083 }
3985 4084
3986 $t1 = AE::time - $t1; 4085 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3988}; 4087};
3989 4088
3990our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3991 4090
3992sub reload_perl() { 4091sub reload_perl() {
… …
4017 4116
4018############################################################################# 4117#############################################################################
4019 4118
4020my $bug_warning = 0; 4119my $bug_warning = 0;
4021 4120
4022our @WAIT_FOR_TICK;
4023our @WAIT_FOR_TICK_BEGIN;
4024
4025sub wait_for_tick() { 4121sub wait_for_tick() {
4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4027 4123
4028 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
4029 push @WAIT_FOR_TICK, $signal;
4030 $signal->wait;
4031} 4125}
4032 4126
4033sub wait_for_tick_begin() { 4127sub wait_for_tick_begin() {
4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4035 4129
4036 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
4037 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
4038 $signal->wait; 4132 $signal->wait;
4039} 4133}
… …
4043 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4044 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
4045 return; 4139 return;
4046 } 4140 }
4047 4141
4048 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4049 4143
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051 4145
4052 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4059 } 4153 }
4060 4154
4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4062 $sig->send; 4156 $sig->send;
4063 } 4157 }
4064 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
4065 $sig->send;
4066 }
4067 4159
4068 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4070 4162
4071 if (0) { 4163 if (0) {
… …
4080{ 4172{
4081 # configure BDB 4173 # configure BDB
4082 4174
4083 BDB::min_parallel 16; 4175 BDB::min_parallel 16;
4084 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
4085 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
4086 4178
4087 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
4088 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4125 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
4126 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
4127 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
4128} 4220}
4129 4221
4130my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
4131 4224
4132sub _log_backtrace { 4225sub _log_backtrace {
4133 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
4134 4227
4135 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
4136 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4137 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
4138 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
4139 ++$_log_backtrace; 4236 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
4141 async { 4238 async {
4142 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
4143 4240
… …
4163 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
4164 --$_log_backtrace; 4261 --$_log_backtrace;
4165 }; 4262 };
4166 } else { 4263 } else {
4167 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
4168 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4169 } 4266 }
4170} 4267}
4171 4268
4172# load additional modules 4269# load additional modules
4173require "cf/$_.pm" for @EXTRA_MODULES; 4270require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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