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.236 by root, Thu Apr 12 14:18:05 2007 UTC vs.
Revision 1.278 by root, Mon Jun 11 21:38:14 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) {
… …
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 } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/;
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*/, $ext{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 : "extension disabled.\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 die $msg;
1007 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
930 1 1011 }
931 } or warn "$ext not loaded: $@"; 1012
1013 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress;
1016 }
932 } 1017 };
933} 1018}
934 1019
935############################################################################# 1020#############################################################################
936 1021
937=head2 CORE EXTENSIONS 1022=head2 CORE EXTENSIONS
… …
953Returns the given player object, loading it if necessary (might block). 1038Returns the given player object, loading it if necessary (might block).
954 1039
955=cut 1040=cut
956 1041
957sub playerdir($) { 1042sub playerdir($) {
958 cf::localdir 1043 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1044 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1045}
964 1046
965sub path($) { 1047sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1048 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1086while and may block, so not sync_job-capable, ever. 1168while and may block, so not sync_job-capable, ever.
1087 1169
1088=cut 1170=cut
1089 1171
1090sub list_logins { 1172sub list_logins {
1091 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1173 my $dirs = aio_readdir $PLAYERDIR
1092 or return []; 1174 or return [];
1093 1175
1094 my @logins; 1176 my @logins;
1095 1177
1096 for my $login (@$dirs) { 1178 for my $login (@$dirs) {
… …
1157 my ($self, $type, %msg) = @_; 1239 my ($self, $type, %msg) = @_;
1158 1240
1159 $self->ns->ext_event ($type, %msg); 1241 $self->ns->ext_event ($type, %msg);
1160} 1242}
1161 1243
1162package cf; 1244=head3 cf::region
1245
1246=over 4
1247
1248=cut
1249
1250package cf::region;
1251
1252=item cf::region::find_by_path $path
1253
1254Tries to decuce the probable region for a map knowing only its path.
1255
1256=cut
1257
1258sub find_by_path($) {
1259 my ($path) = @_;
1260
1261 my ($match, $specificity);
1262
1263 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) {
1265 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity;
1267 }
1268 }
1269
1270 $match
1271}
1163 1272
1164=back 1273=back
1165
1166 1274
1167=head3 cf::map 1275=head3 cf::map
1168 1276
1169=over 4 1277=over 4
1170 1278
… …
1225 my ($self, $merge) = @_; 1333 my ($self, $merge) = @_;
1226 1334
1227 # we have to keep some variables in memory intact 1335 # we have to keep some variables in memory intact
1228 local $self->{path}; 1336 local $self->{path};
1229 local $self->{load_path}; 1337 local $self->{load_path};
1230 local $self->{deny_save};
1231 local $self->{deny_reset};
1232 1338
1233 $self->SUPER::thawer_merge ($merge); 1339 $self->SUPER::thawer_merge ($merge);
1234} 1340}
1235 1341
1236sub normalise { 1342sub normalise {
… …
1308 1414
1309# the original (read-only) location 1415# the original (read-only) location
1310sub load_path { 1416sub load_path {
1311 my ($self) = @_; 1417 my ($self) = @_;
1312 1418
1313 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1419 "$MAPDIR/$self->{path}.map"
1314} 1420}
1315 1421
1316# the temporary/swap location 1422# the temporary/swap location
1317sub save_path { 1423sub save_path {
1318 my ($self) = @_; 1424 my ($self) = @_;
1319 1425
1320 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1426 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1321 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1427 "$TMPDIR/$path.map"
1322} 1428}
1323 1429
1324# the unique path, undef == no special unique path 1430# the unique path, undef == no special unique path
1325sub uniq_path { 1431sub uniq_path {
1326 my ($self) = @_; 1432 my ($self) = @_;
1327 1433
1328 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1434 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1329 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1435 "$UNIQUEDIR/$path"
1330} 1436}
1331 1437
1332# and all this just because we cannot iterate over 1438# and all this just because we cannot iterate over
1333# all maps in C++... 1439# all maps in C++...
1334sub change_all_map_light { 1440sub change_all_map_light {
1335 my ($change) = @_; 1441 my ($change) = @_;
1336 1442
1337 $_->change_map_light ($change) 1443 $_->change_map_light ($change)
1338 for grep $_->outdoor, values %cf::MAP; 1444 for grep $_->outdoor, values %cf::MAP;
1445}
1446
1447sub decay_objects {
1448 my ($self) = @_;
1449
1450 return if $self->{deny_reset};
1451
1452 $self->do_decay_objects;
1339} 1453}
1340 1454
1341sub unlink_save { 1455sub unlink_save {
1342 my ($self) = @_; 1456 my ($self) = @_;
1343 1457
… …
1401 $self->load_header_orig 1515 $self->load_header_orig
1402 or return; 1516 or return;
1403 $self->prepare_orig; 1517 $self->prepare_orig;
1404 } 1518 }
1405 1519
1520 $self->{deny_reset} = 1
1521 if $self->no_reset;
1522
1523 $self->default_region (cf::region::find_by_path $self->{path})
1524 unless $self->default_region;
1525
1406 1 1526 1
1407} 1527}
1408 1528
1409sub find; 1529sub find;
1410sub find { 1530sub find {
… …
1422 $map->{last_save} = $cf::RUNTIME; 1542 $map->{last_save} = $cf::RUNTIME;
1423 1543
1424 $map->load_header 1544 $map->load_header
1425 or return; 1545 or return;
1426 1546
1427 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1428 # doing this can freeze the server in a sync job, obviously 1548 # doing this can freeze the server in a sync job, obviously
1429 #$cf::WAIT_FOR_TICK->wait; 1549 #$cf::WAIT_FOR_TICK->wait;
1430 $map->reset; 1550 $map->reset;
1431 undef $guard; 1551 undef $guard;
1432 return find $path; 1552 return find $path;
… …
1443 my ($self) = @_; 1563 my ($self) = @_;
1444 1564
1445 local $self->{deny_reset} = 1; # loading can take a long time 1565 local $self->{deny_reset} = 1; # loading can take a long time
1446 1566
1447 my $path = $self->{path}; 1567 my $path = $self->{path};
1568
1569 {
1448 my $guard = cf::lock_acquire "map_load:$path"; 1570 my $guard = cf::lock_acquire "map_load:$path";
1449 1571
1450 return if $self->in_memory != cf::MAP_SWAPPED; 1572 return if $self->in_memory != cf::MAP_SWAPPED;
1451 1573
1452 $self->in_memory (cf::MAP_LOADING); 1574 $self->in_memory (cf::MAP_LOADING);
1453 1575
1454 $self->alloc; 1576 $self->alloc;
1455 1577
1456 $self->pre_load; 1578 $self->pre_load;
1457
1458 $self->_load_objects ($self->{load_path}, 1)
1459 or return;
1460
1461 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1462 if delete $self->{load_original};
1463
1464 if (my $uniq = $self->uniq_path) {
1465 utf8::encode $uniq;
1466 if (aio_open $uniq, O_RDONLY, 0) {
1467 $self->clear_unique_items;
1468 $self->_load_objects ($uniq, 0);
1469 }
1470 }
1471
1472 Coro::cede;
1473
1474 # now do the right thing for maps
1475 $self->link_multipart_objects;
1476
1477 unless ($self->{deny_activate}) {
1478 $self->decay_objects;
1479 $self->fix_auto_apply;
1480 $self->update_buttons;
1481 Coro::cede; 1579 Coro::cede;
1482 $self->set_darkness_map; 1580
1581 $self->_load_objects ($self->{load_path}, 1)
1582 or return;
1583
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1585 if delete $self->{load_original};
1586
1587 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) {
1590 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0);
1592 }
1593 }
1594
1595 Coro::cede;
1596 # now do the right thing for maps
1597 $self->link_multipart_objects;
1483 $self->difficulty ($self->estimate_difficulty) 1598 $self->difficulty ($self->estimate_difficulty)
1484 unless $self->difficulty; 1599 unless $self->difficulty;
1485 Coro::cede; 1600 Coro::cede;
1601
1602 unless ($self->{deny_activate}) {
1603 $self->decay_objects;
1604 $self->fix_auto_apply;
1605 $self->update_buttons;
1606 Coro::cede;
1607 $self->set_darkness_map;
1608 Coro::cede;
1486 $self->activate; 1609 $self->activate;
1610 }
1611
1612 $self->in_memory (cf::MAP_IN_MEMORY);
1487 } 1613 }
1488 1614
1489 $self->post_load; 1615 $self->post_load;
1490
1491 $self->in_memory (cf::MAP_IN_MEMORY);
1492} 1616}
1493 1617
1494sub customise_for { 1618sub customise_for {
1495 my ($self, $ob) = @_; 1619 my ($self, $ob) = @_;
1496 1620
1497 return find "~" . $ob->name . "/" . $self->{path} 1621 return find "~" . $ob->name . "/" . $self->{path}
1498 if $self->per_player; 1622 if $self->per_player;
1623
1624# return find "?party/" . $ob->name . "/" . $self->{path}
1625# if $self->per_party;
1499 1626
1500 $self 1627 $self
1501} 1628}
1502 1629
1503# find and load all maps in the 3x3 area around a map 1630# find and load all maps in the 3x3 area around a map
… …
1614 1741
1615sub reset_at { 1742sub reset_at {
1616 my ($self) = @_; 1743 my ($self) = @_;
1617 1744
1618 # TODO: safety, remove and allow resettable per-player maps 1745 # TODO: safety, remove and allow resettable per-player maps
1619 return 1e99 if $self->isa ("ext::map_per_player");#d#
1620 return 1e99 if $self->{deny_reset}; 1746 return 1e99 if $self->{deny_reset};
1621 1747
1622 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1748 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1623 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1749 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1624 1750
… …
1635 my ($self) = @_; 1761 my ($self) = @_;
1636 1762
1637 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1763 my $lock = cf::lock_acquire "map_data:$self->{path}";
1638 1764
1639 return if $self->players; 1765 return if $self->players;
1640 return if $self->isa ("ext::map_per_player");#d#
1641 1766
1642 warn "resetting map ", $self->path;#d# 1767 warn "resetting map ", $self->path;
1643 1768
1644 $self->in_memory (cf::MAP_SWAPPED); 1769 $self->in_memory (cf::MAP_SWAPPED);
1645 1770
1646 # need to save uniques path 1771 # need to save uniques path
1647 unless ($self->{deny_save}) { 1772 unless ($self->{deny_save}) {
… …
1679 $cf::MAP{$self->path} = $self; 1804 $cf::MAP{$self->path} = $self;
1680 1805
1681 $self->reset; # polite request, might not happen 1806 $self->reset; # polite request, might not happen
1682} 1807}
1683 1808
1809=item $maps = cf::map::tmp_maps
1810
1811Returns an arrayref with all map paths of currently instantiated and saved
1812maps. May block.
1813
1814=cut
1815
1816sub tmp_maps() {
1817 [
1818 map {
1819 utf8::decode $_;
1820 /\.map$/
1821 ? normalise $_
1822 : ()
1823 } @{ aio_readdir $TMPDIR or [] }
1824 ]
1825}
1826
1827=item $maps = cf::map::random_maps
1828
1829Returns an arrayref with all map paths of currently instantiated and saved
1830random maps. May block.
1831
1832=cut
1833
1834sub random_maps() {
1835 [
1836 map {
1837 utf8::decode $_;
1838 /\.map$/
1839 ? normalise "?random/$_"
1840 : ()
1841 } @{ aio_readdir $RANDOMDIR or [] }
1842 ]
1843}
1844
1684=item cf::map::unique_maps 1845=item cf::map::unique_maps
1685 1846
1686Returns an arrayref of paths of all shared maps that have 1847Returns an arrayref of paths of all shared maps that have
1687instantiated unique items. May block. 1848instantiated unique items. May block.
1688 1849
1689=cut 1850=cut
1690 1851
1691sub unique_maps() { 1852sub unique_maps() {
1692 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1853 [
1693 or return; 1854 map {
1694
1695 my @paths;
1696
1697 for (@$files) {
1698 utf8::decode $_; 1855 utf8::decode $_;
1699 next if /\.pst$/; 1856 /\.map$/
1700 next unless /^$PATH_SEP/o; 1857 ? normalise $_
1701 1858 : ()
1702 push @paths, cf::map::normalise $_; 1859 } @{ aio_readdir $UNIQUEDIR or [] }
1703 } 1860 ]
1704
1705 \@paths
1706} 1861}
1707 1862
1708package cf; 1863package cf;
1709 1864
1710=back 1865=back
… …
1816 $self->deactivate_recursive; 1971 $self->deactivate_recursive;
1817 1972
1818 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1973 return if UNIVERSAL::isa $self->map, "ext::map_link";
1819 1974
1820 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1975 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1821 if $self->map; 1976 if $self->map && $self->map->{path} ne "{link}";
1822 1977
1823 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1978 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1824} 1979}
1825 1980
1826sub cf::object::player::leave_link { 1981sub cf::object::player::leave_link {
1827 my ($self, $map, $x, $y) = @_; 1982 my ($self, $map, $x, $y) = @_;
1983
1984 return unless $self->contr->active;
1828 1985
1829 my $link_pos = delete $self->{_link_pos}; 1986 my $link_pos = delete $self->{_link_pos};
1830 1987
1831 unless ($map) { 1988 unless ($map) {
1832 # restore original map position 1989 # restore original map position
… …
1855 2012
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1857 $self->enter_map ($map, $x, $y); 2014 $self->enter_map ($map, $x, $y);
1858} 2015}
1859 2016
1860cf::player->attach (
1861 on_logout => sub {
1862 my ($pl) = @_;
1863
1864 # abort map switching before logout
1865 if ($pl->ob->{_link_pos}) {
1866 cf::sync_job {
1867 $pl->ob->leave_link
1868 };
1869 }
1870 },
1871 on_login => sub {
1872 my ($pl) = @_;
1873
1874 # try to abort aborted map switching on player login :)
1875 # should happen only on crashes
1876 if ($pl->ob->{_link_pos}) {
1877 $pl->ob->enter_link;
1878 (async {
1879 $pl->ob->reply (undef,
1880 "There was an internal problem at your last logout, "
1881 . "the server will try to bring you to your intended destination in a second.",
1882 cf::NDI_RED);
1883 # we need this sleep as the login has a concurrent enter_exit running
1884 # and this sleep increases chances of the player not ending up in scorn
1885 Coro::Timer::sleep 1;
1886 $pl->ob->leave_link;
1887 })->prio (2);
1888 }
1889 },
1890);
1891
1892=item $player_object->goto ($path, $x, $y) 2017=item $player_object->goto ($path, $x, $y[, $check->($map)])
1893 2018
2019Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position.
2023
1894=cut 2024=cut
2025
2026our $GOTOGEN;
1895 2027
1896sub cf::object::player::goto { 2028sub cf::object::player::goto {
1897 my ($self, $path, $x, $y) = @_; 2029 my ($self, $path, $x, $y, $check) = @_;
2030
2031 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1898 2033
1899 $self->enter_link; 2034 $self->enter_link;
1900 2035
1901 (async { 2036 (async {
1902 my $map = eval { 2037 my $map = eval {
1903 my $map = cf::map::find $path; 2038 my $map = cf::map::find $path;
2039
2040 if ($map) {
1904 $map = $map->customise_for ($self) if $map; 2041 $map = $map->customise_for ($self);
2042 $map = $check->($map) if $check && $map;
2043 } else {
2044 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2045 }
2046
1905 $map 2047 $map
2048 };
2049
2050 if ($@) {
2051 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2052 LOG llevError | logBacktrace, Carp::longmess $@;
1906 } or 2053 }
1907 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1908 2054
2055 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation};
1909 $self->leave_link ($map, $x, $y); 2057 $self->leave_link ($map, $x, $y);
2058 }
1910 })->prio (1); 2059 })->prio (1);
1911} 2060}
1912 2061
1913=item $player_object->enter_exit ($exit_object) 2062=item $player_object->enter_exit ($exit_object)
1914 2063
… …
1953 2102
1954 $rmp->{random_seed} ||= $exit->random_seed; 2103 $rmp->{random_seed} ||= $exit->random_seed;
1955 2104
1956 my $data = cf::to_json $rmp; 2105 my $data = cf::to_json $rmp;
1957 my $md5 = Digest::MD5::md5_hex $data; 2106 my $md5 = Digest::MD5::md5_hex $data;
1958 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2107 my $meta = "$RANDOMDIR/$md5.meta";
1959 2108
1960 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2109 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1961 aio_write $fh, 0, (length $data), $data, 0; 2110 aio_write $fh, 0, (length $data), $data, 0;
1962 undef $fh; 2111 undef $fh;
1963 aio_rename "$meta~", $meta; 2112 aio_rename "$meta~", $meta;
… …
2232############################################################################# 2381#############################################################################
2233 2382
2234=head2 EXTENSION DATABASE SUPPORT 2383=head2 EXTENSION DATABASE SUPPORT
2235 2384
2236Crossfire maintains a very simple database for extension use. It can 2385Crossfire maintains a very simple database for extension use. It can
2237currently store anything that can be serialised using Storable, which 2386currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2238excludes objects. 2387convert to/from binary).
2239 2388
2240The parameter C<$family> should best start with the name of the extension 2389The parameter C<$family> should best start with the name of the extension
2241using it, it should be unique. 2390using it, it should be unique.
2242 2391
2243=over 4 2392=over 4
… …
2266 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2415 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2267 cf::cleanup "db_open(db): $!" if $!; 2416 cf::cleanup "db_open(db): $!" if $!;
2268 }; 2417 };
2269 cf::cleanup "db_open(db): $@" if $@; 2418 cf::cleanup "db_open(db): $@" if $@;
2270 }; 2419 };
2271
2272 my $path = cf::localdir . "/database.pst";
2273 if (stat $path) {
2274 cf::sync_job {
2275 my $pst = Storable::retrieve $path;
2276
2277 cf::db_put (board => data => $pst->{board});
2278 cf::db_put (guildrules => data => $pst->{guildrules});
2279 cf::db_put (rent => balance => $pst->{rent}{balance});
2280 BDB::db_env_txn_checkpoint $DB_ENV;
2281
2282 unlink $path;
2283 };
2284 }
2285 } 2420 }
2286} 2421}
2287 2422
2288sub db_get($$) { 2423sub db_get($$) {
2289 my $key = "$_[0]/$_[1]"; 2424 my $key = "$_[0]/$_[1]";
2290 2425
2291 cf::sync_job { 2426 cf::sync_job {
2292 BDB::db_get $DB, undef, $key, my $data; 2427 BDB::db_get $DB, undef, $key, my $data;
2293 2428
2294 $! ? () 2429 $! ? ()
2295 : Compress::LZF::sthaw $data 2430 : $data
2296 } 2431 }
2297} 2432}
2298 2433
2299sub db_put($$$) { 2434sub db_put($$$) {
2300 BDB::dbreq_pri 4; 2435 BDB::dbreq_pri 4;
2301 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2436 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2437}
2438
2439=item cf::cache $id => [$paths...], $processversion => $process
2440
2441Generic caching function that returns the value of the resource $id,
2442caching and regenerating as required.
2443
2444This function can block.
2445
2446=cut
2447
2448sub cache {
2449 my ($id, $src, $processversion, $process) = @_;
2450
2451 my $meta =
2452 join "\x00",
2453 $processversion,
2454 map {
2455 aio_stat $_
2456 and Carp::croak "$_: $!";
2457
2458 ($_, (stat _)[7,9])
2459 } @$src;
2460
2461 my $dbmeta = db_get cache => "$id/meta";
2462 if ($dbmeta ne $meta) {
2463 # changed, we may need to process
2464
2465 my @data;
2466 my $md5;
2467
2468 for (0 .. $#$src) {
2469 0 <= aio_load $src->[$_], $data[$_]
2470 or Carp::croak "$src->[$_]: $!";
2471 }
2472
2473 # if processing is expensive, check
2474 # checksum first
2475 if (1) {
2476 $md5 =
2477 join "\x00",
2478 $processversion,
2479 map {
2480 Coro::cede;
2481 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2482 } 0.. $#$src;
2483
2484
2485 my $dbmd5 = db_get cache => "$id/md5";
2486 if ($dbmd5 eq $md5) {
2487 db_put cache => "$id/meta", $meta;
2488
2489 return db_get cache => "$id/data";
2490 }
2491 }
2492
2493 my $t1 = Time::HiRes::time;
2494 my $data = $process->(\@data);
2495 my $t2 = Time::HiRes::time;
2496
2497 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2498
2499 db_put cache => "$id/data", $data;
2500 db_put cache => "$id/md5" , $md5;
2501 db_put cache => "$id/meta", $meta;
2502
2503 return $data;
2504 }
2505
2506 db_get cache => "$id/data"
2507}
2508
2509=item fork_call { }, $args
2510
2511Executes the given code block with the given arguments in a seperate
2512process, returning the results. Everything must be serialisable with
2513Coro::Storable. May, of course, block. Note that the executed sub may
2514never block itself or use any form of Event handling.
2515
2516=cut
2517
2518sub fork_call(&@) {
2519 my ($cb, @args) = @_;
2520
2521# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2522# or die "socketpair: $!";
2523 pipe my $fh1, my $fh2
2524 or die "pipe: $!";
2525
2526 if (my $pid = fork) {
2527 close $fh2;
2528
2529 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2530 $res = Coro::Storable::thaw $res;
2531
2532 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2533
2534 die $$res unless "ARRAY" eq ref $res;
2535
2536 return wantarray ? @$res : $res->[-1];
2537 } else {
2538 reset_signals;
2539 local $SIG{__WARN__};
2540 local $SIG{__DIE__};
2541 eval {
2542 close $fh1;
2543
2544 my @res = eval { $cb->(@args) };
2545 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2546 };
2547
2548 warn $@ if $@;
2549 _exit 0;
2550 }
2302} 2551}
2303 2552
2304############################################################################# 2553#############################################################################
2305# the server's init and main functions 2554# the server's init and main functions
2306 2555
2307sub load_facedata { 2556sub load_facedata($) {
2308 my $path = sprintf "%s/facedata", cf::datadir; 2557 my ($path) = @_;
2309 2558
2310 warn "loading facedata from $path\n"; 2559 warn "loading facedata from $path\n";
2311 2560
2312 my $facedata; 2561 my $facedata;
2313 0 < aio_load $path, $facedata 2562 0 < aio_load $path, $facedata
2314 or die "$path: $!"; 2563 or die "$path: $!";
2315 2564
2316 Coro::cede;
2317 $facedata = Storable::thaw $facedata; 2565 $facedata = Coro::Storable::thaw $facedata;
2318 Coro::cede;
2319 2566
2320 $facedata->{version} == 2 2567 $facedata->{version} == 2
2321 or cf::cleanup "$path: version mismatch, cannot proceed."; 2568 or cf::cleanup "$path: version mismatch, cannot proceed.";
2322 2569
2323 { 2570 {
… …
2356 } 2603 }
2357 2604
2358 1 2605 1
2359} 2606}
2360 2607
2608sub reload_regions {
2609 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n";
2611}
2612
2613sub reload_facedata {
2614 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n";
2616}
2617
2618sub reload_archetypes {
2619 load_resource_file "$DATADIR/archetypes"
2620 or die "unable to load archetypes\n";
2621}
2622
2623sub reload_treasures {
2624 load_resource_file "$DATADIR/treasures"
2625 or die "unable to load treasurelists\n";
2626}
2627
2361sub reload_resources { 2628sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2629 warn "reloading resource files...\n";
2363 or die "unable to load regions file\n";#d# 2630
2631 reload_regions;
2364 load_facedata 2632 reload_facedata;
2365 or die "unable to load facedata\n";#d# 2633 #reload_archetypes;#d#
2634 reload_archetypes;
2635 reload_treasures;
2636
2637 warn "finished reloading resource files\n";
2366} 2638}
2367 2639
2368sub init { 2640sub init {
2369 reload_resources; 2641 reload_resources;
2370} 2642}
2371 2643
2372sub cfg_load { 2644sub cfg_load {
2373 open my $fh, "<:utf8", cf::confdir . "/config" 2645 open my $fh, "<:utf8", "$CONFDIR/config"
2374 or return; 2646 or return;
2375 2647
2376 local $/; 2648 local $/;
2377 *CFG = YAML::Syck::Load <$fh>; 2649 *CFG = YAML::Syck::Load <$fh>;
2378 2650
… …
2463 2735
2464 warn Carp::longmess "post_cleanup backtrace" 2736 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core; 2737 if $make_core;
2466} 2738}
2467 2739
2468sub reload() { 2740sub do_reload_perl() {
2469 # can/must only be called in main 2741 # can/must only be called in main
2470 if ($Coro::current != $Coro::main) { 2742 if ($Coro::current != $Coro::main) {
2471 warn "can only reload from main coroutine"; 2743 warn "can only reload from main coroutine";
2472 return; 2744 return;
2473 } 2745 }
… …
2548 Symbol::delete_package "safe::$_" 2820 Symbol::delete_package "safe::$_"
2549 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2821 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2550 2822
2551 warn "unloading cf.pm \"a bit\""; 2823 warn "unloading cf.pm \"a bit\"";
2552 delete $INC{"cf.pm"}; 2824 delete $INC{"cf.pm"};
2825 delete $INC{"cf/pod.pm"};
2553 2826
2554 # don't, removes xs symbols, too, 2827 # don't, removes xs symbols, too,
2555 # and global variables created in xs 2828 # and global variables created in xs
2556 #Symbol::delete_package __PACKAGE__; 2829 #Symbol::delete_package __PACKAGE__;
2557 2830
… …
2572 warn "reattaching attachments to maps"; 2845 warn "reattaching attachments to maps";
2573 reattach $_ for values %MAP; 2846 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players"; 2847 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER; 2848 reattach $_ for values %PLAYER;
2576 2849
2577 warn "loading reloadable resources";
2578 reload_resources;
2579
2580 warn "leaving sync_job"; 2850 warn "leaving sync_job";
2581 2851
2582 1 2852 1
2583 } or do { 2853 } or do {
2584 warn $@; 2854 warn $@;
… …
2589 warn "reloaded"; 2859 warn "reloaded";
2590}; 2860};
2591 2861
2592our $RELOAD_WATCHER; # used only during reload 2862our $RELOAD_WATCHER; # used only during reload
2593 2863
2864sub reload_perl() {
2865 # doing reload synchronously and two reloads happen back-to-back,
2866 # coro crashes during coro_state_free->destroy here.
2867
2868 $RELOAD_WATCHER ||= Event->timer (
2869 reentrant => 0,
2870 after => 0,
2871 data => WF_AUTOCANCEL,
2872 cb => sub {
2873 do_reload_perl;
2874 undef $RELOAD_WATCHER;
2875 },
2876 );
2877}
2878
2594register_command "reload" => sub { 2879register_command "reload" => sub {
2595 my ($who, $arg) = @_; 2880 my ($who, $arg) = @_;
2596 2881
2597 if ($who->flag (FLAG_WIZ)) { 2882 if ($who->flag (FLAG_WIZ)) {
2598 $who->message ("reloading server."); 2883 $who->message ("reloading server.");
2599 2884 async { reload_perl };
2600 # doing reload synchronously and two reloads happen back-to-back,
2601 # coro crashes during coro_state_free->destroy here.
2602
2603 $RELOAD_WATCHER ||= Event->timer (
2604 reentrant => 0,
2605 after => 0,
2606 data => WF_AUTOCANCEL,
2607 cb => sub {
2608 reload;
2609 undef $RELOAD_WATCHER;
2610 },
2611 );
2612 } 2885 }
2613}; 2886};
2614 2887
2615unshift @INC, $LIBDIR; 2888unshift @INC, $LIBDIR;
2616 2889
2617my $bug_warning = 0; 2890my $bug_warning = 0;
2618 2891
2892our @WAIT_FOR_TICK;
2893our @WAIT_FOR_TICK_BEGIN;
2894
2895sub wait_for_tick {
2896 return unless $TICK_WATCHER->is_active;
2897 return if $Coro::current == $Coro::main;
2898
2899 my $signal = new Coro::Signal;
2900 push @WAIT_FOR_TICK, $signal;
2901 $signal->wait;
2902}
2903
2904sub wait_for_tick_begin {
2905 return unless $TICK_WATCHER->is_active;
2906 return if $Coro::current == $Coro::main;
2907
2908 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait;
2911}
2912
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2619$TICK_WATCHER = Event->timer ( 2915$TICK_WATCHER = Event->timer (
2620 reentrant => 0, 2916 reentrant => 0,
2621 parked => 1, 2917 parked => 1,
2622 prio => 0, 2918 prio => 0,
2623 at => $NEXT_TICK || $TICK, 2919 at => $NEXT_TICK || $TICK,
… …
2627 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2923 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2628 unless ++$bug_warning > 10; 2924 unless ++$bug_warning > 10;
2629 return; 2925 return;
2630 } 2926 }
2631 2927
2632 $NOW = Event::time; 2928 $NOW = $tick_start = Event::time;
2633 2929
2634 cf::server_tick; # one server iteration 2930 cf::server_tick; # one server iteration
2931
2932 0 && sync_job {#d#
2933 for(1..10) {
2934 my $t = Event::time;
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2936 or die;
2937
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 };
2954
2635 $RUNTIME += $TICK; 2955 $RUNTIME += $TICK;
2636 $NEXT_TICK += $TICK; 2956 $NEXT_TICK += $TICK;
2637 2957
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10; 2959 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2641 write_runtime 2961 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!"; 2962 or warn "ERROR: unable to write runtime file: $!";
2643 }; 2963 };
2644 } 2964 }
2645 2965
2646 $WAIT_FOR_TICK->broadcast;
2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time; 2966# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d# 2967# warn $AFTER - $NOW;#d#
2651 2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send;
2971 }
2972 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send;
2974 }
2975
2976 $NOW = Event::time;
2977
2652 # if we are delayed by four ticks or more, skip them all 2978 # if we are delayed by four ticks or more, skip them all
2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2654 2980
2655 $TICK_WATCHER->at ($NEXT_TICK); 2981 $TICK_WATCHER->at ($NEXT_TICK);
2656 $TICK_WATCHER->start; 2982 $TICK_WATCHER->start;
2983
2984 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986
2987 _post_tick;
2988
2989
2657 }, 2990 },
2658); 2991);
2659 2992
2660{ 2993{
2661 BDB::max_poll_time $TICK * 0.1; 2994 BDB::max_poll_time $TICK * 0.1;
… …
2689 3022
2690 cf::sync_job { 3023 cf::sync_job {
2691 eval { 3024 eval {
2692 BDB::db_env_open 3025 BDB::db_env_open
2693 $DB_ENV, 3026 $DB_ENV,
2694 $BDB_ENV_DIR, 3027 $BDBDIR,
2695 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2696 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2697 0666; 3030 0666;
2698 3031
2699 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2700 3033
2701 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2702 $DB_ENV->set_lk_detect; 3035 $DB_ENV->set_lk_detect;
2703 }; 3036 };
2704 3037
… …
2720 prio => 6, 3053 prio => 6,
2721 cb => \&IO::AIO::poll_cb, 3054 cb => \&IO::AIO::poll_cb,
2722 ); 3055 );
2723} 3056}
2724 3057
3058my $_log_backtrace;
3059
3060sub _log_backtrace {
3061 my ($msg, @addr) = @_;
3062
3063 $msg =~ s/\n//;
3064
3065 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace;
3068 async {
3069 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!";
3074
3075 my @funcs;
3076 my @res = <$fh>;
3077 chomp for @res;
3078 while (@res) {
3079 my ($func, $line) = splice @res, 0, 2, ();
3080 push @funcs, "[$func] $line";
3081 }
3082
3083 @funcs
3084 };
3085
3086 LOG llevInfo, "[ABT] $msg\n";
3087 LOG llevInfo, "[ABT] $_\n" for @bt;
3088 --$_log_backtrace;
3089 };
3090 } else {
3091 LOG llevInfo, "[ABT] $msg\n";
3092 LOG llevInfo, "[ABT] [suppressed]\n";
3093 }
3094}
3095
3096# load additional modules
3097use cf::pod;
3098
2725END { cf::emergency_save } 3099END { cf::emergency_save }
2726 3100
27271 31011
2728 3102

Diff Legend

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