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.232 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.280 by root, Sat Jun 16 14:35:41 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;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
21 24
22use BDB (); 25use BDB ();
23use Data::Dumper; 26use Data::Dumper;
24use Digest::MD5; 27use Digest::MD5;
25use Fcntl; 28use Fcntl;
28use Time::HiRes; 31use Time::HiRes;
29use Compress::LZF; 32use Compress::LZF;
30 33
31# configure various modules to our taste 34# configure various modules to our taste
32# 35#
36$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 39
36$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
37 41
50our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
52 56
53our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
54our @EVENT; 58our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 59
57our $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(!)
58our $TICK_WATCHER; 73our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 76our $NEXT_TICK;
62our $NOW; 77our $NOW;
71our $RUNTIME; 86our $RUNTIME;
72 87
73our %PLAYER; # all users 88our %PLAYER; # all users
74our %MAP; # all maps 89our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 91
82# 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 ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 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
85binmode STDOUT; 99binmode STDOUT;
86binmode STDERR; 100binmode STDERR;
87 101
88# read virtual server time, if available 102# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
93} 107}
94 108
95mkdir cf::localdir; 109mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 111
102our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
103 113
104sub cf::map::normalise; 114sub cf::map::normalise;
105 115
116=item $cf::RUNTIME 126=item $cf::RUNTIME
117 127
118The 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
119every server tick. 129every server tick.
120 130
121=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
122 134
123The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
124be 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.
125 139
126=item $cf::NOW 140=item $cf::NOW
127 141
128The time of the last (current) server tick. 142The time of the last (current) server tick.
129 143
130=item $cf::TICK 144=item $cf::TICK
131 145
132The 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.
133 157
134=item %cf::CFG 158=item %cf::CFG
135 159
136Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 161from wherever your confdir points to.
138 162
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
140 164
141These 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
142or 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
143processing 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.
144window of cpu time available, or simply to synchronise to the server tick.
145 168
146=back 169=back
147 170
148=cut 171=cut
149 172
150BEGIN { 173BEGIN {
151 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 175 my $msg = join "", @_;
153 utf8::encode $msg;
154 176
155 $msg .= "\n" 177 $msg .= "\n"
156 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
157 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
158 LOG llevError, $msg; 183 LOG llevError, $msg;
159 }; 184 };
160} 185}
161 186
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@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';
167@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)
168 194
169# 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
170# within the Safe compartment. 196# within the Safe compartment.
171for my $pkg (qw( 197for my $pkg (qw(
172 cf::global cf::attachable 198 cf::global cf::attachable
232returned. 258returned.
233 259
234Lock 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
235uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
236 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
237=cut 267=cut
238 268
239our %LOCK; 269our %LOCK;
240 270
241sub lock_wait($) { 271sub lock_wait($) {
258 288
259 Coro::guard { 289 Coro::guard {
260 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
262 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
263} 299}
264 300
265sub freeze_mainloop { 301sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
267 303
297 333
298sub sync_job(&) { 334sub sync_job(&) {
299 my ($job) = @_; 335 my ($job) = @_;
300 336
301 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
302 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
304 342
305 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 344 # (but this is cancel-safe)
317 355
318 while ($busy) { 356 while ($busy) {
319 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
320 } 358 }
321 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
322 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
323 } else { 368 } else {
324 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
325 370
326 $job->() 371 $job->()
346 391
347 $coro 392 $coro
348} 393}
349 394
350sub write_runtime { 395sub write_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
351 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
352
353 my $runtime = cf::localdir . "/runtime";
354 404
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
356 or return; 406 or return;
357 407
358 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
364 414
365 # always fsync - this file is important 415 # always fsync - this file is important
366 aio_fsync $fh 416 aio_fsync $fh
367 and return; 417 and return;
368 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
369 close $fh 422 close $fh
370 or return; 423 or return;
371 424
372 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
373 and return; 426 and return;
427
428 warn "runtime file written.\n";
374 429
375 1 430 1
376} 431}
377 432
378=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
571 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
572 627
573 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 632
578 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 634 my $pkg = shift @arg;
580 635
581 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
610 _attach $registry, $klass, @attach; 665 _attach $registry, $klass, @attach;
611 } 666 }
612 667
613 $obj->{$name} = \%arg; 668 $obj->{$name} = \%arg;
614 } else { 669 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 670 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 671 }
617 672
618 $obj->{_attachment}{$name} = undef; 673 $obj->{_attachment}{$name} = undef;
619} 674}
620 675
622 if (ref $_[0]) { 677 if (ref $_[0]) {
623 _object_attach @_; 678 _object_attach @_;
624 } else { 679 } else {
625 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
626 } 681 }
682 _recalc_want;
627}; 683};
628 684
629# all those should be optimised 685# all those should be optimised
630sub cf::attachable::detach { 686sub cf::attachable::detach {
631 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
634 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
635 reattach ($obj); 691 reattach ($obj);
636 } else { 692 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
638 } 694 }
695 _recalc_want;
639}; 696};
640 697
641sub cf::attachable::attached { 698sub cf::attachable::attached {
642 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
643 700
816 or return; 873 or return;
817 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
818 } 875 }
819 876
820 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
822 return ($data, $av); 879 return ($data, $av);
823} 880}
824 881
825############################################################################# 882#############################################################################
826# command handling &c 883# command handling &c
886 943
887 cf::override; 944 cf::override;
888 }, 945 },
889); 946);
890 947
891sub load_extension {
892 my ($path) = @_;
893
894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
895 my $base = $1;
896 my $pkg = $1;
897 $pkg =~ s/[^[:word:]]/_/g;
898 $pkg = "ext::$pkg";
899
900 warn "... loading '$path' into '$pkg'\n";
901
902 open my $fh, "<:utf8", $path
903 or die "$path: $!";
904
905 my $source =
906 "package $pkg; use strict; use utf8;\n"
907 . "#line 1 \"$path\"\n{\n"
908 . (do { local $/; <$fh> })
909 . "\n};\n1";
910
911 unless (eval $source) {
912 my $msg = $@ ? "$path: $@\n"
913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
921
922 push @EXTS, $pkg;
923}
924
925sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
926 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 953 next unless -r $path;
928 eval { 954
929 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;
930 1 1012 }
931 } or warn "$ext not loaded: $@"; 1013
1014 skip:
1015 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1016 unless $progress;
1017 }
932 } 1018 };
933} 1019}
934 1020
935############################################################################# 1021#############################################################################
936 1022
937=head2 CORE EXTENSIONS 1023=head2 CORE EXTENSIONS
953Returns the given player object, loading it if necessary (might block). 1039Returns the given player object, loading it if necessary (might block).
954 1040
955=cut 1041=cut
956 1042
957sub playerdir($) { 1043sub playerdir($) {
958 cf::localdir 1044 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1045 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1046}
964 1047
965sub path($) { 1048sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1049 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1050
968 (playerdir $login) . "/$login.pl" 1051 (playerdir $login) . "/playerdata"
969} 1052}
970 1053
971sub find_active($) { 1054sub find_active($) {
972 $cf::PLAYER{$_[0]} 1055 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1056 and $cf::PLAYER{$_[0]}->active
986 my $login = $_[0]; 1069 my $login = $_[0];
987 1070
988 my $guard = cf::lock_acquire "user_find:$login"; 1071 my $guard = cf::lock_acquire "user_find:$login";
989 1072
990 $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
991 my $pl = load_pl path $login 1081 my $pl = load_pl path $login
992 or return; 1082 or return;
993 $cf::PLAYER{$login} = $pl 1083 $cf::PLAYER{$login} = $pl
994 } 1084 }
995 } 1085 }
1079while and may block, so not sync_job-capable, ever. 1169while and may block, so not sync_job-capable, ever.
1080 1170
1081=cut 1171=cut
1082 1172
1083sub list_logins { 1173sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1174 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1175 or return [];
1086 1176
1087 my @logins; 1177 my @logins;
1088 1178
1089 for my $login (@$dirs) { 1179 for my $login (@$dirs) {
1150 my ($self, $type, %msg) = @_; 1240 my ($self, $type, %msg) = @_;
1151 1241
1152 $self->ns->ext_event ($type, %msg); 1242 $self->ns->ext_event ($type, %msg);
1153} 1243}
1154 1244
1155package cf; 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}
1156 1273
1157=back 1274=back
1158
1159 1275
1160=head3 cf::map 1276=head3 cf::map
1161 1277
1162=over 4 1278=over 4
1163 1279
1218 my ($self, $merge) = @_; 1334 my ($self, $merge) = @_;
1219 1335
1220 # we have to keep some variables in memory intact 1336 # we have to keep some variables in memory intact
1221 local $self->{path}; 1337 local $self->{path};
1222 local $self->{load_path}; 1338 local $self->{load_path};
1223 local $self->{deny_save};
1224 local $self->{deny_reset};
1225 1339
1226 $self->SUPER::thawer_merge ($merge); 1340 $self->SUPER::thawer_merge ($merge);
1227} 1341}
1228 1342
1229sub normalise { 1343sub normalise {
1301 1415
1302# the original (read-only) location 1416# the original (read-only) location
1303sub load_path { 1417sub load_path {
1304 my ($self) = @_; 1418 my ($self) = @_;
1305 1419
1306 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1420 "$MAPDIR/$self->{path}.map"
1307} 1421}
1308 1422
1309# the temporary/swap location 1423# the temporary/swap location
1310sub save_path { 1424sub save_path {
1311 my ($self) = @_; 1425 my ($self) = @_;
1312 1426
1313 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1314 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1428 "$TMPDIR/$path.map"
1315} 1429}
1316 1430
1317# the unique path, undef == no special unique path 1431# the unique path, undef == no special unique path
1318sub uniq_path { 1432sub uniq_path {
1319 my ($self) = @_; 1433 my ($self) = @_;
1320 1434
1321 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1322 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1436 "$UNIQUEDIR/$path"
1323} 1437}
1324 1438
1325# and all this just because we cannot iterate over 1439# and all this just because we cannot iterate over
1326# all maps in C++... 1440# all maps in C++...
1327sub change_all_map_light { 1441sub change_all_map_light {
1328 my ($change) = @_; 1442 my ($change) = @_;
1329 1443
1330 $_->change_map_light ($change) 1444 $_->change_map_light ($change)
1331 for grep $_->outdoor, values %cf::MAP; 1445 for grep $_->outdoor, values %cf::MAP;
1446}
1447
1448sub decay_objects {
1449 my ($self) = @_;
1450
1451 return if $self->{deny_reset};
1452
1453 $self->do_decay_objects;
1332} 1454}
1333 1455
1334sub unlink_save { 1456sub unlink_save {
1335 my ($self) = @_; 1457 my ($self) = @_;
1336 1458
1394 $self->load_header_orig 1516 $self->load_header_orig
1395 or return; 1517 or return;
1396 $self->prepare_orig; 1518 $self->prepare_orig;
1397 } 1519 }
1398 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
1399 1 1527 1
1400} 1528}
1401 1529
1402sub find; 1530sub find;
1403sub find { 1531sub find {
1415 $map->{last_save} = $cf::RUNTIME; 1543 $map->{last_save} = $cf::RUNTIME;
1416 1544
1417 $map->load_header 1545 $map->load_header
1418 or return; 1546 or return;
1419 1547
1420 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1421 # doing this can freeze the server in a sync job, obviously 1549 # doing this can freeze the server in a sync job, obviously
1422 #$cf::WAIT_FOR_TICK->wait; 1550 #$cf::WAIT_FOR_TICK->wait;
1423 $map->reset; 1551 $map->reset;
1424 undef $guard; 1552 undef $guard;
1425 return find $path; 1553 return find $path;
1436 my ($self) = @_; 1564 my ($self) = @_;
1437 1565
1438 local $self->{deny_reset} = 1; # loading can take a long time 1566 local $self->{deny_reset} = 1; # loading can take a long time
1439 1567
1440 my $path = $self->{path}; 1568 my $path = $self->{path};
1569
1570 {
1441 my $guard = cf::lock_acquire "map_load:$path"; 1571 my $guard = cf::lock_acquire "map_load:$path";
1442 1572
1443 return if $self->in_memory != cf::MAP_SWAPPED; 1573 return if $self->in_memory != cf::MAP_SWAPPED;
1444 1574
1445 $self->in_memory (cf::MAP_LOADING); 1575 $self->in_memory (cf::MAP_LOADING);
1446 1576
1447 $self->alloc; 1577 $self->alloc;
1448 1578
1449 $self->pre_load; 1579 $self->pre_load;
1450
1451 $self->_load_objects ($self->{load_path}, 1)
1452 or return;
1453
1454 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1455 if delete $self->{load_original};
1456
1457 if (my $uniq = $self->uniq_path) {
1458 utf8::encode $uniq;
1459 if (aio_open $uniq, O_RDONLY, 0) {
1460 $self->clear_unique_items;
1461 $self->_load_objects ($uniq, 0);
1462 }
1463 }
1464
1465 Coro::cede;
1466
1467 # now do the right thing for maps
1468 $self->link_multipart_objects;
1469
1470 unless ($self->{deny_activate}) {
1471 $self->decay_objects;
1472 $self->fix_auto_apply;
1473 $self->update_buttons;
1474 Coro::cede; 1580 Coro::cede;
1475 $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;
1476 $self->difficulty ($self->estimate_difficulty) 1599 $self->difficulty ($self->estimate_difficulty)
1477 unless $self->difficulty; 1600 unless $self->difficulty;
1478 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;
1479 $self->activate; 1610 $self->activate;
1611 }
1612
1613 $self->in_memory (cf::MAP_IN_MEMORY);
1480 } 1614 }
1481 1615
1482 $self->post_load; 1616 $self->post_load;
1483
1484 $self->in_memory (cf::MAP_IN_MEMORY);
1485} 1617}
1486 1618
1487sub customise_for { 1619sub customise_for {
1488 my ($self, $ob) = @_; 1620 my ($self, $ob) = @_;
1489 1621
1490 return find "~" . $ob->name . "/" . $self->{path} 1622 return find "~" . $ob->name . "/" . $self->{path}
1491 if $self->per_player; 1623 if $self->per_player;
1624
1625# return find "?party/" . $ob->name . "/" . $self->{path}
1626# if $self->per_party;
1492 1627
1493 $self 1628 $self
1494} 1629}
1495 1630
1496# 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
1607 1742
1608sub reset_at { 1743sub reset_at {
1609 my ($self) = @_; 1744 my ($self) = @_;
1610 1745
1611 # TODO: safety, remove and allow resettable per-player maps 1746 # TODO: safety, remove and allow resettable per-player maps
1612 return 1e99 if $self->isa ("ext::map_per_player");#d#
1613 return 1e99 if $self->{deny_reset}; 1747 return 1e99 if $self->{deny_reset};
1614 1748
1615 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1749 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1616 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;
1617 1751
1628 my ($self) = @_; 1762 my ($self) = @_;
1629 1763
1630 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1764 my $lock = cf::lock_acquire "map_data:$self->{path}";
1631 1765
1632 return if $self->players; 1766 return if $self->players;
1633 return if $self->isa ("ext::map_per_player");#d#
1634 1767
1635 warn "resetting map ", $self->path;#d# 1768 warn "resetting map ", $self->path;
1636 1769
1637 $self->in_memory (cf::MAP_SWAPPED); 1770 $self->in_memory (cf::MAP_SWAPPED);
1638 1771
1639 # need to save uniques path 1772 # need to save uniques path
1640 unless ($self->{deny_save}) { 1773 unless ($self->{deny_save}) {
1672 $cf::MAP{$self->path} = $self; 1805 $cf::MAP{$self->path} = $self;
1673 1806
1674 $self->reset; # polite request, might not happen 1807 $self->reset; # polite request, might not happen
1675} 1808}
1676 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
1677=item cf::map::unique_maps 1846=item cf::map::unique_maps
1678 1847
1679Returns an arrayref of paths of all shared maps that have 1848Returns an arrayref of paths of all shared maps that have
1680instantiated unique items. May block. 1849instantiated unique items. May block.
1681 1850
1682=cut 1851=cut
1683 1852
1684sub unique_maps() { 1853sub unique_maps() {
1685 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1854 [
1686 or return; 1855 map {
1687
1688 my @paths;
1689
1690 for (@$files) {
1691 utf8::decode $_; 1856 utf8::decode $_;
1692 next if /\.pst$/; 1857 /\.map$/
1693 next unless /^$PATH_SEP/o; 1858 ? normalise $_
1694 1859 : ()
1695 push @paths, cf::map::normalise $_; 1860 } @{ aio_readdir $UNIQUEDIR or [] }
1696 } 1861 ]
1697
1698 \@paths
1699} 1862}
1700 1863
1701package cf; 1864package cf;
1702 1865
1703=back 1866=back
1809 $self->deactivate_recursive; 1972 $self->deactivate_recursive;
1810 1973
1811 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1974 return if UNIVERSAL::isa $self->map, "ext::map_link";
1812 1975
1813 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1814 if $self->map; 1977 if $self->map && $self->map->{path} ne "{link}";
1815 1978
1816 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1979 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1817} 1980}
1818 1981
1819sub cf::object::player::leave_link { 1982sub cf::object::player::leave_link {
1820 my ($self, $map, $x, $y) = @_; 1983 my ($self, $map, $x, $y) = @_;
1984
1985 return unless $self->contr->active;
1821 1986
1822 my $link_pos = delete $self->{_link_pos}; 1987 my $link_pos = delete $self->{_link_pos};
1823 1988
1824 unless ($map) { 1989 unless ($map) {
1825 # restore original map position 1990 # restore original map position
1848 2013
1849 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1850 $self->enter_map ($map, $x, $y); 2015 $self->enter_map ($map, $x, $y);
1851} 2016}
1852 2017
1853cf::player->attach (
1854 on_logout => sub {
1855 my ($pl) = @_;
1856
1857 # abort map switching before logout
1858 if ($pl->ob->{_link_pos}) {
1859 cf::sync_job {
1860 $pl->ob->leave_link
1861 };
1862 }
1863 },
1864 on_login => sub {
1865 my ($pl) = @_;
1866
1867 # try to abort aborted map switching on player login :)
1868 # should happen only on crashes
1869 if ($pl->ob->{_link_pos}) {
1870 $pl->ob->enter_link;
1871 (async {
1872 $pl->ob->reply (undef,
1873 "There was an internal problem at your last logout, "
1874 . "the server will try to bring you to your intended destination in a second.",
1875 cf::NDI_RED);
1876 # we need this sleep as the login has a concurrent enter_exit running
1877 # and this sleep increases chances of the player not ending up in scorn
1878 Coro::Timer::sleep 1;
1879 $pl->ob->leave_link;
1880 })->prio (2);
1881 }
1882 },
1883);
1884
1885=item $player_object->goto ($path, $x, $y) 2018=item $player_object->goto ($path, $x, $y[, $check->($map)])
1886 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
1887=cut 2025=cut
2026
2027our $GOTOGEN;
1888 2028
1889sub cf::object::player::goto { 2029sub cf::object::player::goto {
1890 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;
1891 2034
1892 $self->enter_link; 2035 $self->enter_link;
1893 2036
1894 (async { 2037 (async {
1895 my $map = eval { 2038 my $map = eval {
1896 my $map = cf::map::find $path; 2039 my $map = cf::map::find $path;
2040
2041 if ($map) {
1897 $map = $map->customise_for ($self) if $map; 2042 $map = $map->customise_for ($self);
2043 $map = $check->($map) if $check && $map;
2044 } else {
2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2046 }
2047
1898 $map 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 $@;
1899 } or 2054 }
1900 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1901 2055
2056 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation};
1902 $self->leave_link ($map, $x, $y); 2058 $self->leave_link ($map, $x, $y);
2059 }
1903 })->prio (1); 2060 })->prio (1);
1904} 2061}
1905 2062
1906=item $player_object->enter_exit ($exit_object) 2063=item $player_object->enter_exit ($exit_object)
1907 2064
1946 2103
1947 $rmp->{random_seed} ||= $exit->random_seed; 2104 $rmp->{random_seed} ||= $exit->random_seed;
1948 2105
1949 my $data = cf::to_json $rmp; 2106 my $data = cf::to_json $rmp;
1950 my $md5 = Digest::MD5::md5_hex $data; 2107 my $md5 = Digest::MD5::md5_hex $data;
1951 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2108 my $meta = "$RANDOMDIR/$md5.meta";
1952 2109
1953 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1954 aio_write $fh, 0, (length $data), $data, 0; 2111 aio_write $fh, 0, (length $data), $data, 0;
1955 undef $fh; 2112 undef $fh;
1956 aio_rename "$meta~", $meta; 2113 aio_rename "$meta~", $meta;
1965 2122
1966 return unless $self->type == cf::PLAYER; 2123 return unless $self->type == cf::PLAYER;
1967 2124
1968 if ($exit->slaying eq "/!") { 2125 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job 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
1970 cf::sync_job { prepare_random_map $exit }; 2129 cf::sync_job { prepare_random_map $exit };
1971 } 2130 }
1972 2131
1973 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2132 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1974 my $hp = $exit->stats->hp; 2133 my $hp = $exit->stats->hp;
1982 $self->goto ($slaying, $hp, $sp); 2141 $self->goto ($slaying, $hp, $sp);
1983 2142
1984 1; 2143 1;
1985 }) { 2144 }) {
1986 $self->message ("Something went wrong deep within the crossfire server. " 2145 $self->message ("Something went wrong deep within the crossfire server. "
1987 . "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. "
1988 . "Please report this to the dungeon master!", 2147 . "Please report this to the dungeon master!",
1989 cf::NDI_UNIQUE | cf::NDI_RED); 2148 cf::NDI_UNIQUE | cf::NDI_RED);
1990 2149
1991 warn "ERROR in enter_exit: $@"; 2150 warn "ERROR in enter_exit: $@";
1992 $self->leave_link; 2151 $self->leave_link;
1993 } 2152 }
1994 })->prio (1); 2153 })->prio (1);
2223############################################################################# 2382#############################################################################
2224 2383
2225=head2 EXTENSION DATABASE SUPPORT 2384=head2 EXTENSION DATABASE SUPPORT
2226 2385
2227Crossfire maintains a very simple database for extension use. It can 2386Crossfire maintains a very simple database for extension use. It can
2228currently store anything that can be serialised using Storable, which 2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2229excludes objects. 2388convert to/from binary).
2230 2389
2231The 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
2232using it, it should be unique. 2391using it, it should be unique.
2233 2392
2234=over 4 2393=over 4
2257 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2258 cf::cleanup "db_open(db): $!" if $!; 2417 cf::cleanup "db_open(db): $!" if $!;
2259 }; 2418 };
2260 cf::cleanup "db_open(db): $@" if $@; 2419 cf::cleanup "db_open(db): $@" if $@;
2261 }; 2420 };
2262
2263 my $path = cf::localdir . "/database.pst";
2264 if (stat $path) {
2265 cf::sync_job {
2266 my $pst = Storable::retrieve $path;
2267
2268 cf::db_put (board => data => $pst->{board});
2269 cf::db_put (guildrules => data => $pst->{guildrules});
2270 cf::db_put (rent => balance => $pst->{rent}{balance});
2271 BDB::db_env_txn_checkpoint $DB_ENV;
2272
2273 unlink $path;
2274 };
2275 }
2276 } 2421 }
2277} 2422}
2278 2423
2279sub db_get($$) { 2424sub db_get($$) {
2280 my $key = "$_[0]/$_[1]"; 2425 my $key = "$_[0]/$_[1]";
2281 2426
2282 cf::sync_job { 2427 cf::sync_job {
2283 BDB::db_get $DB, undef, $key, my $data; 2428 BDB::db_get $DB, undef, $key, my $data;
2284 2429
2285 $! ? () 2430 $! ? ()
2286 : Compress::LZF::sthaw $data 2431 : $data
2287 } 2432 }
2288} 2433}
2289 2434
2290sub db_put($$$) { 2435sub db_put($$$) {
2291 BDB::dbreq_pri 4; 2436 BDB::dbreq_pri 4;
2292 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438}
2439
2440=item cf::cache $id => [$paths...], $processversion => $process
2441
2442Generic caching function that returns the value of the resource $id,
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->[$_]: $!";
2472 }
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 }
2293} 2552}
2294 2553
2295############################################################################# 2554#############################################################################
2296# the server's init and main functions 2555# the server's init and main functions
2297 2556
2298sub load_facedata { 2557sub load_facedata($) {
2299 my $path = sprintf "%s/facedata", cf::datadir; 2558 my ($path) = @_;
2300 2559
2301 warn "loading facedata from $path\n"; 2560 warn "loading facedata from $path\n";
2302 2561
2303 my $faces; 2562 my $facedata;
2304 0 < aio_load $path, $faces 2563 0 < aio_load $path, $facedata
2305 or die "$path: $!"; 2564 or die "$path: $!";
2306 2565
2307 Coro::cede;
2308 $faces = Storable::thaw $faces; 2566 $facedata = Coro::Storable::thaw $facedata;
2309 Coro::cede;
2310 2567
2311 my $meta = delete $faces->{""};
2312 $meta->{version} == 1 2568 $facedata->{version} == 2
2313 or cf::cleanup "$path: version mismatch, cannot proceed."; 2569 or cf::cleanup "$path: version mismatch, cannot proceed.";
2314 2570
2571 {
2572 my $faces = $facedata->{faceinfo};
2573
2315 while (my ($face, $info) = each %$faces) { 2574 while (my ($face, $info) = each %$faces) {
2316 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2575 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2317 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2318 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2319 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2320 Coro::cede; 2579 Coro::cede;
2321 } 2580 }
2322 2581
2323 while (my ($face, $info) = each %$faces) { 2582 while (my ($face, $info) = each %$faces) {
2324 next unless $info->{smooth}; 2583 next unless $info->{smooth};
2325 my $idx = cf::face::find $face 2584 my $idx = cf::face::find $face
2326 or next; 2585 or next;
2327 if (my $smooth = cf::face::find $info->{smooth}) { 2586 if (my $smooth = cf::face::find $info->{smooth}) {
2328 cf::face::set_smooth $idx, $smooth; 2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2329 } else { 2588 } else {
2330 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2589 warn "smooth face '$info->{smooth}' not found for face '$face'";
2331 } 2590 }
2332 Coro::cede; 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
2333 } 2604 }
2334 2605
2335 1 2606 1
2336} 2607}
2337 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
2338sub reload_resources { 2629sub reload_resources {
2339 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2630 warn "reloading resource files...\n";
2340 or die "unable to load regions file\n";#d# 2631
2632 reload_regions;
2341 load_facedata 2633 reload_facedata;
2342 or die "unable to load facedata\n";#d# 2634 #reload_archetypes;#d#
2635 reload_archetypes;
2636 reload_treasures;
2637
2638 warn "finished reloading resource files\n";
2343} 2639}
2344 2640
2345sub init { 2641sub init {
2346 reload_resources; 2642 reload_resources;
2347} 2643}
2348 2644
2349sub cfg_load { 2645sub cfg_load {
2350 open my $fh, "<:utf8", cf::confdir . "/config" 2646 open my $fh, "<:utf8", "$CONFDIR/config"
2351 or return; 2647 or return;
2352 2648
2353 local $/; 2649 local $/;
2354 *CFG = YAML::Syck::Load <$fh>; 2650 *CFG = YAML::Syck::Load <$fh>;
2355 2651
2440 2736
2441 warn Carp::longmess "post_cleanup backtrace" 2737 warn Carp::longmess "post_cleanup backtrace"
2442 if $make_core; 2738 if $make_core;
2443} 2739}
2444 2740
2445sub reload() { 2741sub do_reload_perl() {
2446 # can/must only be called in main 2742 # can/must only be called in main
2447 if ($Coro::current != $Coro::main) { 2743 if ($Coro::current != $Coro::main) {
2448 warn "can only reload from main coroutine"; 2744 warn "can only reload from main coroutine";
2449 return; 2745 return;
2450 } 2746 }
2525 Symbol::delete_package "safe::$_" 2821 Symbol::delete_package "safe::$_"
2526 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);
2527 2823
2528 warn "unloading cf.pm \"a bit\""; 2824 warn "unloading cf.pm \"a bit\"";
2529 delete $INC{"cf.pm"}; 2825 delete $INC{"cf.pm"};
2826 delete $INC{"cf/pod.pm"};
2530 2827
2531 # don't, removes xs symbols, too, 2828 # don't, removes xs symbols, too,
2532 # and global variables created in xs 2829 # and global variables created in xs
2533 #Symbol::delete_package __PACKAGE__; 2830 #Symbol::delete_package __PACKAGE__;
2534 2831
2549 warn "reattaching attachments to maps"; 2846 warn "reattaching attachments to maps";
2550 reattach $_ for values %MAP; 2847 reattach $_ for values %MAP;
2551 warn "reattaching attachments to players"; 2848 warn "reattaching attachments to players";
2552 reattach $_ for values %PLAYER; 2849 reattach $_ for values %PLAYER;
2553 2850
2554 warn "loading reloadable resources";
2555 reload_resources;
2556
2557 warn "leaving sync_job"; 2851 warn "leaving sync_job";
2558 2852
2559 1 2853 1
2560 } or do { 2854 } or do {
2561 warn $@; 2855 warn $@;
2566 warn "reloaded"; 2860 warn "reloaded";
2567}; 2861};
2568 2862
2569our $RELOAD_WATCHER; # used only during reload 2863our $RELOAD_WATCHER; # used only during reload
2570 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
2571register_command "reload" => sub { 2880register_command "reload" => sub {
2572 my ($who, $arg) = @_; 2881 my ($who, $arg) = @_;
2573 2882
2574 if ($who->flag (FLAG_WIZ)) { 2883 if ($who->flag (FLAG_WIZ)) {
2575 $who->message ("reloading server."); 2884 $who->message ("reloading server.");
2576 2885 async { reload_perl };
2577 # doing reload synchronously and two reloads happen back-to-back,
2578 # coro crashes during coro_state_free->destroy here.
2579
2580 $RELOAD_WATCHER ||= Event->timer (
2581 reentrant => 0,
2582 after => 0,
2583 data => WF_AUTOCANCEL,
2584 cb => sub {
2585 reload;
2586 undef $RELOAD_WATCHER;
2587 },
2588 );
2589 } 2886 }
2590}; 2887};
2591 2888
2592unshift @INC, $LIBDIR; 2889unshift @INC, $LIBDIR;
2593 2890
2594my $bug_warning = 0; 2891my $bug_warning = 0;
2595 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;
2596$TICK_WATCHER = Event->timer ( 2916$TICK_WATCHER = Event->timer (
2597 reentrant => 0, 2917 reentrant => 0,
2598 parked => 1, 2918 parked => 1,
2599 prio => 0, 2919 prio => 0,
2600 at => $NEXT_TICK || $TICK, 2920 at => $NEXT_TICK || $TICK,
2604 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"
2605 unless ++$bug_warning > 10; 2925 unless ++$bug_warning > 10;
2606 return; 2926 return;
2607 } 2927 }
2608 2928
2609 $NOW = Event::time; 2929 $NOW = $tick_start = Event::time;
2610 2930
2611 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
2612 $RUNTIME += $TICK; 2956 $RUNTIME += $TICK;
2613 $NEXT_TICK += $TICK; 2957 $NEXT_TICK += $TICK;
2614 2958
2615 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2616 $NEXT_RUNTIME_WRITE = $NOW + 10; 2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
2618 write_runtime 2962 write_runtime
2619 or warn "ERROR: unable to write runtime file: $!"; 2963 or warn "ERROR: unable to write runtime file: $!";
2620 }; 2964 };
2621 } 2965 }
2622 2966
2623 $WAIT_FOR_TICK->broadcast;
2624 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2625
2626# my $AFTER = Event::time; 2967# my $AFTER = Event::time;
2627# warn $AFTER - $NOW;#d# 2968# warn $AFTER - $NOW;#d#
2628 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;
2978
2629 # 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
2630 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2631 2981
2632 $TICK_WATCHER->at ($NEXT_TICK); 2982 $TICK_WATCHER->at ($NEXT_TICK);
2633 $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
2634 }, 2991 },
2635); 2992);
2636 2993
2637{ 2994{
2638 BDB::max_poll_time $TICK * 0.1; 2995 BDB::max_poll_time $TICK * 0.1;
2666 3023
2667 cf::sync_job { 3024 cf::sync_job {
2668 eval { 3025 eval {
2669 BDB::db_env_open 3026 BDB::db_env_open
2670 $DB_ENV, 3027 $DB_ENV,
2671 $BDB_ENV_DIR, 3028 $BDBDIR,
2672 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2673 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2674 0666; 3031 0666;
2675 3032
2676 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2677 3034
2678 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2679 $DB_ENV->set_lk_detect; 3036 $DB_ENV->set_lk_detect;
2680 }; 3037 };
2681 3038
2697 prio => 6, 3054 prio => 6,
2698 cb => \&IO::AIO::poll_cb, 3055 cb => \&IO::AIO::poll_cb,
2699 ); 3056 );
2700} 3057}
2701 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";
3094 }
3095}
3096
3097# load additional modules
3098use cf::pod;
3099
2702END { cf::emergency_save } 3100END { cf::emergency_save }
2703 3101
27041 31021
2705 3103

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines