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.246 by root, Tue Apr 17 10:38:28 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.61 (); 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;
… …
52our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
54 56
55our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
56our @EVENT; 58our @EVENT;
57our $LIBDIR = datadir . "/ext"; 59
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";
58 71
59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 73our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
… …
73our $RUNTIME; 86our $RUNTIME;
74 87
75our %PLAYER; # all users 88our %PLAYER; # all users
76our %MAP; # all maps 89our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 91
81# 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 ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 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
84binmode STDOUT; 99binmode STDOUT;
85binmode STDERR; 100binmode STDERR;
86 101
87# read virtual server time, if available 102# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
92} 107}
93 108
94mkdir cf::localdir; 109mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 111
101our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
102 113
103sub cf::map::normalise; 114sub cf::map::normalise;
104 115
… …
115=item $cf::RUNTIME 126=item $cf::RUNTIME
116 127
117The 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
118every server tick. 129every server tick.
119 130
120=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
121 134
122The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
123be 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.
124 139
125=item $cf::NOW 140=item $cf::NOW
126 141
127The time of the last (current) server tick. 142The time of the last (current) server tick.
128 143
129=item $cf::TICK 144=item $cf::TICK
130 145
131The 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.
132 157
133=item %cf::CFG 158=item %cf::CFG
134 159
135Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 161from wherever your confdir points to.
… …
146=cut 171=cut
147 172
148BEGIN { 173BEGIN {
149 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 175 my $msg = join "", @_;
151 utf8::encode $msg;
152 176
153 $msg .= "\n" 177 $msg .= "\n"
154 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
155 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
156 LOG llevError, $msg; 183 LOG llevError, $msg;
157 }; 184 };
158} 185}
159 186
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@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';
165@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)
166 194
167# 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
168# within the Safe compartment. 196# within the Safe compartment.
169for my $pkg (qw( 197for my $pkg (qw(
170 cf::global cf::attachable 198 cf::global cf::attachable
… …
230returned. 258returned.
231 259
232Lock 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
233uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
234 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
235=cut 267=cut
236 268
237our %LOCK; 269our %LOCK;
238 270
239sub lock_wait($) { 271sub lock_wait($) {
… …
256 288
257 Coro::guard { 289 Coro::guard {
258 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
260 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
261} 299}
262 300
263sub freeze_mainloop { 301sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
265 303
… …
295 333
296sub sync_job(&) { 334sub sync_job(&) {
297 my ($job) = @_; 335 my ($job) = @_;
298 336
299 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
300 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
302 342
303 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
315 355
316 while ($busy) { 356 while ($busy) {
317 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
318 } 358 }
319 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
320 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
321 } else { 368 } else {
322 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
323 370
324 $job->() 371 $job->()
… …
344 391
345 $coro 392 $coro
346} 393}
347 394
348sub write_runtime { 395sub write_runtime {
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
349 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
350
351 my $runtime = cf::localdir . "/runtime";
352 404
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 406 or return;
355 407
356 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
362 414
363 # always fsync - this file is important 415 # always fsync - this file is important
364 aio_fsync $fh 416 aio_fsync $fh
365 and return; 417 and return;
366 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
367 close $fh 422 close $fh
368 or return; 423 or return;
369 424
370 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
371 and return; 426 and return;
427
428 warn "runtime file written.\n";
372 429
373 1 430 1
374} 431}
375 432
376=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
569 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
570 627
571 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 632
576 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 634 my $pkg = shift @arg;
578 635
579 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
620 if (ref $_[0]) { 677 if (ref $_[0]) {
621 _object_attach @_; 678 _object_attach @_;
622 } else { 679 } else {
623 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
624 } 681 }
682 _recalc_want;
625}; 683};
626 684
627# all those should be optimised 685# all those should be optimised
628sub cf::attachable::detach { 686sub cf::attachable::detach {
629 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
632 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
633 reattach ($obj); 691 reattach ($obj);
634 } else { 692 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
636 } 694 }
695 _recalc_want;
637}; 696};
638 697
639sub cf::attachable::attached { 698sub cf::attachable::attached {
640 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
641 700
… …
814 or return; 873 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
816 } 875 }
817 876
818 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 879 return ($data, $av);
821} 880}
822 881
823############################################################################# 882#############################################################################
824# command handling &c 883# command handling &c
… …
884 943
885 cf::override; 944 cf::override;
886 }, 945 },
887); 946);
888 947
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
924 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 953 next unless -r $path;
926 eval { 954
927 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};
928 1 1011 }
929 } or warn "$ext not loaded: $@"; 1012
1013 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress;
1016 }
930 } 1017 };
931} 1018}
932 1019
933############################################################################# 1020#############################################################################
934 1021
935=head2 CORE EXTENSIONS 1022=head2 CORE EXTENSIONS
… …
951Returns the given player object, loading it if necessary (might block). 1038Returns the given player object, loading it if necessary (might block).
952 1039
953=cut 1040=cut
954 1041
955sub playerdir($) { 1042sub playerdir($) {
956 cf::localdir 1043 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1044 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1045}
962 1046
963sub path($) { 1047sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1048 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1084while and may block, so not sync_job-capable, ever. 1168while and may block, so not sync_job-capable, ever.
1085 1169
1086=cut 1170=cut
1087 1171
1088sub list_logins { 1172sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1173 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1174 or return [];
1091 1175
1092 my @logins; 1176 my @logins;
1093 1177
1094 for my $login (@$dirs) { 1178 for my $login (@$dirs) {
… …
1249 my ($self, $merge) = @_; 1333 my ($self, $merge) = @_;
1250 1334
1251 # we have to keep some variables in memory intact 1335 # we have to keep some variables in memory intact
1252 local $self->{path}; 1336 local $self->{path};
1253 local $self->{load_path}; 1337 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1338
1257 $self->SUPER::thawer_merge ($merge); 1339 $self->SUPER::thawer_merge ($merge);
1258} 1340}
1259 1341
1260sub normalise { 1342sub normalise {
… …
1332 1414
1333# the original (read-only) location 1415# the original (read-only) location
1334sub load_path { 1416sub load_path {
1335 my ($self) = @_; 1417 my ($self) = @_;
1336 1418
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1419 "$MAPDIR/$self->{path}.map"
1338} 1420}
1339 1421
1340# the temporary/swap location 1422# the temporary/swap location
1341sub save_path { 1423sub save_path {
1342 my ($self) = @_; 1424 my ($self) = @_;
1343 1425
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1426 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1427 "$TMPDIR/$path.map"
1346} 1428}
1347 1429
1348# the unique path, undef == no special unique path 1430# the unique path, undef == no special unique path
1349sub uniq_path { 1431sub uniq_path {
1350 my ($self) = @_; 1432 my ($self) = @_;
1351 1433
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1434 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1435 "$UNIQUEDIR/$path"
1354} 1436}
1355 1437
1356# and all this just because we cannot iterate over 1438# and all this just because we cannot iterate over
1357# all maps in C++... 1439# all maps in C++...
1358sub change_all_map_light { 1440sub change_all_map_light {
1359 my ($change) = @_; 1441 my ($change) = @_;
1360 1442
1361 $_->change_map_light ($change) 1443 $_->change_map_light ($change)
1362 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;
1363} 1453}
1364 1454
1365sub unlink_save { 1455sub unlink_save {
1366 my ($self) = @_; 1456 my ($self) = @_;
1367 1457
… …
1425 $self->load_header_orig 1515 $self->load_header_orig
1426 or return; 1516 or return;
1427 $self->prepare_orig; 1517 $self->prepare_orig;
1428 } 1518 }
1429 1519
1520 $self->{deny_reset} = 1
1521 if $self->no_reset;
1522
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1523 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1524 unless $self->default_region;
1432 1525
1433 1 1526 1
1434} 1527}
… …
1449 $map->{last_save} = $cf::RUNTIME; 1542 $map->{last_save} = $cf::RUNTIME;
1450 1543
1451 $map->load_header 1544 $map->load_header
1452 or return; 1545 or return;
1453 1546
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1548 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1549 #$cf::WAIT_FOR_TICK->wait;
1457 $map->reset; 1550 $map->reset;
1458 undef $guard; 1551 undef $guard;
1459 return find $path; 1552 return find $path;
… …
1470 my ($self) = @_; 1563 my ($self) = @_;
1471 1564
1472 local $self->{deny_reset} = 1; # loading can take a long time 1565 local $self->{deny_reset} = 1; # loading can take a long time
1473 1566
1474 my $path = $self->{path}; 1567 my $path = $self->{path};
1568
1569 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1570 my $guard = cf::lock_acquire "map_load:$path";
1476 1571
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1572 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1573
1479 $self->in_memory (cf::MAP_LOADING); 1574 $self->in_memory (cf::MAP_LOADING);
1480 1575
1481 $self->alloc; 1576 $self->alloc;
1482 1577
1483 $self->pre_load; 1578 $self->pre_load;
1484 Coro::cede;
1485
1486 $self->_load_objects ($self->{load_path}, 1)
1487 or return;
1488
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original};
1491
1492 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) {
1495 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0);
1497 }
1498 }
1499
1500 Coro::cede;
1501 # now do the right thing for maps
1502 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede; 1579 Coro::cede;
1510 $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;
1511 $self->difficulty ($self->estimate_difficulty) 1598 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1599 unless $self->difficulty;
1513 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;
1514 $self->activate; 1609 $self->activate;
1515 Coro::cede; 1610 }
1611
1612 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1613 }
1517 1614
1518 $self->post_load; 1615 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1616}
1523 1617
1524sub customise_for { 1618sub customise_for {
1525 my ($self, $ob) = @_; 1619 my ($self, $ob) = @_;
1526 1620
1527 return find "~" . $ob->name . "/" . $self->{path} 1621 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1622 if $self->per_player;
1623
1624# return find "?party/" . $ob->name . "/" . $self->{path}
1625# if $self->per_party;
1529 1626
1530 $self 1627 $self
1531} 1628}
1532 1629
1533# 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
… …
1644 1741
1645sub reset_at { 1742sub reset_at {
1646 my ($self) = @_; 1743 my ($self) = @_;
1647 1744
1648 # TODO: safety, remove and allow resettable per-player maps 1745 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 1746 return 1e99 if $self->{deny_reset};
1651 1747
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1748 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 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;
1654 1750
… …
1665 my ($self) = @_; 1761 my ($self) = @_;
1666 1762
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1763 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 1764
1669 return if $self->players; 1765 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 1766
1672 warn "resetting map ", $self->path;#d# 1767 warn "resetting map ", $self->path;
1673 1768
1674 $self->in_memory (cf::MAP_SWAPPED); 1769 $self->in_memory (cf::MAP_SWAPPED);
1675 1770
1676 # need to save uniques path 1771 # need to save uniques path
1677 unless ($self->{deny_save}) { 1772 unless ($self->{deny_save}) {
… …
1709 $cf::MAP{$self->path} = $self; 1804 $cf::MAP{$self->path} = $self;
1710 1805
1711 $self->reset; # polite request, might not happen 1806 $self->reset; # polite request, might not happen
1712} 1807}
1713 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
1714=item cf::map::unique_maps 1845=item cf::map::unique_maps
1715 1846
1716Returns an arrayref of paths of all shared maps that have 1847Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 1848instantiated unique items. May block.
1718 1849
1719=cut 1850=cut
1720 1851
1721sub unique_maps() { 1852sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1853 [
1723 or return; 1854 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 1855 utf8::decode $_;
1729 next if /\.pst$/; 1856 /\.map$/
1730 next unless /^$PATH_SEP/o; 1857 ? normalise $_
1731 1858 : ()
1732 push @paths, cf::map::normalise $_; 1859 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 1860 ]
1734
1735 \@paths
1736} 1861}
1737 1862
1738package cf; 1863package cf;
1739 1864
1740=back 1865=back
… …
1846 $self->deactivate_recursive; 1971 $self->deactivate_recursive;
1847 1972
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1973 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 1974
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1975 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 1976 if $self->map && $self->map->{path} ne "{link}";
1852 1977
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1978 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 1979}
1855 1980
1856sub cf::object::player::leave_link { 1981sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 1982 my ($self, $map, $x, $y) = @_;
1983
1984 return unless $self->contr->active;
1858 1985
1859 my $link_pos = delete $self->{_link_pos}; 1986 my $link_pos = delete $self->{_link_pos};
1860 1987
1861 unless ($map) { 1988 unless ($map) {
1862 # restore original map position 1989 # restore original map position
… …
1885 2012
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2014 $self->enter_map ($map, $x, $y);
1888} 2015}
1889 2016
1890cf::player->attach (
1891 on_logout => sub {
1892 my ($pl) = @_;
1893
1894 # abort map switching before logout
1895 if ($pl->ob->{_link_pos}) {
1896 cf::sync_job {
1897 $pl->ob->leave_link
1898 };
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y) 2017=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 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
1924=cut 2024=cut
2025
2026our $GOTOGEN;
1925 2027
1926sub cf::object::player::goto { 2028sub cf::object::player::goto {
1927 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;
1928 2033
1929 $self->enter_link; 2034 $self->enter_link;
1930 2035
1931 (async { 2036 (async {
1932 my $map = eval { 2037 my $map = eval {
1933 my $map = cf::map::find $path; 2038 my $map = cf::map::find $path;
2039
2040 if ($map) {
1934 $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
1935 $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 $@;
1936 } or 2053 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2054
2055 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2057 $self->leave_link ($map, $x, $y);
2058 }
1940 })->prio (1); 2059 })->prio (1);
1941} 2060}
1942 2061
1943=item $player_object->enter_exit ($exit_object) 2062=item $player_object->enter_exit ($exit_object)
1944 2063
… …
1983 2102
1984 $rmp->{random_seed} ||= $exit->random_seed; 2103 $rmp->{random_seed} ||= $exit->random_seed;
1985 2104
1986 my $data = cf::to_json $rmp; 2105 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2106 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2107 my $meta = "$RANDOMDIR/$md5.meta";
1989 2108
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2109 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2110 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2111 undef $fh;
1993 aio_rename "$meta~", $meta; 2112 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2381#############################################################################
2263 2382
2264=head2 EXTENSION DATABASE SUPPORT 2383=head2 EXTENSION DATABASE SUPPORT
2265 2384
2266Crossfire maintains a very simple database for extension use. It can 2385Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2386currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2387convert to/from binary).
2269 2388
2270The 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
2271using it, it should be unique. 2390using it, it should be unique.
2272 2391
2273=over 4 2392=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2415 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2416 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2417 };
2299 cf::cleanup "db_open(db): $@" if $@; 2418 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2419 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 } 2420 }
2316} 2421}
2317 2422
2318sub db_get($$) { 2423sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2424 my $key = "$_[0]/$_[1]";
2320 2425
2321 cf::sync_job { 2426 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2427 BDB::db_get $DB, undef, $key, my $data;
2323 2428
2324 $! ? () 2429 $! ? ()
2325 : Compress::LZF::sthaw $data 2430 : $data
2326 } 2431 }
2327} 2432}
2328 2433
2329sub db_put($$$) { 2434sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2435 BDB::dbreq_pri 4;
2331 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 }
2332} 2551}
2333 2552
2334############################################################################# 2553#############################################################################
2335# the server's init and main functions 2554# the server's init and main functions
2336 2555
… …
2384 } 2603 }
2385 2604
2386 1 2605 1
2387} 2606}
2388 2607
2608sub reload_regions {
2609 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n";
2611}
2612
2389sub reload_facedata { 2613sub reload_facedata {
2390 load_facedata sprintf "%s/facedata", cf::datadir 2614 load_facedata "$DATADIR/facedata"
2391 or die "unable to load facedata\n"; 2615 or die "unable to load facedata\n";
2392} 2616}
2393 2617
2394sub reload_regions {
2395 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2396 or die "unable to load regions file\n";
2397}
2398
2399sub reload_archetypes { 2618sub reload_archetypes {
2400 load_archetype_file sprintf "%s/archetypes", cf::datadir 2619 load_resource_file "$DATADIR/archetypes"
2401 or die "unable to load archetypes\n"; 2620 or die "unable to load archetypes\n";
2402} 2621}
2403 2622
2404sub reload_treasures { 2623sub reload_treasures {
2405 load_treasure_file sprintf "%s/treasures", cf::datadir 2624 load_resource_file "$DATADIR/treasures"
2406 or die "unable to load treasurelists\n"; 2625 or die "unable to load treasurelists\n";
2407} 2626}
2408 2627
2409sub reload_resources { 2628sub reload_resources {
2410 warn "reloading resource files...\n"; 2629 warn "reloading resource files...\n";
2411 2630
2412 reload_regions; 2631 reload_regions;
2413 reload_facedata; 2632 reload_facedata;
2633 #reload_archetypes;#d#
2414 reload_archetypes; 2634 reload_archetypes;
2415 reload_treasures; 2635 reload_treasures;
2416 2636
2417 warn "finished reloading resource files\n"; 2637 warn "finished reloading resource files\n";
2418} 2638}
… …
2420sub init { 2640sub init {
2421 reload_resources; 2641 reload_resources;
2422} 2642}
2423 2643
2424sub cfg_load { 2644sub cfg_load {
2425 open my $fh, "<:utf8", cf::confdir . "/config" 2645 open my $fh, "<:utf8", "$CONFDIR/config"
2426 or return; 2646 or return;
2427 2647
2428 local $/; 2648 local $/;
2429 *CFG = YAML::Syck::Load <$fh>; 2649 *CFG = YAML::Syck::Load <$fh>;
2430 2650
… …
2600 Symbol::delete_package "safe::$_" 2820 Symbol::delete_package "safe::$_"
2601 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);
2602 2822
2603 warn "unloading cf.pm \"a bit\""; 2823 warn "unloading cf.pm \"a bit\"";
2604 delete $INC{"cf.pm"}; 2824 delete $INC{"cf.pm"};
2825 delete $INC{"cf/pod.pm"};
2605 2826
2606 # don't, removes xs symbols, too, 2827 # don't, removes xs symbols, too,
2607 # and global variables created in xs 2828 # and global variables created in xs
2608 #Symbol::delete_package __PACKAGE__; 2829 #Symbol::delete_package __PACKAGE__;
2609 2830
… …
2687 my $signal = new Coro::Signal; 2908 my $signal = new Coro::Signal;
2688 push @WAIT_FOR_TICK_BEGIN, $signal; 2909 push @WAIT_FOR_TICK_BEGIN, $signal;
2689 $signal->wait; 2910 $signal->wait;
2690} 2911}
2691 2912
2913 my $min = 1e6;#d#
2914 my $avg = 10;
2692$TICK_WATCHER = Event->timer ( 2915$TICK_WATCHER = Event->timer (
2693 reentrant => 0, 2916 reentrant => 0,
2694 parked => 1, 2917 parked => 1,
2695 prio => 0, 2918 prio => 0,
2696 at => $NEXT_TICK || $TICK, 2919 at => $NEXT_TICK || $TICK,
… …
2700 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"
2701 unless ++$bug_warning > 10; 2924 unless ++$bug_warning > 10;
2702 return; 2925 return;
2703 } 2926 }
2704 2927
2705 $NOW = Event::time; 2928 $NOW = $tick_start = Event::time;
2706 2929
2707 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 };
2708 2954
2709 $RUNTIME += $TICK; 2955 $RUNTIME += $TICK;
2710 $NEXT_TICK += $TICK; 2956 $NEXT_TICK += $TICK;
2711 2957
2712 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2718 } 2964 }
2719 2965
2720# my $AFTER = Event::time; 2966# my $AFTER = Event::time;
2721# warn $AFTER - $NOW;#d# 2967# warn $AFTER - $NOW;#d#
2722 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
2723 # 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
2724 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2725 2980
2726 $TICK_WATCHER->at ($NEXT_TICK); 2981 $TICK_WATCHER->at ($NEXT_TICK);
2727 $TICK_WATCHER->start; 2982 $TICK_WATCHER->start;
2728 2983
2729 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2984 $LOAD = ($NOW - $tick_start) / $TICK;
2730 $sig->send; 2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2731 }
2732 while (my $sig = shift @WAIT_FOR_TICK) {
2733 $sig->send;
2734 }
2735 2986
2736 _post_tick; 2987 _post_tick;
2988
2989
2737 }, 2990 },
2738); 2991);
2739 2992
2740{ 2993{
2741 BDB::max_poll_time $TICK * 0.1; 2994 BDB::max_poll_time $TICK * 0.1;
… …
2769 3022
2770 cf::sync_job { 3023 cf::sync_job {
2771 eval { 3024 eval {
2772 BDB::db_env_open 3025 BDB::db_env_open
2773 $DB_ENV, 3026 $DB_ENV,
2774 $BDB_ENV_DIR, 3027 $BDBDIR,
2775 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
2776 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2777 0666; 3030 0666;
2778 3031
2779 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2780 3033
2781 $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);
2782 $DB_ENV->set_lk_detect; 3035 $DB_ENV->set_lk_detect;
2783 }; 3036 };
2784 3037
… …
2800 prio => 6, 3053 prio => 6,
2801 cb => \&IO::AIO::poll_cb, 3054 cb => \&IO::AIO::poll_cb,
2802 ); 3055 );
2803} 3056}
2804 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
2805END { cf::emergency_save } 3099END { cf::emergency_save }
2806 3100
28071 31011
2808 3102

Diff Legend

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