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.188 by root, Sat Jan 20 23:30:16 2007 UTC vs.
Revision 1.279 by root, Mon Jun 11 22:16:53 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.4 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use BDB ();
20use Data::Dumper; 26use Data::Dumper;
21use Digest::MD5; 27use Digest::MD5;
22use Fcntl; 28use Fcntl;
29use YAML::Syck ();
23use IO::AIO 2.32 (); 30use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
26 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 41
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
33 44
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 48
36our %COMMAND = (); 49our %COMMAND = ();
37our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
38 51
39our @EXTS = (); # list of extension package names 52our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 53our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
43 56
57our $RELOAD; # number of reloads so far
44our @EVENT; 58our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 59
47our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 73our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 76our $NEXT_TICK;
52our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
53 82
54our %CFG; 83our %CFG;
55 84
56our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 86our $RUNTIME;
58 87
59our %PLAYER; # all users 88our %PLAYER; # all users
60our %MAP; # all maps 89our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 91
67# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
70binmode STDOUT; 99binmode STDOUT;
71binmode STDERR; 100binmode STDERR;
72 101
73# read virtual server time, if available 102# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
78} 107}
79 108
80mkdir cf::localdir; 109mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 111
86our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
113
114sub cf::map::normalise;
87 115
88############################################################################# 116#############################################################################
89 117
90=head2 GLOBAL VARIABLES 118=head2 GLOBAL VARIABLES
91 119
98=item $cf::RUNTIME 126=item $cf::RUNTIME
99 127
100The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 129every server tick.
102 130
103=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 134
105The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
107 139
108=item $cf::NOW 140=item $cf::NOW
109 141
110The time of the last (current) server tick. 142The time of the last (current) server tick.
111 143
112=item $cf::TICK 144=item $cf::TICK
113 145
114The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
115 157
116=item %cf::CFG 158=item %cf::CFG
117 159
118Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 161from wherever your confdir points to.
120 162
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
122 164
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 168
128=back 169=back
129 170
130=cut 171=cut
131 172
132BEGIN { 173BEGIN {
133 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 175 my $msg = join "", @_;
135 utf8::encode $msg;
136 176
137 $msg .= "\n" 177 $msg .= "\n"
138 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
139 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
140 LOG llevError, $msg; 183 LOG llevError, $msg;
141 }; 184 };
142} 185}
143 186
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 194
151# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 196# within the Safe compartment.
153for my $pkg (qw( 197for my $pkg (qw(
154 cf::global cf::attachable 198 cf::global cf::attachable
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 235 $d
192 } || "[unable to dump $_[0]: '$@']"; 236 } || "[unable to dump $_[0]: '$@']";
193} 237}
194 238
195use JSON::Syck (); # TODO# replace by JSON::PC once working 239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
196 240
197=item $ref = cf::from_json $json 241=item $ref = cf::from_json $json
198 242
199Converts a JSON string into the corresponding perl data structure. 243Converts a JSON string into the corresponding perl data structure.
200 244
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 245=item $json = cf::to_json $ref
209 246
210Converts a perl data structure into its JSON representation. 247Converts a perl data structure into its JSON representation.
211
212=cut
213
214sub to_json($) {
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
216 JSON::Syck::Dump $_[0]
217}
218 248
219=item cf::lock_wait $string 249=item cf::lock_wait $string
220 250
221Wait until the given lock is available. See cf::lock_acquire. 251Wait until the given lock is available. See cf::lock_acquire.
222 252
228returned. 258returned.
229 259
230Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
232 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
233=cut 267=cut
234 268
235our %LOCK; 269our %LOCK;
236 270
237sub lock_wait($) { 271sub lock_wait($) {
256 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
258 } 292 }
259} 293}
260 294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
299}
300
261sub freeze_mainloop { 301sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
263 303
264 my $guard = Coro::guard { 304 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 305 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 306 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 307 $TICK_WATCHER->stop;
270 $guard 308 $guard
271} 309}
272 310
273=item cf::async { BLOCK } 311=item cf::async { BLOCK }
295 333
296sub sync_job(&) { 334sub sync_job(&) {
297 my ($job) = @_; 335 my ($job) = @_;
298 336
299 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
300 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
302 342
303 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 344 # (but this is cancel-safe)
315 355
316 while ($busy) { 356 while ($busy) {
317 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
318 } 358 }
319 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
320 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
321 } else { 368 } else {
322 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
323 370
324 $job->() 371 $job->()
344 391
345 $coro 392 $coro
346} 393}
347 394
348sub write_runtime { 395sub write_runtime {
349 my $runtime = cf::localdir . "/runtime"; 396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
403 my $guard = cf::lock_acquire "write_runtime";
350 404
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 406 or return;
353 407
354 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
356 # 60 allows for the watchdog to kill the server. 410 # 60 allows for the watchdog to kill the server.
357 411
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 412 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 413 and return;
360 414
415 # always fsync - this file is important
361 aio_fsync $fh 416 aio_fsync $fh
362 and return; 417 and return;
363 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
364 close $fh 422 close $fh
365 or return; 423 or return;
366 424
367 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
368 and return; 426 and return;
369 427
428 warn "runtime file written.\n";
429
370 1 430 1
431}
432
433=item cf::datalog type => key => value, ...
434
435Log a datalog packet of the given type with the given key-value pairs.
436
437=cut
438
439sub datalog($@) {
440 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 442}
372 443
373=back 444=back
374 445
375=cut 446=cut
555 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
556 627
557 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
558 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
559 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
560 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
561 632
562 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
563 my $pkg = shift @arg; 634 my $pkg = shift @arg;
564 635
565 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
606 if (ref $_[0]) { 677 if (ref $_[0]) {
607 _object_attach @_; 678 _object_attach @_;
608 } else { 679 } else {
609 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
610 } 681 }
682 _recalc_want;
611}; 683};
612 684
613# all those should be optimised 685# all those should be optimised
614sub cf::attachable::detach { 686sub cf::attachable::detach {
615 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
618 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
619 reattach ($obj); 691 reattach ($obj);
620 } else { 692 } else {
621 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
622 } 694 }
695 _recalc_want;
623}; 696};
624 697
625sub cf::attachable::attached { 698sub cf::attachable::attached {
626 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
627 700
750 $filename, length $$rdata, scalar @$objs; 823 $filename, length $$rdata, scalar @$objs;
751 824
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 826 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 827 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 828 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 829 close $fh;
757 830
758 if (@$objs) { 831 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 833 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 834 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 835 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 836 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 837 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 838 aio_rename "$filename.pst~", "$filename.pst";
766 } 839 }
767 } else { 840 } else {
768 aio_unlink "$filename.pst"; 841 aio_unlink "$filename.pst";
800 or return; 873 or return;
801 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
802 } 875 }
803 876
804 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
805 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
806 return ($data, $av); 879 return ($data, $av);
807} 880}
808 881
809############################################################################# 882#############################################################################
810# command handling &c 883# command handling &c
870 943
871 cf::override; 944 cf::override;
872 }, 945 },
873); 946);
874 947
875sub load_extension {
876 my ($path) = @_;
877
878 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
879 my $base = $1;
880 my $pkg = $1;
881 $pkg =~ s/[^[:word:]]/_/g;
882 $pkg = "ext::$pkg";
883
884 warn "... loading '$path' into '$pkg'\n";
885
886 open my $fh, "<:utf8", $path
887 or die "$path: $!";
888
889 my $source =
890 "package $pkg; use strict; use utf8;\n"
891 . "#line 1 \"$path\"\n{\n"
892 . (do { local $/; <$fh> })
893 . "\n};\n1";
894
895 unless (eval $source) {
896 my $msg = $@ ? "$path: $@\n"
897 : "extension disabled.\n";
898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899 warn $@;
900 warn "mandatory extension failed to load, exiting.\n";
901 exit 1;
902 }
903 die $@;
904 }
905
906 push @EXTS, $pkg;
907}
908
909sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
910 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
911 next unless -r $ext; 953 next unless -r $path;
912 eval { 954
913 load_extension $ext; 955 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
956 my $base = $1;
957 my $pkg = $1;
958 $pkg =~ s/[^[:word:]]/_/g;
959 $pkg = "ext::$pkg";
960
961 open my $fh, "<:utf8", $path
962 or die "$path: $!";
963
964 my $source = do { local $/; <$fh> };
965
966 my %ext = (
967 path => $path,
968 base => $base,
969 pkg => $pkg,
970 );
971
972 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974
975 $ext{source} =
976 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n"
978 . $source
979 . "\n};\n1";
980
981 $todo{$base} = \%ext;
982 }
983
984 my %done;
985 while (%todo) {
986 my $progress;
987
988 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip
991 unless exists $done{$_};
992 }
993
994 warn "... loading '$k' into '$v->{pkg}'\n";
995
996 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n"
998 : "$v->{base}: extension inactive.\n";
999
1000 if (exists $v->{meta}{mandatory}) {
1001 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1;
1004 }
1005
1006 warn $msg;
1007 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
1011 $progress = 1;
914 1 1012 }
915 } or warn "$ext not loaded: $@"; 1013
1014 skip:
1015 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1016 unless $progress;
1017 }
916 } 1018 };
917} 1019}
918 1020
919############################################################################# 1021#############################################################################
920 1022
921=head2 CORE EXTENSIONS 1023=head2 CORE EXTENSIONS
937Returns the given player object, loading it if necessary (might block). 1039Returns the given player object, loading it if necessary (might block).
938 1040
939=cut 1041=cut
940 1042
941sub playerdir($) { 1043sub playerdir($) {
942 cf::localdir 1044 "$PLAYERDIR/"
943 . "/"
944 . cf::playerdir
945 . "/"
946 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1045 . (ref $_[0] ? $_[0]->ob->name : $_[0])
947} 1046}
948 1047
949sub path($) { 1048sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1049 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 1050
952 (playerdir $login) . "/$login.pl" 1051 (playerdir $login) . "/playerdata"
953} 1052}
954 1053
955sub find_active($) { 1054sub find_active($) {
956 $cf::PLAYER{$_[0]} 1055 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 1056 and $cf::PLAYER{$_[0]}->active
970 my $login = $_[0]; 1069 my $login = $_[0];
971 1070
972 my $guard = cf::lock_acquire "user_find:$login"; 1071 my $guard = cf::lock_acquire "user_find:$login";
973 1072
974 $cf::PLAYER{$_[0]} || do { 1073 $cf::PLAYER{$_[0]} || do {
1074 # rename old playerfiles to new ones
1075 #TODO: remove when no longer required
1076 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1077 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1078 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1079 aio_unlink +(playerdir $login) . "/$login.pl";
1080
975 my $pl = load_pl path $login 1081 my $pl = load_pl path $login
976 or return; 1082 or return;
977 $cf::PLAYER{$login} = $pl 1083 $cf::PLAYER{$login} = $pl
978 } 1084 }
979 } 1085 }
1016 1122
1017=cut 1123=cut
1018 1124
1019sub quit_character { 1125sub quit_character {
1020 my ($pl) = @_; 1126 my ($pl) = @_;
1127
1128 my $name = $pl->ob->name;
1021 1129
1022 $pl->{deny_save} = 1; 1130 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1131 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1132
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1133 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1030 my $path = playerdir $pl; 1138 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1139 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1140 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1141 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1142 $pl->destroy;
1143
1144 my $prefix = qr<^~\Q$name\E/>;
1145
1146 # nuke player maps
1147 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1148
1035 IO::AIO::aio_rmtree $temp; 1149 IO::AIO::aio_rmtree $temp;
1150}
1151
1152=item $pl->kick
1153
1154Kicks a player out of the game. This destroys the connection.
1155
1156=cut
1157
1158sub kick {
1159 my ($pl, $kicker) = @_;
1160
1161 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1162 $pl->killer ("kicked");
1163 $pl->ns->destroy;
1036} 1164}
1037 1165
1038=item cf::player::list_logins 1166=item cf::player::list_logins
1039 1167
1040Returns am arrayref of all valid playernames in the system, can take a 1168Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever. 1169while and may block, so not sync_job-capable, ever.
1042 1170
1043=cut 1171=cut
1044 1172
1045sub list_logins { 1173sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1174 my $dirs = aio_readdir $PLAYERDIR
1047 or return []; 1175 or return [];
1048 1176
1049 my @logins; 1177 my @logins;
1050 1178
1051 for my $login (@$dirs) { 1179 for my $login (@$dirs) {
1068=cut 1196=cut
1069 1197
1070sub maps($) { 1198sub maps($) {
1071 my ($pl) = @_; 1199 my ($pl) = @_;
1072 1200
1201 $pl = ref $pl ? $pl->ob->name : $pl;
1202
1073 my $files = aio_readdir playerdir $pl 1203 my $files = aio_readdir playerdir $pl
1074 or return; 1204 or return;
1075 1205
1076 my @paths; 1206 my @paths;
1077 1207
1078 for (@$files) { 1208 for (@$files) {
1079 utf8::decode $_; 1209 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1210 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1211 next unless /^$PATH_SEP/o;
1082 1212
1083 s/\.map$//; 1213 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1214 }
1086 1215
1087 \@paths 1216 \@paths
1088} 1217}
1089 1218
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1219=item $player->ext_reply ($msgid, %msg)
1091 1220
1092Sends an ext reply to the player. 1221Sends an ext reply to the player.
1093 1222
1094=cut 1223=cut
1095 1224
1096sub ext_reply($$$%) { 1225sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1226 my ($self, $id, %msg) = @_;
1098 1227
1099 $msg{msgid} = $id; 1228 $msg{msgid} = $id;
1100 1229
1101 $self->send ("ext " . cf::to_json \%msg); 1230 $self->send ("ext " . cf::to_json \%msg);
1102} 1231}
1103 1232
1104package cf; 1233=item $player->ext_event ($type, %msg)
1234
1235Sends an ext event to the client.
1236
1237=cut
1238
1239sub ext_event($$%) {
1240 my ($self, $type, %msg) = @_;
1241
1242 $self->ns->ext_event ($type, %msg);
1243}
1244
1245=head3 cf::region
1246
1247=over 4
1248
1249=cut
1250
1251package cf::region;
1252
1253=item cf::region::find_by_path $path
1254
1255Tries to decuce the probable region for a map knowing only its path.
1256
1257=cut
1258
1259sub find_by_path($) {
1260 my ($path) = @_;
1261
1262 my ($match, $specificity);
1263
1264 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) {
1266 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity;
1268 }
1269 }
1270
1271 $match
1272}
1105 1273
1106=back 1274=back
1107
1108 1275
1109=head3 cf::map 1276=head3 cf::map
1110 1277
1111=over 4 1278=over 4
1112 1279
1167 my ($self, $merge) = @_; 1334 my ($self, $merge) = @_;
1168 1335
1169 # we have to keep some variables in memory intact 1336 # we have to keep some variables in memory intact
1170 local $self->{path}; 1337 local $self->{path};
1171 local $self->{load_path}; 1338 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174 1339
1175 $self->SUPER::thawer_merge ($merge); 1340 $self->SUPER::thawer_merge ($merge);
1176} 1341}
1177 1342
1178sub normalise { 1343sub normalise {
1179 my ($path, $base) = @_; 1344 my ($path, $base) = @_;
1345
1346 $path = "$path"; # make sure its a string
1347
1348 $path =~ s/\.map$//;
1180 1349
1181 # map plan: 1350 # map plan:
1182 # 1351 #
1183 # /! non-realised random map exit (special hack!) 1352 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1353 # {... are special paths that are not being touched
1221 $self->init; # pass $1 etc. 1390 $self->init; # pass $1 etc.
1222 return $self; 1391 return $self;
1223 } 1392 }
1224 } 1393 }
1225 1394
1226 Carp::carp "unable to resolve path '$path'."; 1395 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1396 ()
1228} 1397}
1229 1398
1230sub init { 1399sub init {
1231 my ($self) = @_; 1400 my ($self) = @_;
1246 1415
1247# the original (read-only) location 1416# the original (read-only) location
1248sub load_path { 1417sub load_path {
1249 my ($self) = @_; 1418 my ($self) = @_;
1250 1419
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1420 "$MAPDIR/$self->{path}.map"
1252} 1421}
1253 1422
1254# the temporary/swap location 1423# the temporary/swap location
1255sub save_path { 1424sub save_path {
1256 my ($self) = @_; 1425 my ($self) = @_;
1257 1426
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1428 "$TMPDIR/$path.map"
1260} 1429}
1261 1430
1262# the unique path, undef == no special unique path 1431# the unique path, undef == no special unique path
1263sub uniq_path { 1432sub uniq_path {
1264 my ($self) = @_; 1433 my ($self) = @_;
1265 1434
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1436 "$UNIQUEDIR/$path"
1268} 1437}
1269 1438
1270# and all this just because we cannot iterate over 1439# and all this just because we cannot iterate over
1271# all maps in C++... 1440# all maps in C++...
1272sub change_all_map_light { 1441sub change_all_map_light {
1274 1443
1275 $_->change_map_light ($change) 1444 $_->change_map_light ($change)
1276 for grep $_->outdoor, values %cf::MAP; 1445 for grep $_->outdoor, values %cf::MAP;
1277} 1446}
1278 1447
1448sub decay_objects {
1449 my ($self) = @_;
1450
1451 return if $self->{deny_reset};
1452
1453 $self->do_decay_objects;
1454}
1455
1279sub unlink_save { 1456sub unlink_save {
1280 my ($self) = @_; 1457 my ($self) = @_;
1281 1458
1282 utf8::encode (my $save = $self->save_path); 1459 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1460 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 1463
1287sub load_header_from($) { 1464sub load_header_from($) {
1288 my ($self, $path) = @_; 1465 my ($self, $path) = @_;
1289 1466
1290 utf8::encode $path; 1467 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1468 #aio_open $path, O_RDONLY, 0
1292 or return; 1469 # or return;
1293 1470
1294 $self->_load_header ($path) 1471 $self->_load_header ($path)
1295 or return; 1472 or return;
1296 1473
1297 $self->{load_path} = $path; 1474 $self->{load_path} = $path;
1339 $self->load_header_orig 1516 $self->load_header_orig
1340 or return; 1517 or return;
1341 $self->prepare_orig; 1518 $self->prepare_orig;
1342 } 1519 }
1343 1520
1521 $self->{deny_reset} = 1
1522 if $self->no_reset;
1523
1524 $self->default_region (cf::region::find_by_path $self->{path})
1525 unless $self->default_region;
1526
1344 1 1527 1
1345} 1528}
1346 1529
1347sub find; 1530sub find;
1348sub find { 1531sub find {
1360 $map->{last_save} = $cf::RUNTIME; 1543 $map->{last_save} = $cf::RUNTIME;
1361 1544
1362 $map->load_header 1545 $map->load_header
1363 or return; 1546 or return;
1364 1547
1365 if ($map->should_reset) { 1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1366 # doing this can freeze the server in a sync job, obviously 1549 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait; 1550 #$cf::WAIT_FOR_TICK->wait;
1368 $map->reset; 1551 $map->reset;
1369 undef $guard; 1552 undef $guard;
1370 $map = find $path 1553 return find $path;
1371 or return;
1372 } 1554 }
1373 1555
1374 $cf::MAP{$path} = $map 1556 $cf::MAP{$path} = $map
1375 } 1557 }
1376} 1558}
1379sub post_load { } 1561sub post_load { }
1380 1562
1381sub load { 1563sub load {
1382 my ($self) = @_; 1564 my ($self) = @_;
1383 1565
1566 local $self->{deny_reset} = 1; # loading can take a long time
1567
1384 my $path = $self->{path}; 1568 my $path = $self->{path};
1569
1570 {
1385 my $guard = cf::lock_acquire "map_load:$path"; 1571 my $guard = cf::lock_acquire "map_load:$path";
1386 1572
1387 return if $self->in_memory != cf::MAP_SWAPPED; 1573 return if $self->in_memory != cf::MAP_SWAPPED;
1388 1574
1389 $self->in_memory (cf::MAP_LOADING); 1575 $self->in_memory (cf::MAP_LOADING);
1390 1576
1391 $self->alloc; 1577 $self->alloc;
1392 1578
1393 $self->pre_load; 1579 $self->pre_load;
1394
1395 $self->_load_objects ($self->{load_path}, 1)
1396 or return;
1397
1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1399 if delete $self->{load_original};
1400
1401 if (my $uniq = $self->uniq_path) {
1402 utf8::encode $uniq;
1403 if (aio_open $uniq, O_RDONLY, 0) {
1404 $self->clear_unique_items;
1405 $self->_load_objects ($uniq, 0);
1406 }
1407 }
1408
1409 Coro::cede;
1410
1411 # now do the right thing for maps
1412 $self->link_multipart_objects;
1413
1414 unless ($self->{deny_activate}) {
1415 $self->decay_objects;
1416 $self->fix_auto_apply;
1417 $self->update_buttons;
1418 Coro::cede; 1580 Coro::cede;
1419 $self->set_darkness_map; 1581
1582 $self->_load_objects ($self->{load_path}, 1)
1583 or return;
1584
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1586 if delete $self->{load_original};
1587
1588 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) {
1591 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0);
1593 }
1594 }
1595
1596 Coro::cede;
1597 # now do the right thing for maps
1598 $self->link_multipart_objects;
1420 $self->difficulty ($self->estimate_difficulty) 1599 $self->difficulty ($self->estimate_difficulty)
1421 unless $self->difficulty; 1600 unless $self->difficulty;
1422 Coro::cede; 1601 Coro::cede;
1602
1603 unless ($self->{deny_activate}) {
1604 $self->decay_objects;
1605 $self->fix_auto_apply;
1606 $self->update_buttons;
1607 Coro::cede;
1608 $self->set_darkness_map;
1609 Coro::cede;
1423 $self->activate; 1610 $self->activate;
1611 }
1612
1613 $self->in_memory (cf::MAP_IN_MEMORY);
1424 } 1614 }
1425 1615
1426 $self->post_load; 1616 $self->post_load;
1427
1428 $self->in_memory (cf::MAP_IN_MEMORY);
1429} 1617}
1430 1618
1431sub customise_for { 1619sub customise_for {
1432 my ($self, $ob) = @_; 1620 my ($self, $ob) = @_;
1433 1621
1434 return find "~" . $ob->name . "/" . $self->{path} 1622 return find "~" . $ob->name . "/" . $self->{path}
1435 if $self->per_player; 1623 if $self->per_player;
1624
1625# return find "?party/" . $ob->name . "/" . $self->{path}
1626# if $self->per_party;
1436 1627
1437 $self 1628 $self
1438} 1629}
1439 1630
1440# find and load all maps in the 3x3 area around a map 1631# find and load all maps in the 3x3 area around a map
1496 delete $MAP_PREFETCH{$path}; 1687 delete $MAP_PREFETCH{$path};
1497 } 1688 }
1498 } 1689 }
1499 undef $MAP_PREFETCHER; 1690 undef $MAP_PREFETCHER;
1500 }; 1691 };
1692 $MAP_PREFETCHER->prio (6);
1501 1693
1502 () 1694 ()
1503} 1695}
1504 1696
1505sub save { 1697sub save {
1550 1742
1551sub reset_at { 1743sub reset_at {
1552 my ($self) = @_; 1744 my ($self) = @_;
1553 1745
1554 # TODO: safety, remove and allow resettable per-player maps 1746 # TODO: safety, remove and allow resettable per-player maps
1555 return 1e99 if $self->isa ("ext::map_per_player");#d#
1556 return 1e99 if $self->{deny_reset}; 1747 return 1e99 if $self->{deny_reset};
1557 1748
1558 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1749 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1559 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1750 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1560 1751
1571 my ($self) = @_; 1762 my ($self) = @_;
1572 1763
1573 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1764 my $lock = cf::lock_acquire "map_data:$self->{path}";
1574 1765
1575 return if $self->players; 1766 return if $self->players;
1576 return if $self->isa ("ext::map_per_player");#d#
1577 1767
1578 warn "resetting map ", $self->path;#d# 1768 warn "resetting map ", $self->path;
1769
1770 $self->in_memory (cf::MAP_SWAPPED);
1771
1772 # need to save uniques path
1773 unless ($self->{deny_save}) {
1774 my $uniq = $self->uniq_path; utf8::encode $uniq;
1775
1776 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1777 if $uniq;
1778 }
1579 1779
1580 delete $cf::MAP{$self->path}; 1780 delete $cf::MAP{$self->path};
1581 1781
1582 $self->in_memory (cf::MAP_SWAPPED);
1583 $self->clear; 1782 $self->clear;
1584 1783
1585 $_->clear_links_to ($self) for values %cf::MAP; 1784 $_->clear_links_to ($self) for values %cf::MAP;
1586 1785
1587 $self->unlink_save; 1786 $self->unlink_save;
1606 $cf::MAP{$self->path} = $self; 1805 $cf::MAP{$self->path} = $self;
1607 1806
1608 $self->reset; # polite request, might not happen 1807 $self->reset; # polite request, might not happen
1609} 1808}
1610 1809
1810=item $maps = cf::map::tmp_maps
1811
1812Returns an arrayref with all map paths of currently instantiated and saved
1813maps. May block.
1814
1815=cut
1816
1817sub tmp_maps() {
1818 [
1819 map {
1820 utf8::decode $_;
1821 /\.map$/
1822 ? normalise $_
1823 : ()
1824 } @{ aio_readdir $TMPDIR or [] }
1825 ]
1826}
1827
1828=item $maps = cf::map::random_maps
1829
1830Returns an arrayref with all map paths of currently instantiated and saved
1831random maps. May block.
1832
1833=cut
1834
1835sub random_maps() {
1836 [
1837 map {
1838 utf8::decode $_;
1839 /\.map$/
1840 ? normalise "?random/$_"
1841 : ()
1842 } @{ aio_readdir $RANDOMDIR or [] }
1843 ]
1844}
1845
1611=item cf::map::unique_maps 1846=item cf::map::unique_maps
1612 1847
1613Returns an arrayref of paths of all shared maps that have 1848Returns an arrayref of paths of all shared maps that have
1614instantiated unique items. May block. 1849instantiated unique items. May block.
1615 1850
1616=cut 1851=cut
1617 1852
1618sub unique_maps() { 1853sub unique_maps() {
1619 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1854 [
1620 or return; 1855 map {
1621
1622 my @paths;
1623
1624 for (@$files) {
1625 utf8::decode $_; 1856 utf8::decode $_;
1626 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o;
1628
1629 s/\.map$//; 1857 /\.map$/
1630 push @paths, $_; 1858 ? normalise $_
1859 : ()
1860 } @{ aio_readdir $UNIQUEDIR or [] }
1631 } 1861 ]
1632
1633 \@paths
1634} 1862}
1635 1863
1636package cf; 1864package cf;
1637 1865
1638=back 1866=back
1729=cut 1957=cut
1730 1958
1731sub link_map { 1959sub link_map {
1732 unless ($LINK_MAP) { 1960 unless ($LINK_MAP) {
1733 $LINK_MAP = cf::map::find "{link}" 1961 $LINK_MAP = cf::map::find "{link}"
1734 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1962 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1735 $LINK_MAP->load; 1963 $LINK_MAP->load;
1736 } 1964 }
1737 1965
1738 $LINK_MAP 1966 $LINK_MAP
1739} 1967}
1744 $self->deactivate_recursive; 1972 $self->deactivate_recursive;
1745 1973
1746 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1974 return if UNIVERSAL::isa $self->map, "ext::map_link";
1747 1975
1748 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1749 if $self->map; 1977 if $self->map && $self->map->{path} ne "{link}";
1750 1978
1751 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1979 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1752} 1980}
1753 1981
1754sub cf::object::player::leave_link { 1982sub cf::object::player::leave_link {
1755 my ($self, $map, $x, $y) = @_; 1983 my ($self, $map, $x, $y) = @_;
1984
1985 return unless $self->contr->active;
1756 1986
1757 my $link_pos = delete $self->{_link_pos}; 1987 my $link_pos = delete $self->{_link_pos};
1758 1988
1759 unless ($map) { 1989 unless ($map) {
1760 # restore original map position 1990 # restore original map position
1778 $map->load; 2008 $map->load;
1779 $map->load_diag; 2009 $map->load_diag;
1780 2010
1781 return unless $self->contr->active; 2011 return unless $self->contr->active;
1782 $self->activate_recursive; 2012 $self->activate_recursive;
2013
2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1783 $self->enter_map ($map, $x, $y); 2015 $self->enter_map ($map, $x, $y);
1784} 2016}
1785 2017
1786cf::player->attach (
1787 on_logout => sub {
1788 my ($pl) = @_;
1789
1790 # abort map switching before logout
1791 if ($pl->ob->{_link_pos}) {
1792 cf::sync_job {
1793 $pl->ob->leave_link
1794 };
1795 }
1796 },
1797 on_login => sub {
1798 my ($pl) = @_;
1799
1800 # try to abort aborted map switching on player login :)
1801 # should happen only on crashes
1802 if ($pl->ob->{_link_pos}) {
1803 $pl->ob->enter_link;
1804 (async {
1805 # we need this sleep as the login has a concurrent enter_exit running
1806 # and this sleep increases chances of the player not ending up in scorn
1807 $pl->ob->reply (undef,
1808 "There was an internal problem at your last logout, "
1809 . "the server will try to bring you to your intended destination in a second.",
1810 cf::NDI_RED);
1811 Coro::Timer::sleep 1;
1812 $pl->ob->leave_link;
1813 })->prio (2);
1814 }
1815 },
1816);
1817
1818=item $player_object->goto ($path, $x, $y) 2018=item $player_object->goto ($path, $x, $y[, $check->($map)])
1819 2019
2020Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position.
2024
1820=cut 2025=cut
2026
2027our $GOTOGEN;
1821 2028
1822sub cf::object::player::goto { 2029sub cf::object::player::goto {
1823 my ($self, $path, $x, $y) = @_; 2030 my ($self, $path, $x, $y, $check) = @_;
2031
2032 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1824 2034
1825 $self->enter_link; 2035 $self->enter_link;
1826 2036
1827 (async { 2037 (async {
2038 my $map = eval {
1828 my $map = cf::map::find $path; 2039 my $map = cf::map::find $path;
2040
2041 if ($map) {
1829 $map = $map->customise_for ($self) if $map; 2042 $map = $map->customise_for ($self);
1830 2043 $map = $check->($map) if $check && $map;
1831# warn "entering ", $map->path, " at ($x, $y)\n" 2044 } else {
1832# if $map;
1833
1834 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2046 }
1835 2047
2048 $map
2049 };
2050
2051 if ($@) {
2052 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2053 LOG llevError | logBacktrace, Carp::longmess $@;
2054 }
2055
2056 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation};
1836 $self->leave_link ($map, $x, $y); 2058 $self->leave_link ($map, $x, $y);
2059 }
1837 })->prio (1); 2060 })->prio (1);
1838} 2061}
1839 2062
1840=item $player_object->enter_exit ($exit_object) 2063=item $player_object->enter_exit ($exit_object)
1841 2064
1870 # that depends on the exit object 2093 # that depends on the exit object
1871 2094
1872 my $rmp = parse_random_map_params $exit->msg; 2095 my $rmp = parse_random_map_params $exit->msg;
1873 2096
1874 if ($exit->map) { 2097 if ($exit->map) {
1875 $rmp->{region} = $exit->map->region_name; 2098 $rmp->{region} = $exit->region->name;
1876 $rmp->{origin_map} = $exit->map->path; 2099 $rmp->{origin_map} = $exit->map->path;
1877 $rmp->{origin_x} = $exit->x; 2100 $rmp->{origin_x} = $exit->x;
1878 $rmp->{origin_y} = $exit->y; 2101 $rmp->{origin_y} = $exit->y;
1879 } 2102 }
1880 2103
1881 $rmp->{random_seed} ||= $exit->random_seed; 2104 $rmp->{random_seed} ||= $exit->random_seed;
1882 2105
1883 my $data = cf::to_json $rmp; 2106 my $data = cf::to_json $rmp;
1884 my $md5 = Digest::MD5::md5_hex $data; 2107 my $md5 = Digest::MD5::md5_hex $data;
1885 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2108 my $meta = "$RANDOMDIR/$md5.meta";
1886 2109
1887 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1888 aio_write $fh, 0, (length $data), $data, 0; 2111 aio_write $fh, 0, (length $data), $data, 0;
1889 undef $fh; 2112 undef $fh;
1890 aio_rename "$meta~", $meta; 2113 aio_rename "$meta~", $meta;
1897sub cf::object::player::enter_exit { 2120sub cf::object::player::enter_exit {
1898 my ($self, $exit) = @_; 2121 my ($self, $exit) = @_;
1899 2122
1900 return unless $self->type == cf::PLAYER; 2123 return unless $self->type == cf::PLAYER;
1901 2124
2125 if ($exit->slaying eq "/!") {
2126 #TODO: this should de-fi-ni-te-ly not be a sync-job
2127 # the problem is that $exit might not survive long enough
2128 # so it needs to be done right now, right here
2129 cf::sync_job { prepare_random_map $exit };
2130 }
2131
2132 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2133 my $hp = $exit->stats->hp;
2134 my $sp = $exit->stats->sp;
2135
1902 $self->enter_link; 2136 $self->enter_link;
1903 2137
1904 (async { 2138 (async {
1905 $self->deactivate_recursive; # just to be sure 2139 $self->deactivate_recursive; # just to be sure
1906 unless (eval { 2140 unless (eval {
1907 prepare_random_map $exit 2141 $self->goto ($slaying, $hp, $sp);
1908 if $exit->slaying eq "/!";
1909
1910 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1911 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1912 2142
1913 1; 2143 1;
1914 }) { 2144 }) {
1915 $self->message ("Something went wrong deep within the crossfire server. " 2145 $self->message ("Something went wrong deep within the crossfire server. "
1916 . "I'll try to bring you back to the map you were before. " 2146 . "I'll try to bring you back to the map you were before. "
1917 . "Please report this to the dungeon master!", 2147 . "Please report this to the dungeon master!",
1918 cf::NDI_UNIQUE | cf::NDI_RED); 2148 cf::NDI_UNIQUE | cf::NDI_RED);
1919 2149
1920 warn "ERROR in enter_exit: $@"; 2150 warn "ERROR in enter_exit: $@";
1921 $self->leave_link; 2151 $self->leave_link;
1922 } 2152 }
1923 })->prio (1); 2153 })->prio (1);
1936 2166
1937sub cf::client::send_drawinfo { 2167sub cf::client::send_drawinfo {
1938 my ($self, $text, $flags) = @_; 2168 my ($self, $text, $flags) = @_;
1939 2169
1940 utf8::encode $text; 2170 utf8::encode $text;
1941 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2171 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1942} 2172}
1943 2173
2174=item $client->ext_event ($type, %msg)
2175
2176Sends an exti event to the client.
2177
2178=cut
2179
2180sub cf::client::ext_event($$%) {
2181 my ($self, $type, %msg) = @_;
2182
2183 $msg{msgtype} = "event_$type";
2184 $self->send_packet ("ext " . cf::to_json \%msg);
2185}
1944 2186
1945=item $success = $client->query ($flags, "text", \&cb) 2187=item $success = $client->query ($flags, "text", \&cb)
1946 2188
1947Queues a query to the client, calling the given callback with 2189Queues a query to the client, calling the given callback with
1948the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2190the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1977 # get handled first 2219 # get handled first
1978 my $queue = delete $ns->{query_queue} 2220 my $queue = delete $ns->{query_queue}
1979 or return; # be conservative, not sure how that can happen, but we saw a crash here 2221 or return; # be conservative, not sure how that can happen, but we saw a crash here
1980 2222
1981 (shift @$queue)->[1]->($msg); 2223 (shift @$queue)->[1]->($msg);
2224 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1982 2225
1983 push @{ $ns->{query_queue} }, @$queue; 2226 push @{ $ns->{query_queue} }, @$queue;
1984 2227
1985 if (@{ $ns->{query_queue} } == @$queue) { 2228 if (@{ $ns->{query_queue} } == @$queue) {
1986 if (@$queue) { 2229 if (@$queue) {
2044 2287
2045# here we export the classes and methods available to script code 2288# here we export the classes and methods available to script code
2046 2289
2047=pod 2290=pod
2048 2291
2049The following fucntions and emthods are available within a safe environment: 2292The following functions and methods are available within a safe environment:
2050 2293
2051 cf::object contr pay_amount pay_player map 2294 cf::object contr pay_amount pay_player map
2052 cf::object::player player 2295 cf::object::player player
2053 cf::player peaceful 2296 cf::player peaceful
2054 cf::map trigger 2297 cf::map trigger
2139############################################################################# 2382#############################################################################
2140 2383
2141=head2 EXTENSION DATABASE SUPPORT 2384=head2 EXTENSION DATABASE SUPPORT
2142 2385
2143Crossfire maintains a very simple database for extension use. It can 2386Crossfire maintains a very simple database for extension use. It can
2144currently store anything that can be serialised using Storable, which 2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2145excludes objects. 2388convert to/from binary).
2146 2389
2147The parameter C<$family> should best start with the name of the extension 2390The parameter C<$family> should best start with the name of the extension
2148using it, it should be unique. 2391using it, it should be unique.
2149 2392
2150=over 4 2393=over 4
2151 2394
2152=item $hashref = cf::db_get $family
2153
2154Return a hashref for use by the extension C<$family>, which can be
2155modified. After modifications, you have to call C<cf::db_dirty> or
2156C<cf::db_sync>.
2157
2158=item $value = cf::db_get $family => $key 2395=item $value = cf::db_get $family => $key
2159 2396
2160Returns a single value from the database 2397Returns a single value from the database.
2161
2162=item cf::db_put $family => $hashref
2163
2164Stores the given family hashref into the database. Updates are delayed, if
2165you want the data to be synced to disk immediately, use C<cf::db_sync>.
2166 2398
2167=item cf::db_put $family => $key => $value 2399=item cf::db_put $family => $key => $value
2168 2400
2169Stores the given C<$value> in the family hash. Updates are delayed, if you 2401Stores the given C<$value> in the family.
2170want the data to be synced to disk immediately, use C<cf::db_sync>.
2171
2172=item cf::db_dirty
2173
2174Marks the database as dirty, to be updated at a later time.
2175
2176=item cf::db_sync
2177
2178Immediately write the database to disk I<if it is dirty>.
2179 2402
2180=cut 2403=cut
2181 2404
2182our $DB; 2405our $DB;
2183 2406
2184{ 2407sub db_init {
2185 my $path = cf::localdir . "/database.pst"; 2408 unless ($DB) {
2409 $DB = BDB::db_create $DB_ENV;
2186 2410
2187 sub db_load() { 2411 cf::sync_job {
2188 $DB = stat $path ? Storable::retrieve $path : { }; 2412 eval {
2189 } 2413 $DB->set_flags (BDB::CHKSUM);
2190 2414
2191 my $pid; 2415 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2192 2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2193 sub db_save() { 2417 cf::cleanup "db_open(db): $!" if $!;
2194 waitpid $pid, 0 if $pid; 2418 };
2195 if (0 == ($pid = fork)) { 2419 cf::cleanup "db_open(db): $@" if $@;
2196 $DB->{_meta}{version} = 1;
2197 Storable::nstore $DB, "$path~";
2198 rename "$path~", $path;
2199 cf::_exit 0 if defined $pid;
2200 } 2420 };
2201 }
2202
2203 my $dirty;
2204
2205 sub db_sync() {
2206 db_save if $dirty;
2207 undef $dirty;
2208 }
2209
2210 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2211 db_sync;
2212 }); 2421 }
2422}
2213 2423
2214 sub db_dirty() {
2215 $dirty = 1;
2216 $idle->start;
2217 }
2218
2219 sub db_get($;$) { 2424sub db_get($$) {
2220 @_ >= 2 2425 my $key = "$_[0]/$_[1]";
2221 ? $DB->{$_[0]}{$_[1]}
2222 : ($DB->{$_[0]} ||= { })
2223 }
2224 2426
2427 cf::sync_job {
2428 BDB::db_get $DB, undef, $key, my $data;
2429
2430 $! ? ()
2431 : $data
2432 }
2433}
2434
2225 sub db_put($$;$) { 2435sub db_put($$$) {
2226 if (@_ >= 3) { 2436 BDB::dbreq_pri 4;
2227 $DB->{$_[0]}{$_[1]} = $_[2]; 2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2228 } else { 2438}
2229 $DB->{$_[0]} = $_[1];
2230 }
2231 db_dirty;
2232 }
2233 2439
2234 cf::global->attach ( 2440=item cf::cache $id => [$paths...], $processversion => $process
2235 prio => 10000, 2441
2236 on_cleanup => sub { 2442Generic caching function that returns the value of the resource $id,
2237 db_sync; 2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2238 }, 2472 }
2239 ); 2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2240} 2552}
2241 2553
2242############################################################################# 2554#############################################################################
2243# the server's main() 2555# the server's init and main functions
2556
2557sub load_facedata($) {
2558 my ($path) = @_;
2559
2560 warn "loading facedata from $path\n";
2561
2562 my $facedata;
2563 0 < aio_load $path, $facedata
2564 or die "$path: $!";
2565
2566 $facedata = Coro::Storable::thaw $facedata;
2567
2568 $facedata->{version} == 2
2569 or cf::cleanup "$path: version mismatch, cannot proceed.";
2570
2571 {
2572 my $faces = $facedata->{faceinfo};
2573
2574 while (my ($face, $info) = each %$faces) {
2575 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2579 Coro::cede;
2580 }
2581
2582 while (my ($face, $info) = each %$faces) {
2583 next unless $info->{smooth};
2584 my $idx = cf::face::find $face
2585 or next;
2586 if (my $smooth = cf::face::find $info->{smooth}) {
2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2588 } else {
2589 warn "smooth face '$info->{smooth}' not found for face '$face'";
2590 }
2591 Coro::cede;
2592 }
2593 }
2594
2595 {
2596 my $anims = $facedata->{animinfo};
2597
2598 while (my ($anim, $info) = each %$anims) {
2599 cf::anim::set $anim, $info->{frames}, $info->{facings};
2600 Coro::cede;
2601 }
2602
2603 cf::anim::invalidate_all; # d'oh
2604 }
2605
2606 1
2607}
2608
2609sub reload_regions {
2610 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n";
2612}
2613
2614sub reload_facedata {
2615 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n";
2617}
2618
2619sub reload_archetypes {
2620 load_resource_file "$DATADIR/archetypes"
2621 or die "unable to load archetypes\n";
2622}
2623
2624sub reload_treasures {
2625 load_resource_file "$DATADIR/treasures"
2626 or die "unable to load treasurelists\n";
2627}
2628
2629sub reload_resources {
2630 warn "reloading resource files...\n";
2631
2632 reload_regions;
2633 reload_facedata;
2634 #reload_archetypes;#d#
2635 reload_archetypes;
2636 reload_treasures;
2637
2638 warn "finished reloading resource files\n";
2639}
2640
2641sub init {
2642 reload_resources;
2643}
2244 2644
2245sub cfg_load { 2645sub cfg_load {
2246 open my $fh, "<:utf8", cf::confdir . "/config" 2646 open my $fh, "<:utf8", "$CONFDIR/config"
2247 or return; 2647 or return;
2248 2648
2249 local $/; 2649 local $/;
2250 *CFG = YAML::Syck::Load <$fh>; 2650 *CFG = YAML::Syck::Load <$fh>;
2251 2651
2271 Event::one_event; 2671 Event::one_event;
2272 })->prio (Coro::PRIO_MAX); 2672 })->prio (Coro::PRIO_MAX);
2273 }; 2673 };
2274 2674
2275 cfg_load; 2675 cfg_load;
2276 db_load; 2676 db_init;
2277 load_extensions; 2677 load_extensions;
2278 2678
2279 $TICK_WATCHER->start; 2679 $TICK_WATCHER->start;
2280 Event::loop; 2680 Event::loop;
2281} 2681}
2285 2685
2286# install some emergency cleanup handlers 2686# install some emergency cleanup handlers
2287BEGIN { 2687BEGIN {
2288 for my $signal (qw(INT HUP TERM)) { 2688 for my $signal (qw(INT HUP TERM)) {
2289 Event->signal ( 2689 Event->signal (
2690 reentrant => 0,
2290 data => WF_AUTOCANCEL, 2691 data => WF_AUTOCANCEL,
2291 signal => $signal, 2692 signal => $signal,
2693 prio => 0,
2292 cb => sub { 2694 cb => sub {
2293 cf::cleanup "SIG$signal"; 2695 cf::cleanup "SIG$signal";
2294 }, 2696 },
2295 ); 2697 );
2296 } 2698 }
2297} 2699}
2318 my $map = $cf::MAP{$path} or next; 2720 my $map = $cf::MAP{$path} or next;
2319 $map->valid or next; 2721 $map->valid or next;
2320 $map->save; 2722 $map->save;
2321 } 2723 }
2322 warn "end emergency map save\n"; 2724 warn "end emergency map save\n";
2725
2726 warn "begin emergency database checkpoint\n";
2727 BDB::db_env_txn_checkpoint $DB_ENV;
2728 warn "end emergency database checkpoint\n";
2323 }; 2729 };
2324 2730
2325 warn "leave emergency perl save\n"; 2731 warn "leave emergency perl save\n";
2326} 2732}
2327 2733
2734sub post_cleanup {
2735 my ($make_core) = @_;
2736
2737 warn Carp::longmess "post_cleanup backtrace"
2738 if $make_core;
2739}
2740
2328sub reload() { 2741sub do_reload_perl() {
2329 # can/must only be called in main 2742 # can/must only be called in main
2330 if ($Coro::current != $Coro::main) { 2743 if ($Coro::current != $Coro::main) {
2331 warn "can only reload from main coroutine"; 2744 warn "can only reload from main coroutine";
2332 return; 2745 return;
2333 } 2746 }
2334 2747
2335 warn "reloading..."; 2748 warn "reloading...";
2336 2749
2337 warn "cancelling server ticker"; 2750 warn "entering sync_job";
2338 $TICK_WATCHER->cancel;
2339 2751
2752 cf::sync_job {
2753 cf::write_runtime; # external watchdog should not bark
2340 cf::emergency_save; 2754 cf::emergency_save;
2755 cf::write_runtime; # external watchdog should not bark
2341 2756
2342 eval { 2757 warn "syncing database to disk";
2758 BDB::db_env_txn_checkpoint $DB_ENV;
2759
2343 # if anything goes wrong in here, we should simply crash as we already saved 2760 # if anything goes wrong in here, we should simply crash as we already saved
2344
2345 warn "syncing database to disk";
2346 cf::db_sync;
2347 2761
2348 warn "cancelling all WF_AUTOCANCEL watchers"; 2762 warn "cancelling all WF_AUTOCANCEL watchers";
2349 for (Event::all_watchers) { 2763 for (Event::all_watchers) {
2350 $_->cancel if $_->data & WF_AUTOCANCEL; 2764 $_->cancel if $_->data & WF_AUTOCANCEL;
2351 } 2765 }
2352 2766
2353 warn "flushing outstanding aio requests"; 2767 warn "flushing outstanding aio requests";
2354 for (;;) { 2768 for (;;) {
2769 BDB::flush;
2355 IO::AIO::flush; 2770 IO::AIO::flush;
2356 Coro::cede; 2771 Coro::cede;
2357 last unless IO::AIO::nreqs; 2772 last unless IO::AIO::nreqs || BDB::nreqs;
2358 warn "iterate..."; 2773 warn "iterate...";
2359 } 2774 }
2775
2776 ++$RELOAD;
2360 2777
2361 warn "cancelling all extension coros"; 2778 warn "cancelling all extension coros";
2362 $_->cancel for values %EXT_CORO; 2779 $_->cancel for values %EXT_CORO;
2363 %EXT_CORO = (); 2780 %EXT_CORO = ();
2364 2781
2404 Symbol::delete_package "safe::$_" 2821 Symbol::delete_package "safe::$_"
2405 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2822 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2406 2823
2407 warn "unloading cf.pm \"a bit\""; 2824 warn "unloading cf.pm \"a bit\"";
2408 delete $INC{"cf.pm"}; 2825 delete $INC{"cf.pm"};
2826 delete $INC{"cf/pod.pm"};
2409 2827
2410 # don't, removes xs symbols, too, 2828 # don't, removes xs symbols, too,
2411 # and global variables created in xs 2829 # and global variables created in xs
2412 #Symbol::delete_package __PACKAGE__; 2830 #Symbol::delete_package __PACKAGE__;
2413 2831
2417 require cf; 2835 require cf;
2418 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2836 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2419 2837
2420 warn "loading config and database again"; 2838 warn "loading config and database again";
2421 cf::cfg_load; 2839 cf::cfg_load;
2422 cf::db_load;
2423 2840
2424 warn "loading extensions"; 2841 warn "loading extensions";
2425 cf::load_extensions; 2842 cf::load_extensions;
2426 2843
2427 warn "reattaching attachments to objects/players"; 2844 warn "reattaching attachments to objects/players";
2428 _global_reattach; 2845 _global_reattach; # objects, sockets
2429 warn "reattaching attachments to maps"; 2846 warn "reattaching attachments to maps";
2430 reattach $_ for values %MAP; 2847 reattach $_ for values %MAP;
2848 warn "reattaching attachments to players";
2849 reattach $_ for values %PLAYER;
2431 2850
2432 warn "restarting server ticker"; 2851 warn "leaving sync_job";
2433 2852
2434 $TICK_WATCHER->start; 2853 1
2435 }; 2854 } or do {
2436
2437 if ($@) {
2438 warn $@; 2855 warn $@;
2439 warn "error while reloading, exiting."; 2856 warn "error while reloading, exiting.";
2440 exit 1; 2857 exit 1;
2441 } 2858 };
2442 2859
2443 warn "reloaded"; 2860 warn "reloaded";
2444}; 2861};
2445 2862
2446our $RELOAD_WATCHER; # used only during reload 2863our $RELOAD_WATCHER; # used only during reload
2447 2864
2865sub reload_perl() {
2866 # doing reload synchronously and two reloads happen back-to-back,
2867 # coro crashes during coro_state_free->destroy here.
2868
2869 $RELOAD_WATCHER ||= Event->timer (
2870 reentrant => 0,
2871 after => 0,
2872 data => WF_AUTOCANCEL,
2873 cb => sub {
2874 do_reload_perl;
2875 undef $RELOAD_WATCHER;
2876 },
2877 );
2878}
2879
2448register_command "reload" => sub { 2880register_command "reload" => sub {
2449 my ($who, $arg) = @_; 2881 my ($who, $arg) = @_;
2450 2882
2451 if ($who->flag (FLAG_WIZ)) { 2883 if ($who->flag (FLAG_WIZ)) {
2452 $who->message ("reloading server."); 2884 $who->message ("reloading server.");
2453 2885 async { reload_perl };
2454 # doing reload synchronously and two reloads happen back-to-back,
2455 # coro crashes during coro_state_free->destroy here.
2456
2457 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2458 reload;
2459 undef $RELOAD_WATCHER;
2460 });
2461 } 2886 }
2462}; 2887};
2463 2888
2464unshift @INC, $LIBDIR; 2889unshift @INC, $LIBDIR;
2465 2890
2466my $bug_warning = 0; 2891my $bug_warning = 0;
2467 2892
2893our @WAIT_FOR_TICK;
2894our @WAIT_FOR_TICK_BEGIN;
2895
2896sub wait_for_tick {
2897 return unless $TICK_WATCHER->is_active;
2898 return if $Coro::current == $Coro::main;
2899
2900 my $signal = new Coro::Signal;
2901 push @WAIT_FOR_TICK, $signal;
2902 $signal->wait;
2903}
2904
2905sub wait_for_tick_begin {
2906 return unless $TICK_WATCHER->is_active;
2907 return if $Coro::current == $Coro::main;
2908
2909 my $signal = new Coro::Signal;
2910 push @WAIT_FOR_TICK_BEGIN, $signal;
2911 $signal->wait;
2912}
2913
2914 my $min = 1e6;#d#
2915 my $avg = 10;
2468$TICK_WATCHER = Event->timer ( 2916$TICK_WATCHER = Event->timer (
2469 reentrant => 0, 2917 reentrant => 0,
2470 parked => 1, 2918 parked => 1,
2471 prio => 0, 2919 prio => 0,
2472 at => $NEXT_TICK || $TICK, 2920 at => $NEXT_TICK || $TICK,
2476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2477 unless ++$bug_warning > 10; 2925 unless ++$bug_warning > 10;
2478 return; 2926 return;
2479 } 2927 }
2480 2928
2481 $NOW = Event::time; 2929 $NOW = $tick_start = Event::time;
2482 2930
2483 cf::server_tick; # one server iteration 2931 cf::server_tick; # one server iteration
2932
2933 0 && sync_job {#d#
2934 for(1..10) {
2935 my $t = Event::time;
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2937 or die;
2938
2939 $map->width (50);
2940 $map->height (50);
2941 $map->alloc;
2942 $map->_load_objects ("/tmp/x.map", 1);
2943 my $t = Event::time - $t;
2944
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 };
2955
2484 $RUNTIME += $TICK; 2956 $RUNTIME += $TICK;
2485 $NEXT_TICK += $TICK; 2957 $NEXT_TICK += $TICK;
2486 2958
2487 $WAIT_FOR_TICK->broadcast; 2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2488 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
2961 Coro::async_pool {
2962 write_runtime
2963 or warn "ERROR: unable to write runtime file: $!";
2964 };
2965 }
2966
2967# my $AFTER = Event::time;
2968# warn $AFTER - $NOW;#d#
2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send;
2972 }
2973 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send;
2975 }
2976
2977 $NOW = Event::time;
2489 2978
2490 # if we are delayed by four ticks or more, skip them all 2979 # if we are delayed by four ticks or more, skip them all
2491 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2492 2981
2493 $TICK_WATCHER->at ($NEXT_TICK); 2982 $TICK_WATCHER->at ($NEXT_TICK);
2494 $TICK_WATCHER->start; 2983 $TICK_WATCHER->start;
2984
2985 $LOAD = ($NOW - $tick_start) / $TICK;
2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2987
2988 _post_tick;
2989
2990
2495 }, 2991 },
2496); 2992);
2497 2993
2994{
2995 BDB::max_poll_time $TICK * 0.1;
2996 $BDB_POLL_WATCHER = Event->io (
2997 reentrant => 0,
2998 fd => BDB::poll_fileno,
2999 poll => 'r',
3000 prio => 0,
3001 data => WF_AUTOCANCEL,
3002 cb => \&BDB::poll_cb,
3003 );
3004 BDB::min_parallel 8;
3005
3006 BDB::set_sync_prepare {
3007 my $status;
3008 my $current = $Coro::current;
3009 (
3010 sub {
3011 $status = $!;
3012 $current->ready; undef $current;
3013 },
3014 sub {
3015 Coro::schedule while defined $current;
3016 $! = $status;
3017 },
3018 )
3019 };
3020
3021 unless ($DB_ENV) {
3022 $DB_ENV = BDB::db_env_create;
3023
3024 cf::sync_job {
3025 eval {
3026 BDB::db_env_open
3027 $DB_ENV,
3028 $BDBDIR,
3029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3031 0666;
3032
3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3034
3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3036 $DB_ENV->set_lk_detect;
3037 };
3038
3039 cf::cleanup "db_env_open(db): $@" if $@;
3040 };
3041 }
3042}
3043
3044{
3045 IO::AIO::min_parallel 8;
3046
3047 undef $Coro::AIO::WATCHER;
2498IO::AIO::max_poll_time $TICK * 0.2; 3048 IO::AIO::max_poll_time $TICK * 0.1;
2499
2500$AIO_POLL_WATCHER = Event->io ( 3049 $AIO_POLL_WATCHER = Event->io (
2501 fd => IO::AIO::poll_fileno, 3050 reentrant => 0,
2502 poll => 'r',
2503 prio => 5,
2504 data => WF_AUTOCANCEL,
2505 cb => \&IO::AIO::poll_cb,
2506);
2507
2508$WRITE_RUNTIME_WATCHER = Event->timer (
2509 data => WF_AUTOCANCEL, 3051 data => WF_AUTOCANCEL,
2510 after => 1, 3052 fd => IO::AIO::poll_fileno,
2511 interval => 10, 3053 poll => 'r',
2512 prio => 6, # keep it lowest so it acts like a watchdog 3054 prio => 6,
2513 cb => Coro::unblock_sub { 3055 cb => \&IO::AIO::poll_cb,
2514 write_runtime 3056 );
2515 or warn "ERROR: unable to write runtime file: $!"; 3057}
3058
3059my $_log_backtrace;
3060
3061sub _log_backtrace {
3062 my ($msg, @addr) = @_;
3063
3064 $msg =~ s/\n//;
3065
3066 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) {
3068 ++$_log_backtrace;
3069 async {
3070 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3074 or die "addr2line: $!";
3075
3076 my @funcs;
3077 my @res = <$fh>;
3078 chomp for @res;
3079 while (@res) {
3080 my ($func, $line) = splice @res, 0, 2, ();
3081 push @funcs, "[$func] $line";
3082 }
3083
3084 @funcs
3085 };
3086
3087 LOG llevInfo, "[ABT] $msg\n";
3088 LOG llevInfo, "[ABT] $_\n" for @bt;
3089 --$_log_backtrace;
3090 };
3091 } else {
3092 LOG llevInfo, "[ABT] $msg\n";
3093 LOG llevInfo, "[ABT] [suppressed]\n";
2516 }, 3094 }
2517); 3095}
3096
3097# load additional modules
3098use cf::pod;
2518 3099
2519END { cf::emergency_save } 3100END { cf::emergency_save }
2520 3101
25211 31021
2522 3103

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines