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.252 by root, Wed Apr 18 15:28:18 2007 UTC vs.
Revision 1.279 by root, Mon Jun 11 22:16:53 2007 UTC

… …
54our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
56 56
57our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
58our @EVENT; 58our @EVENT;
59our $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";
60 71
61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62our $TICK_WATCHER; 73our $TICK_WATCHER;
63our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
… …
75our $RUNTIME; 86our $RUNTIME;
76 87
77our %PLAYER; # all users 88our %PLAYER; # all users
78our %MAP; # all maps 89our %MAP; # all maps
79our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
80our $RANDOM_MAPS = cf::localdir . "/random";
81our $BDB_ENV_DIR = cf::localdir . "/db";
82 91
83# 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 ∕
84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85 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
86binmode STDOUT; 99binmode STDOUT;
87binmode STDERR; 100binmode STDERR;
88 101
89# read virtual server time, if available 102# read virtual server time, if available
90unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
92 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
93 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
94} 107}
95 108
96mkdir cf::localdir; 109mkdir $_
97mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98mkdir cf::localdir . "/" . cf::tmpdir;
99mkdir cf::localdir . "/" . cf::uniquedir;
100mkdir $RANDOM_MAPS;
101mkdir $BDB_ENV_DIR;
102 111
103our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
104 113
105sub cf::map::normalise; 114sub cf::map::normalise;
106 115
… …
117=item $cf::RUNTIME 126=item $cf::RUNTIME
118 127
119The 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
120every server tick. 129every server tick.
121 130
122=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
123 134
124The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
125be 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.
126 139
127=item $cf::NOW 140=item $cf::NOW
128 141
129The time of the last (current) server tick. 142The time of the last (current) server tick.
130 143
131=item $cf::TICK 144=item $cf::TICK
132 145
133The 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.
134 157
135=item %cf::CFG 158=item %cf::CFG
136 159
137Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
138from wherever your confdir points to. 161from wherever your confdir points to.
… …
152 my $msg = join "", @_; 175 my $msg = join "", @_;
153 176
154 $msg .= "\n" 177 $msg .= "\n"
155 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
156 179
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158 181
159 utf8::encode $msg; 182 utf8::encode $msg;
160 LOG llevError, $msg; 183 LOG llevError, $msg;
161 }; 184 };
162} 185}
… …
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@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';
169@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)
170 194
171# 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
172# within the Safe compartment. 196# within the Safe compartment.
173for my $pkg (qw( 197for my $pkg (qw(
174 cf::global cf::attachable 198 cf::global cf::attachable
… …
234returned. 258returned.
235 259
236Lock 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
237uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
238 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
239=cut 267=cut
240 268
241our %LOCK; 269our %LOCK;
242 270
243sub lock_wait($) { 271sub lock_wait($) {
… …
260 288
261 Coro::guard { 289 Coro::guard {
262 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
264 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
265} 299}
266 300
267sub freeze_mainloop { 301sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
269 303
… …
299 333
300sub sync_job(&) { 334sub sync_job(&) {
301 my ($job) = @_; 335 my ($job) = @_;
302 336
303 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
304 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
306 342
307 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
319 355
320 while ($busy) { 356 while ($busy) {
321 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
322 } 358 }
323 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
324 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
325 } else { 368 } else {
326 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
327 370
328 $job->() 371 $job->()
… …
348 391
349 $coro 392 $coro
350} 393}
351 394
352sub 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
353 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
354
355 my $runtime = cf::localdir . "/runtime";
356 404
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
358 or return; 406 or return;
359 407
360 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
366 414
367 # always fsync - this file is important 415 # always fsync - this file is important
368 aio_fsync $fh 416 aio_fsync $fh
369 and return; 417 and return;
370 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
371 close $fh 422 close $fh
372 or return; 423 or return;
373 424
374 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
375 and return; 426 and return;
427
428 warn "runtime file written.\n";
376 429
377 1 430 1
378} 431}
379 432
380=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
573 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
574 627
575 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 632
580 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 634 my $pkg = shift @arg;
582 635
583 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
624 if (ref $_[0]) { 677 if (ref $_[0]) {
625 _object_attach @_; 678 _object_attach @_;
626 } else { 679 } else {
627 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
628 } 681 }
682 _recalc_want;
629}; 683};
630 684
631# all those should be optimised 685# all those should be optimised
632sub cf::attachable::detach { 686sub cf::attachable::detach {
633 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
636 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
637 reattach ($obj); 691 reattach ($obj);
638 } else { 692 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
640 } 694 }
695 _recalc_want;
641}; 696};
642 697
643sub cf::attachable::attached { 698sub cf::attachable::attached {
644 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
645 700
… …
818 or return; 873 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
820 } 875 }
821 876
822 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
824 return ($data, $av); 879 return ($data, $av);
825} 880}
826 881
827############################################################################# 882#############################################################################
828# command handling &c 883# command handling &c
… …
888 943
889 cf::override; 944 cf::override;
890 }, 945 },
891); 946);
892 947
893sub load_extension {
894 my ($path) = @_;
895
896 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
897 my $base = $1;
898 my $pkg = $1;
899 $pkg =~ s/[^[:word:]]/_/g;
900 $pkg = "ext::$pkg";
901
902 warn "... loading '$path' into '$pkg'\n";
903
904 open my $fh, "<:utf8", $path
905 or die "$path: $!";
906
907 my $source =
908 "package $pkg; use strict; use utf8;\n"
909 . "#line 1 \"$path\"\n{\n"
910 . (do { local $/; <$fh> })
911 . "\n};\n1";
912
913 unless (eval $source) {
914 my $msg = $@ ? "$path: $@\n"
915 : "extension disabled.\n";
916 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917 warn $@;
918 warn "mandatory extension failed to load, exiting.\n";
919 exit 1;
920 }
921 die $@;
922 }
923
924 push @EXTS, $pkg;
925}
926
927sub load_extensions { 948sub load_extensions {
949 cf::sync_job {
950 my %todo;
951
928 for my $ext (<$LIBDIR/*.ext>) { 952 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 953 next unless -r $path;
930 eval { 954
931 load_extension $ext; 955 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
956 my $base = $1;
957 my $pkg = $1;
958 $pkg =~ s/[^[:word:]]/_/g;
959 $pkg = "ext::$pkg";
960
961 open my $fh, "<:utf8", $path
962 or die "$path: $!";
963
964 my $source = do { local $/; <$fh> };
965
966 my %ext = (
967 path => $path,
968 base => $base,
969 pkg => $pkg,
970 );
971
972 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974
975 $ext{source} =
976 "package $pkg; use strict; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n"
978 . $source
979 . "\n};\n1";
980
981 $todo{$base} = \%ext;
982 }
983
984 my %done;
985 while (%todo) {
986 my $progress;
987
988 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip
991 unless exists $done{$_};
992 }
993
994 warn "... loading '$k' into '$v->{pkg}'\n";
995
996 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n"
998 : "$v->{base}: extension inactive.\n";
999
1000 if (exists $v->{meta}{mandatory}) {
1001 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n";
1003 exit 1;
1004 }
1005
1006 warn $msg;
1007 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
1011 $progress = 1;
932 1 1012 }
933 } or warn "$ext not loaded: $@"; 1013
1014 skip:
1015 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1016 unless $progress;
1017 }
934 } 1018 };
935} 1019}
936 1020
937############################################################################# 1021#############################################################################
938 1022
939=head2 CORE EXTENSIONS 1023=head2 CORE EXTENSIONS
… …
955Returns the given player object, loading it if necessary (might block). 1039Returns the given player object, loading it if necessary (might block).
956 1040
957=cut 1041=cut
958 1042
959sub playerdir($) { 1043sub playerdir($) {
960 cf::localdir 1044 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1045 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1046}
966 1047
967sub path($) { 1048sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1049 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1088while and may block, so not sync_job-capable, ever. 1169while and may block, so not sync_job-capable, ever.
1089 1170
1090=cut 1171=cut
1091 1172
1092sub list_logins { 1173sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1174 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1175 or return [];
1095 1176
1096 my @logins; 1177 my @logins;
1097 1178
1098 for my $login (@$dirs) { 1179 for my $login (@$dirs) {
… …
1253 my ($self, $merge) = @_; 1334 my ($self, $merge) = @_;
1254 1335
1255 # we have to keep some variables in memory intact 1336 # we have to keep some variables in memory intact
1256 local $self->{path}; 1337 local $self->{path};
1257 local $self->{load_path}; 1338 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1339
1261 $self->SUPER::thawer_merge ($merge); 1340 $self->SUPER::thawer_merge ($merge);
1262} 1341}
1263 1342
1264sub normalise { 1343sub normalise {
… …
1336 1415
1337# the original (read-only) location 1416# the original (read-only) location
1338sub load_path { 1417sub load_path {
1339 my ($self) = @_; 1418 my ($self) = @_;
1340 1419
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1420 "$MAPDIR/$self->{path}.map"
1342} 1421}
1343 1422
1344# the temporary/swap location 1423# the temporary/swap location
1345sub save_path { 1424sub save_path {
1346 my ($self) = @_; 1425 my ($self) = @_;
1347 1426
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1428 "$TMPDIR/$path.map"
1350} 1429}
1351 1430
1352# the unique path, undef == no special unique path 1431# the unique path, undef == no special unique path
1353sub uniq_path { 1432sub uniq_path {
1354 my ($self) = @_; 1433 my ($self) = @_;
1355 1434
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1436 "$UNIQUEDIR/$path"
1358} 1437}
1359 1438
1360# and all this just because we cannot iterate over 1439# and all this just because we cannot iterate over
1361# all maps in C++... 1440# all maps in C++...
1362sub change_all_map_light { 1441sub change_all_map_light {
1363 my ($change) = @_; 1442 my ($change) = @_;
1364 1443
1365 $_->change_map_light ($change) 1444 $_->change_map_light ($change)
1366 for grep $_->outdoor, values %cf::MAP; 1445 for grep $_->outdoor, values %cf::MAP;
1446}
1447
1448sub decay_objects {
1449 my ($self) = @_;
1450
1451 return if $self->{deny_reset};
1452
1453 $self->do_decay_objects;
1367} 1454}
1368 1455
1369sub unlink_save { 1456sub unlink_save {
1370 my ($self) = @_; 1457 my ($self) = @_;
1371 1458
… …
1429 $self->load_header_orig 1516 $self->load_header_orig
1430 or return; 1517 or return;
1431 $self->prepare_orig; 1518 $self->prepare_orig;
1432 } 1519 }
1433 1520
1521 $self->{deny_reset} = 1
1522 if $self->no_reset;
1523
1434 $self->default_region (cf::region::find_by_path $self->{path}) 1524 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 1525 unless $self->default_region;
1436 1526
1437 1 1527 1
1438} 1528}
… …
1453 $map->{last_save} = $cf::RUNTIME; 1543 $map->{last_save} = $cf::RUNTIME;
1454 1544
1455 $map->load_header 1545 $map->load_header
1456 or return; 1546 or return;
1457 1547
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 1549 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 1550 #$cf::WAIT_FOR_TICK->wait;
1461 $map->reset; 1551 $map->reset;
1462 undef $guard; 1552 undef $guard;
1463 return find $path; 1553 return find $path;
… …
1474 my ($self) = @_; 1564 my ($self) = @_;
1475 1565
1476 local $self->{deny_reset} = 1; # loading can take a long time 1566 local $self->{deny_reset} = 1; # loading can take a long time
1477 1567
1478 my $path = $self->{path}; 1568 my $path = $self->{path};
1569
1570 {
1479 my $guard = cf::lock_acquire "map_load:$path"; 1571 my $guard = cf::lock_acquire "map_load:$path";
1480 1572
1481 return if $self->in_memory != cf::MAP_SWAPPED; 1573 return if $self->in_memory != cf::MAP_SWAPPED;
1482 1574
1483 $self->in_memory (cf::MAP_LOADING); 1575 $self->in_memory (cf::MAP_LOADING);
1484 1576
1485 $self->alloc; 1577 $self->alloc;
1486 1578
1487 $self->pre_load; 1579 $self->pre_load;
1488 Coro::cede;
1489
1490 $self->_load_objects ($self->{load_path}, 1)
1491 or return;
1492
1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1494 if delete $self->{load_original};
1495
1496 if (my $uniq = $self->uniq_path) {
1497 utf8::encode $uniq;
1498 if (aio_open $uniq, O_RDONLY, 0) {
1499 $self->clear_unique_items;
1500 $self->_load_objects ($uniq, 0);
1501 }
1502 }
1503
1504 Coro::cede;
1505 # now do the right thing for maps
1506 $self->link_multipart_objects;
1507 Coro::cede;
1508
1509 unless ($self->{deny_activate}) {
1510 $self->decay_objects;
1511 $self->fix_auto_apply;
1512 $self->update_buttons;
1513 Coro::cede; 1580 Coro::cede;
1514 $self->set_darkness_map; 1581
1582 $self->_load_objects ($self->{load_path}, 1)
1583 or return;
1584
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1586 if delete $self->{load_original};
1587
1588 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) {
1591 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0);
1593 }
1594 }
1595
1596 Coro::cede;
1597 # now do the right thing for maps
1598 $self->link_multipart_objects;
1515 $self->difficulty ($self->estimate_difficulty) 1599 $self->difficulty ($self->estimate_difficulty)
1516 unless $self->difficulty; 1600 unless $self->difficulty;
1517 Coro::cede; 1601 Coro::cede;
1602
1603 unless ($self->{deny_activate}) {
1604 $self->decay_objects;
1605 $self->fix_auto_apply;
1606 $self->update_buttons;
1607 Coro::cede;
1608 $self->set_darkness_map;
1609 Coro::cede;
1518 $self->activate; 1610 $self->activate;
1519 Coro::cede; 1611 }
1612
1613 $self->in_memory (cf::MAP_IN_MEMORY);
1520 } 1614 }
1521 1615
1522 $self->post_load; 1616 $self->post_load;
1523 Coro::cede;
1524
1525 $self->in_memory (cf::MAP_IN_MEMORY);
1526} 1617}
1527 1618
1528sub customise_for { 1619sub customise_for {
1529 my ($self, $ob) = @_; 1620 my ($self, $ob) = @_;
1530 1621
1531 return find "~" . $ob->name . "/" . $self->{path} 1622 return find "~" . $ob->name . "/" . $self->{path}
1532 if $self->per_player; 1623 if $self->per_player;
1624
1625# return find "?party/" . $ob->name . "/" . $self->{path}
1626# if $self->per_party;
1533 1627
1534 $self 1628 $self
1535} 1629}
1536 1630
1537# find and load all maps in the 3x3 area around a map 1631# find and load all maps in the 3x3 area around a map
… …
1648 1742
1649sub reset_at { 1743sub reset_at {
1650 my ($self) = @_; 1744 my ($self) = @_;
1651 1745
1652 # TODO: safety, remove and allow resettable per-player maps 1746 # TODO: safety, remove and allow resettable per-player maps
1653 return 1e99 if $self->isa ("ext::map_per_player");#d#
1654 return 1e99 if $self->{deny_reset}; 1747 return 1e99 if $self->{deny_reset};
1655 1748
1656 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1749 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1657 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1750 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1658 1751
… …
1669 my ($self) = @_; 1762 my ($self) = @_;
1670 1763
1671 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1764 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 1765
1673 return if $self->players; 1766 return if $self->players;
1674 return if $self->isa ("ext::map_per_player");#d#
1675 1767
1676 warn "resetting map ", $self->path;#d# 1768 warn "resetting map ", $self->path;
1677 1769
1678 $self->in_memory (cf::MAP_SWAPPED); 1770 $self->in_memory (cf::MAP_SWAPPED);
1679 1771
1680 # need to save uniques path 1772 # need to save uniques path
1681 unless ($self->{deny_save}) { 1773 unless ($self->{deny_save}) {
… …
1713 $cf::MAP{$self->path} = $self; 1805 $cf::MAP{$self->path} = $self;
1714 1806
1715 $self->reset; # polite request, might not happen 1807 $self->reset; # polite request, might not happen
1716} 1808}
1717 1809
1810=item $maps = cf::map::tmp_maps
1811
1812Returns an arrayref with all map paths of currently instantiated and saved
1813maps. May block.
1814
1815=cut
1816
1817sub tmp_maps() {
1818 [
1819 map {
1820 utf8::decode $_;
1821 /\.map$/
1822 ? normalise $_
1823 : ()
1824 } @{ aio_readdir $TMPDIR or [] }
1825 ]
1826}
1827
1828=item $maps = cf::map::random_maps
1829
1830Returns an arrayref with all map paths of currently instantiated and saved
1831random maps. May block.
1832
1833=cut
1834
1835sub random_maps() {
1836 [
1837 map {
1838 utf8::decode $_;
1839 /\.map$/
1840 ? normalise "?random/$_"
1841 : ()
1842 } @{ aio_readdir $RANDOMDIR or [] }
1843 ]
1844}
1845
1718=item cf::map::unique_maps 1846=item cf::map::unique_maps
1719 1847
1720Returns an arrayref of paths of all shared maps that have 1848Returns an arrayref of paths of all shared maps that have
1721instantiated unique items. May block. 1849instantiated unique items. May block.
1722 1850
1723=cut 1851=cut
1724 1852
1725sub unique_maps() { 1853sub unique_maps() {
1726 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1854 [
1727 or return; 1855 map {
1728
1729 my @paths;
1730
1731 for (@$files) {
1732 utf8::decode $_; 1856 utf8::decode $_;
1733 next if /\.pst$/; 1857 /\.map$/
1734 next unless /^$PATH_SEP/o; 1858 ? normalise $_
1735 1859 : ()
1736 push @paths, cf::map::normalise $_; 1860 } @{ aio_readdir $UNIQUEDIR or [] }
1737 } 1861 ]
1738
1739 \@paths
1740} 1862}
1741 1863
1742package cf; 1864package cf;
1743 1865
1744=back 1866=back
… …
1850 $self->deactivate_recursive; 1972 $self->deactivate_recursive;
1851 1973
1852 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1974 return if UNIVERSAL::isa $self->map, "ext::map_link";
1853 1975
1854 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1855 if $self->map; 1977 if $self->map && $self->map->{path} ne "{link}";
1856 1978
1857 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1979 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1858} 1980}
1859 1981
1860sub cf::object::player::leave_link { 1982sub cf::object::player::leave_link {
1861 my ($self, $map, $x, $y) = @_; 1983 my ($self, $map, $x, $y) = @_;
1984
1985 return unless $self->contr->active;
1862 1986
1863 my $link_pos = delete $self->{_link_pos}; 1987 my $link_pos = delete $self->{_link_pos};
1864 1988
1865 unless ($map) { 1989 unless ($map) {
1866 # restore original map position 1990 # restore original map position
… …
1889 2013
1890 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891 $self->enter_map ($map, $x, $y); 2015 $self->enter_map ($map, $x, $y);
1892} 2016}
1893 2017
1894cf::player->attach (
1895 on_logout => sub {
1896 my ($pl) = @_;
1897
1898 # abort map switching before logout
1899 if ($pl->ob->{_link_pos}) {
1900 cf::sync_job {
1901 $pl->ob->leave_link
1902 };
1903 }
1904 },
1905 on_login => sub {
1906 my ($pl) = @_;
1907
1908 # try to abort aborted map switching on player login :)
1909 # should happen only on crashes
1910 if ($pl->ob->{_link_pos}) {
1911 $pl->ob->enter_link;
1912 (async {
1913 $pl->ob->reply (undef,
1914 "There was an internal problem at your last logout, "
1915 . "the server will try to bring you to your intended destination in a second.",
1916 cf::NDI_RED);
1917 # we need this sleep as the login has a concurrent enter_exit running
1918 # and this sleep increases chances of the player not ending up in scorn
1919 Coro::Timer::sleep 1;
1920 $pl->ob->leave_link;
1921 })->prio (2);
1922 }
1923 },
1924);
1925
1926=item $player_object->goto ($path, $x, $y) 2018=item $player_object->goto ($path, $x, $y[, $check->($map)])
1927 2019
2020Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position.
2024
1928=cut 2025=cut
2026
2027our $GOTOGEN;
1929 2028
1930sub cf::object::player::goto { 2029sub cf::object::player::goto {
1931 my ($self, $path, $x, $y) = @_; 2030 my ($self, $path, $x, $y, $check) = @_;
2031
2032 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1932 2034
1933 $self->enter_link; 2035 $self->enter_link;
1934 2036
1935 (async { 2037 (async {
1936 my $map = eval { 2038 my $map = eval {
1937 my $map = cf::map::find $path; 2039 my $map = cf::map::find $path;
2040
2041 if ($map) {
1938 $map = $map->customise_for ($self) if $map; 2042 $map = $map->customise_for ($self);
2043 $map = $check->($map) if $check && $map;
2044 } else {
2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2046 }
2047
1939 $map 2048 $map
2049 };
2050
2051 if ($@) {
2052 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2053 LOG llevError | logBacktrace, Carp::longmess $@;
1940 } or 2054 }
1941 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1942 2055
2056 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation};
1943 $self->leave_link ($map, $x, $y); 2058 $self->leave_link ($map, $x, $y);
2059 }
1944 })->prio (1); 2060 })->prio (1);
1945} 2061}
1946 2062
1947=item $player_object->enter_exit ($exit_object) 2063=item $player_object->enter_exit ($exit_object)
1948 2064
… …
1987 2103
1988 $rmp->{random_seed} ||= $exit->random_seed; 2104 $rmp->{random_seed} ||= $exit->random_seed;
1989 2105
1990 my $data = cf::to_json $rmp; 2106 my $data = cf::to_json $rmp;
1991 my $md5 = Digest::MD5::md5_hex $data; 2107 my $md5 = Digest::MD5::md5_hex $data;
1992 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2108 my $meta = "$RANDOMDIR/$md5.meta";
1993 2109
1994 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995 aio_write $fh, 0, (length $data), $data, 0; 2111 aio_write $fh, 0, (length $data), $data, 0;
1996 undef $fh; 2112 undef $fh;
1997 aio_rename "$meta~", $meta; 2113 aio_rename "$meta~", $meta;
… …
2373 2489
2374 return db_get cache => "$id/data"; 2490 return db_get cache => "$id/data";
2375 } 2491 }
2376 } 2492 }
2377 2493
2494 my $t1 = Time::HiRes::time;
2378 my $data = $process->(\@data); 2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2379 2499
2380 db_put cache => "$id/data", $data; 2500 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5; 2501 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta; 2502 db_put cache => "$id/meta", $meta;
2383 2503
… …
2414 2534
2415 die $$res unless "ARRAY" eq ref $res; 2535 die $$res unless "ARRAY" eq ref $res;
2416 2536
2417 return wantarray ? @$res : $res->[-1]; 2537 return wantarray ? @$res : $res->[-1];
2418 } else { 2538 } else {
2539 reset_signals;
2419 local $SIG{__WARN__}; 2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2420 eval { 2542 eval {
2421 local $SIG{__DIE__};
2422 close $fh1; 2543 close $fh1;
2423 2544
2424 my @res = eval { $cb->(@args) }; 2545 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 }; 2547 };
2427 2548
2428 warn $@ if $@; 2549 warn $@ if $@;
2429 _exit 0; 2550 _exit 0;
2430 } 2551 }
2431} 2552}
2432
2433
2434 2553
2435############################################################################# 2554#############################################################################
2436# the server's init and main functions 2555# the server's init and main functions
2437 2556
2438sub load_facedata($) { 2557sub load_facedata($) {
… …
2485 } 2604 }
2486 2605
2487 1 2606 1
2488} 2607}
2489 2608
2609sub reload_regions {
2610 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n";
2612}
2613
2490sub reload_facedata { 2614sub reload_facedata {
2491 load_facedata sprintf "%s/facedata", cf::datadir 2615 load_facedata "$DATADIR/facedata"
2492 or die "unable to load facedata\n"; 2616 or die "unable to load facedata\n";
2493} 2617}
2494 2618
2495sub reload_regions {
2496 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2497 or die "unable to load regions file\n";
2498}
2499
2500sub reload_archetypes { 2619sub reload_archetypes {
2501 load_resource_file sprintf "%s/archetypes", cf::datadir 2620 load_resource_file "$DATADIR/archetypes"
2502 or die "unable to load archetypes\n"; 2621 or die "unable to load archetypes\n";
2503} 2622}
2504 2623
2505sub reload_treasures { 2624sub reload_treasures {
2506 load_resource_file sprintf "%s/treasures", cf::datadir 2625 load_resource_file "$DATADIR/treasures"
2507 or die "unable to load treasurelists\n"; 2626 or die "unable to load treasurelists\n";
2508} 2627}
2509 2628
2510sub reload_resources { 2629sub reload_resources {
2511 warn "reloading resource files...\n"; 2630 warn "reloading resource files...\n";
2512 2631
2513 reload_regions; 2632 reload_regions;
2514 reload_facedata; 2633 reload_facedata;
2634 #reload_archetypes;#d#
2515 reload_archetypes; 2635 reload_archetypes;
2516 reload_treasures; 2636 reload_treasures;
2517 2637
2518 warn "finished reloading resource files\n"; 2638 warn "finished reloading resource files\n";
2519} 2639}
… …
2521sub init { 2641sub init {
2522 reload_resources; 2642 reload_resources;
2523} 2643}
2524 2644
2525sub cfg_load { 2645sub cfg_load {
2526 open my $fh, "<:utf8", cf::confdir . "/config" 2646 open my $fh, "<:utf8", "$CONFDIR/config"
2527 or return; 2647 or return;
2528 2648
2529 local $/; 2649 local $/;
2530 *CFG = YAML::Syck::Load <$fh>; 2650 *CFG = YAML::Syck::Load <$fh>;
2531 2651
… …
2789 my $signal = new Coro::Signal; 2909 my $signal = new Coro::Signal;
2790 push @WAIT_FOR_TICK_BEGIN, $signal; 2910 push @WAIT_FOR_TICK_BEGIN, $signal;
2791 $signal->wait; 2911 $signal->wait;
2792} 2912}
2793 2913
2914 my $min = 1e6;#d#
2915 my $avg = 10;
2794$TICK_WATCHER = Event->timer ( 2916$TICK_WATCHER = Event->timer (
2795 reentrant => 0, 2917 reentrant => 0,
2796 parked => 1, 2918 parked => 1,
2797 prio => 0, 2919 prio => 0,
2798 at => $NEXT_TICK || $TICK, 2920 at => $NEXT_TICK || $TICK,
… …
2802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2803 unless ++$bug_warning > 10; 2925 unless ++$bug_warning > 10;
2804 return; 2926 return;
2805 } 2927 }
2806 2928
2807 $NOW = Event::time; 2929 $NOW = $tick_start = Event::time;
2808 2930
2809 cf::server_tick; # one server iteration 2931 cf::server_tick; # one server iteration
2932
2933 0 && sync_job {#d#
2934 for(1..10) {
2935 my $t = Event::time;
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2937 or die;
2938
2939 $map->width (50);
2940 $map->height (50);
2941 $map->alloc;
2942 $map->_load_objects ("/tmp/x.map", 1);
2943 my $t = Event::time - $t;
2944
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 };
2810 2955
2811 $RUNTIME += $TICK; 2956 $RUNTIME += $TICK;
2812 $NEXT_TICK += $TICK; 2957 $NEXT_TICK += $TICK;
2813 2958
2814 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2820 } 2965 }
2821 2966
2822# my $AFTER = Event::time; 2967# my $AFTER = Event::time;
2823# warn $AFTER - $NOW;#d# 2968# warn $AFTER - $NOW;#d#
2824 2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send;
2972 }
2973 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send;
2975 }
2976
2977 $NOW = Event::time;
2978
2825 # if we are delayed by four ticks or more, skip them all 2979 # if we are delayed by four ticks or more, skip them all
2826 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2827 2981
2828 $TICK_WATCHER->at ($NEXT_TICK); 2982 $TICK_WATCHER->at ($NEXT_TICK);
2829 $TICK_WATCHER->start; 2983 $TICK_WATCHER->start;
2830 2984
2831 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2985 $LOAD = ($NOW - $tick_start) / $TICK;
2832 $sig->send; 2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2833 }
2834 while (my $sig = shift @WAIT_FOR_TICK) {
2835 $sig->send;
2836 }
2837 2987
2838 _post_tick; 2988 _post_tick;
2989
2990
2839 }, 2991 },
2840); 2992);
2841 2993
2842{ 2994{
2843 BDB::max_poll_time $TICK * 0.1; 2995 BDB::max_poll_time $TICK * 0.1;
… …
2871 3023
2872 cf::sync_job { 3024 cf::sync_job {
2873 eval { 3025 eval {
2874 BDB::db_env_open 3026 BDB::db_env_open
2875 $DB_ENV, 3027 $DB_ENV,
2876 $BDB_ENV_DIR, 3028 $BDBDIR,
2877 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2878 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2879 0666; 3031 0666;
2880 3032
2881 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2882 3034
2883 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2884 $DB_ENV->set_lk_detect; 3036 $DB_ENV->set_lk_detect;
2885 }; 3037 };
2886 3038
… …
2902 prio => 6, 3054 prio => 6,
2903 cb => \&IO::AIO::poll_cb, 3055 cb => \&IO::AIO::poll_cb,
2904 ); 3056 );
2905} 3057}
2906 3058
3059my $_log_backtrace;
3060
3061sub _log_backtrace {
3062 my ($msg, @addr) = @_;
3063
3064 $msg =~ s/\n//;
3065
3066 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) {
3068 ++$_log_backtrace;
3069 async {
3070 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3074 or die "addr2line: $!";
3075
3076 my @funcs;
3077 my @res = <$fh>;
3078 chomp for @res;
3079 while (@res) {
3080 my ($func, $line) = splice @res, 0, 2, ();
3081 push @funcs, "[$func] $line";
3082 }
3083
3084 @funcs
3085 };
3086
3087 LOG llevInfo, "[ABT] $msg\n";
3088 LOG llevInfo, "[ABT] $_\n" for @bt;
3089 --$_log_backtrace;
3090 };
3091 } else {
3092 LOG llevInfo, "[ABT] $msg\n";
3093 LOG llevInfo, "[ABT] [suppressed]\n";
3094 }
3095}
3096
2907# load additional modules 3097# load additional modules
2908use cf::pod; 3098use cf::pod;
2909 3099
2910END { cf::emergency_save } 3100END { cf::emergency_save }
2911 3101

Diff Legend

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