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.237 by root, Fri Apr 13 05:08:51 2007 UTC vs.
Revision 1.279 by root, Mon Jun 11 22:16:53 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
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;
… …
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";
58 59
59our $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(!)
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
63our $NEXT_TICK; 76our $NEXT_TICK;
64our $NOW; 77our $NOW;
… …
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
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83 91
84# 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 ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 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
87binmode STDOUT; 99binmode STDOUT;
88binmode STDERR; 100binmode STDERR;
89 101
90# read virtual server time, if available 102# read virtual server time, if available
91unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
92 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
93 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
94 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
95} 107}
96 108
97mkdir cf::localdir; 109mkdir $_
98mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99mkdir cf::localdir . "/" . cf::tmpdir;
100mkdir cf::localdir . "/" . cf::uniquedir;
101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
103 111
104our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
105 113
106sub cf::map::normalise; 114sub cf::map::normalise;
107 115
… …
118=item $cf::RUNTIME 126=item $cf::RUNTIME
119 127
120The 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
121every server tick. 129every server tick.
122 130
123=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
124 134
125The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
126be 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.
127 139
128=item $cf::NOW 140=item $cf::NOW
129 141
130The time of the last (current) server tick. 142The time of the last (current) server tick.
131 143
132=item $cf::TICK 144=item $cf::TICK
133 145
134The 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.
135 157
136=item %cf::CFG 158=item %cf::CFG
137 159
138Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 161from wherever your confdir points to.
140 162
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
142 164
143These 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
144or 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
145processing 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.
146window of cpu time available, or simply to synchronise to the server tick.
147 168
148=back 169=back
149 170
150=cut 171=cut
151 172
152BEGIN { 173BEGIN {
153 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 175 my $msg = join "", @_;
155 utf8::encode $msg;
156 176
157 $msg .= "\n" 177 $msg .= "\n"
158 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
159 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
160 LOG llevError, $msg; 183 LOG llevError, $msg;
161 }; 184 };
162} 185}
163 186
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) {
… …
1159 my ($self, $type, %msg) = @_; 1240 my ($self, $type, %msg) = @_;
1160 1241
1161 $self->ns->ext_event ($type, %msg); 1242 $self->ns->ext_event ($type, %msg);
1162} 1243}
1163 1244
1164package cf; 1245=head3 cf::region
1246
1247=over 4
1248
1249=cut
1250
1251package cf::region;
1252
1253=item cf::region::find_by_path $path
1254
1255Tries to decuce the probable region for a map knowing only its path.
1256
1257=cut
1258
1259sub find_by_path($) {
1260 my ($path) = @_;
1261
1262 my ($match, $specificity);
1263
1264 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) {
1266 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity;
1268 }
1269 }
1270
1271 $match
1272}
1165 1273
1166=back 1274=back
1167
1168 1275
1169=head3 cf::map 1276=head3 cf::map
1170 1277
1171=over 4 1278=over 4
1172 1279
… …
1227 my ($self, $merge) = @_; 1334 my ($self, $merge) = @_;
1228 1335
1229 # we have to keep some variables in memory intact 1336 # we have to keep some variables in memory intact
1230 local $self->{path}; 1337 local $self->{path};
1231 local $self->{load_path}; 1338 local $self->{load_path};
1232 local $self->{deny_save};
1233 local $self->{deny_reset};
1234 1339
1235 $self->SUPER::thawer_merge ($merge); 1340 $self->SUPER::thawer_merge ($merge);
1236} 1341}
1237 1342
1238sub normalise { 1343sub normalise {
… …
1310 1415
1311# the original (read-only) location 1416# the original (read-only) location
1312sub load_path { 1417sub load_path {
1313 my ($self) = @_; 1418 my ($self) = @_;
1314 1419
1315 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1420 "$MAPDIR/$self->{path}.map"
1316} 1421}
1317 1422
1318# the temporary/swap location 1423# the temporary/swap location
1319sub save_path { 1424sub save_path {
1320 my ($self) = @_; 1425 my ($self) = @_;
1321 1426
1322 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1323 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1428 "$TMPDIR/$path.map"
1324} 1429}
1325 1430
1326# the unique path, undef == no special unique path 1431# the unique path, undef == no special unique path
1327sub uniq_path { 1432sub uniq_path {
1328 my ($self) = @_; 1433 my ($self) = @_;
1329 1434
1330 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1331 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1436 "$UNIQUEDIR/$path"
1332} 1437}
1333 1438
1334# and all this just because we cannot iterate over 1439# and all this just because we cannot iterate over
1335# all maps in C++... 1440# all maps in C++...
1336sub change_all_map_light { 1441sub change_all_map_light {
1337 my ($change) = @_; 1442 my ($change) = @_;
1338 1443
1339 $_->change_map_light ($change) 1444 $_->change_map_light ($change)
1340 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;
1341} 1454}
1342 1455
1343sub unlink_save { 1456sub unlink_save {
1344 my ($self) = @_; 1457 my ($self) = @_;
1345 1458
… …
1403 $self->load_header_orig 1516 $self->load_header_orig
1404 or return; 1517 or return;
1405 $self->prepare_orig; 1518 $self->prepare_orig;
1406 } 1519 }
1407 1520
1521 $self->{deny_reset} = 1
1522 if $self->no_reset;
1523
1524 $self->default_region (cf::region::find_by_path $self->{path})
1525 unless $self->default_region;
1526
1408 1 1527 1
1409} 1528}
1410 1529
1411sub find; 1530sub find;
1412sub find { 1531sub find {
… …
1424 $map->{last_save} = $cf::RUNTIME; 1543 $map->{last_save} = $cf::RUNTIME;
1425 1544
1426 $map->load_header 1545 $map->load_header
1427 or return; 1546 or return;
1428 1547
1429 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1430 # doing this can freeze the server in a sync job, obviously 1549 # doing this can freeze the server in a sync job, obviously
1431 #$cf::WAIT_FOR_TICK->wait; 1550 #$cf::WAIT_FOR_TICK->wait;
1432 $map->reset; 1551 $map->reset;
1433 undef $guard; 1552 undef $guard;
1434 return find $path; 1553 return find $path;
… …
1445 my ($self) = @_; 1564 my ($self) = @_;
1446 1565
1447 local $self->{deny_reset} = 1; # loading can take a long time 1566 local $self->{deny_reset} = 1; # loading can take a long time
1448 1567
1449 my $path = $self->{path}; 1568 my $path = $self->{path};
1569
1570 {
1450 my $guard = cf::lock_acquire "map_load:$path"; 1571 my $guard = cf::lock_acquire "map_load:$path";
1451 1572
1452 return if $self->in_memory != cf::MAP_SWAPPED; 1573 return if $self->in_memory != cf::MAP_SWAPPED;
1453 1574
1454 $self->in_memory (cf::MAP_LOADING); 1575 $self->in_memory (cf::MAP_LOADING);
1455 1576
1456 $self->alloc; 1577 $self->alloc;
1457 1578
1458 $self->pre_load; 1579 $self->pre_load;
1459
1460 $self->_load_objects ($self->{load_path}, 1)
1461 or return;
1462
1463 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1464 if delete $self->{load_original};
1465
1466 if (my $uniq = $self->uniq_path) {
1467 utf8::encode $uniq;
1468 if (aio_open $uniq, O_RDONLY, 0) {
1469 $self->clear_unique_items;
1470 $self->_load_objects ($uniq, 0);
1471 }
1472 }
1473
1474 Coro::cede;
1475
1476 # now do the right thing for maps
1477 $self->link_multipart_objects;
1478
1479 unless ($self->{deny_activate}) {
1480 $self->decay_objects;
1481 $self->fix_auto_apply;
1482 $self->update_buttons;
1483 Coro::cede; 1580 Coro::cede;
1484 $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;
1485 $self->difficulty ($self->estimate_difficulty) 1599 $self->difficulty ($self->estimate_difficulty)
1486 unless $self->difficulty; 1600 unless $self->difficulty;
1487 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;
1488 $self->activate; 1610 $self->activate;
1611 }
1612
1613 $self->in_memory (cf::MAP_IN_MEMORY);
1489 } 1614 }
1490 1615
1491 $self->post_load; 1616 $self->post_load;
1492
1493 $self->in_memory (cf::MAP_IN_MEMORY);
1494} 1617}
1495 1618
1496sub customise_for { 1619sub customise_for {
1497 my ($self, $ob) = @_; 1620 my ($self, $ob) = @_;
1498 1621
1499 return find "~" . $ob->name . "/" . $self->{path} 1622 return find "~" . $ob->name . "/" . $self->{path}
1500 if $self->per_player; 1623 if $self->per_player;
1624
1625# return find "?party/" . $ob->name . "/" . $self->{path}
1626# if $self->per_party;
1501 1627
1502 $self 1628 $self
1503} 1629}
1504 1630
1505# 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
… …
1616 1742
1617sub reset_at { 1743sub reset_at {
1618 my ($self) = @_; 1744 my ($self) = @_;
1619 1745
1620 # TODO: safety, remove and allow resettable per-player maps 1746 # TODO: safety, remove and allow resettable per-player maps
1621 return 1e99 if $self->isa ("ext::map_per_player");#d#
1622 return 1e99 if $self->{deny_reset}; 1747 return 1e99 if $self->{deny_reset};
1623 1748
1624 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1749 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1625 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;
1626 1751
… …
1637 my ($self) = @_; 1762 my ($self) = @_;
1638 1763
1639 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1764 my $lock = cf::lock_acquire "map_data:$self->{path}";
1640 1765
1641 return if $self->players; 1766 return if $self->players;
1642 return if $self->isa ("ext::map_per_player");#d#
1643 1767
1644 warn "resetting map ", $self->path;#d# 1768 warn "resetting map ", $self->path;
1645 1769
1646 $self->in_memory (cf::MAP_SWAPPED); 1770 $self->in_memory (cf::MAP_SWAPPED);
1647 1771
1648 # need to save uniques path 1772 # need to save uniques path
1649 unless ($self->{deny_save}) { 1773 unless ($self->{deny_save}) {
… …
1681 $cf::MAP{$self->path} = $self; 1805 $cf::MAP{$self->path} = $self;
1682 1806
1683 $self->reset; # polite request, might not happen 1807 $self->reset; # polite request, might not happen
1684} 1808}
1685 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
1686=item cf::map::unique_maps 1846=item cf::map::unique_maps
1687 1847
1688Returns an arrayref of paths of all shared maps that have 1848Returns an arrayref of paths of all shared maps that have
1689instantiated unique items. May block. 1849instantiated unique items. May block.
1690 1850
1691=cut 1851=cut
1692 1852
1693sub unique_maps() { 1853sub unique_maps() {
1694 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1854 [
1695 or return; 1855 map {
1696
1697 my @paths;
1698
1699 for (@$files) {
1700 utf8::decode $_; 1856 utf8::decode $_;
1701 next if /\.pst$/; 1857 /\.map$/
1702 next unless /^$PATH_SEP/o; 1858 ? normalise $_
1703 1859 : ()
1704 push @paths, cf::map::normalise $_; 1860 } @{ aio_readdir $UNIQUEDIR or [] }
1705 } 1861 ]
1706
1707 \@paths
1708} 1862}
1709 1863
1710package cf; 1864package cf;
1711 1865
1712=back 1866=back
… …
1818 $self->deactivate_recursive; 1972 $self->deactivate_recursive;
1819 1973
1820 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1974 return if UNIVERSAL::isa $self->map, "ext::map_link";
1821 1975
1822 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1976 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1823 if $self->map; 1977 if $self->map && $self->map->{path} ne "{link}";
1824 1978
1825 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1979 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1826} 1980}
1827 1981
1828sub cf::object::player::leave_link { 1982sub cf::object::player::leave_link {
1829 my ($self, $map, $x, $y) = @_; 1983 my ($self, $map, $x, $y) = @_;
1984
1985 return unless $self->contr->active;
1830 1986
1831 my $link_pos = delete $self->{_link_pos}; 1987 my $link_pos = delete $self->{_link_pos};
1832 1988
1833 unless ($map) { 1989 unless ($map) {
1834 # restore original map position 1990 # restore original map position
… …
1857 2013
1858 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1859 $self->enter_map ($map, $x, $y); 2015 $self->enter_map ($map, $x, $y);
1860} 2016}
1861 2017
1862cf::player->attach (
1863 on_logout => sub {
1864 my ($pl) = @_;
1865
1866 # abort map switching before logout
1867 if ($pl->ob->{_link_pos}) {
1868 cf::sync_job {
1869 $pl->ob->leave_link
1870 };
1871 }
1872 },
1873 on_login => sub {
1874 my ($pl) = @_;
1875
1876 # try to abort aborted map switching on player login :)
1877 # should happen only on crashes
1878 if ($pl->ob->{_link_pos}) {
1879 $pl->ob->enter_link;
1880 (async {
1881 $pl->ob->reply (undef,
1882 "There was an internal problem at your last logout, "
1883 . "the server will try to bring you to your intended destination in a second.",
1884 cf::NDI_RED);
1885 # we need this sleep as the login has a concurrent enter_exit running
1886 # and this sleep increases chances of the player not ending up in scorn
1887 Coro::Timer::sleep 1;
1888 $pl->ob->leave_link;
1889 })->prio (2);
1890 }
1891 },
1892);
1893
1894=item $player_object->goto ($path, $x, $y) 2018=item $player_object->goto ($path, $x, $y[, $check->($map)])
1895 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
1896=cut 2025=cut
2026
2027our $GOTOGEN;
1897 2028
1898sub cf::object::player::goto { 2029sub cf::object::player::goto {
1899 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;
1900 2034
1901 $self->enter_link; 2035 $self->enter_link;
1902 2036
1903 (async { 2037 (async {
1904 my $map = eval { 2038 my $map = eval {
1905 my $map = cf::map::find $path; 2039 my $map = cf::map::find $path;
2040
2041 if ($map) {
1906 $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
1907 $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 $@;
1908 } or 2054 }
1909 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1910 2055
2056 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation};
1911 $self->leave_link ($map, $x, $y); 2058 $self->leave_link ($map, $x, $y);
2059 }
1912 })->prio (1); 2060 })->prio (1);
1913} 2061}
1914 2062
1915=item $player_object->enter_exit ($exit_object) 2063=item $player_object->enter_exit ($exit_object)
1916 2064
… …
1955 2103
1956 $rmp->{random_seed} ||= $exit->random_seed; 2104 $rmp->{random_seed} ||= $exit->random_seed;
1957 2105
1958 my $data = cf::to_json $rmp; 2106 my $data = cf::to_json $rmp;
1959 my $md5 = Digest::MD5::md5_hex $data; 2107 my $md5 = Digest::MD5::md5_hex $data;
1960 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2108 my $meta = "$RANDOMDIR/$md5.meta";
1961 2109
1962 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1963 aio_write $fh, 0, (length $data), $data, 0; 2111 aio_write $fh, 0, (length $data), $data, 0;
1964 undef $fh; 2112 undef $fh;
1965 aio_rename "$meta~", $meta; 2113 aio_rename "$meta~", $meta;
… …
2234############################################################################# 2382#############################################################################
2235 2383
2236=head2 EXTENSION DATABASE SUPPORT 2384=head2 EXTENSION DATABASE SUPPORT
2237 2385
2238Crossfire maintains a very simple database for extension use. It can 2386Crossfire maintains a very simple database for extension use. It can
2239currently store anything that can be serialised using Storable, which 2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2240excludes objects. 2388convert to/from binary).
2241 2389
2242The parameter C<$family> should best start with the name of the extension 2390The parameter C<$family> should best start with the name of the extension
2243using it, it should be unique. 2391using it, it should be unique.
2244 2392
2245=over 4 2393=over 4
… …
2268 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2269 cf::cleanup "db_open(db): $!" if $!; 2417 cf::cleanup "db_open(db): $!" if $!;
2270 }; 2418 };
2271 cf::cleanup "db_open(db): $@" if $@; 2419 cf::cleanup "db_open(db): $@" if $@;
2272 }; 2420 };
2273
2274 my $path = cf::localdir . "/database.pst";
2275 if (stat $path) {
2276 cf::sync_job {
2277 my $pst = Storable::retrieve $path;
2278
2279 cf::db_put (board => data => $pst->{board});
2280 cf::db_put (guildrules => data => $pst->{guildrules});
2281 cf::db_put (rent => balance => $pst->{rent}{balance});
2282 BDB::db_env_txn_checkpoint $DB_ENV;
2283
2284 unlink $path;
2285 };
2286 }
2287 } 2421 }
2288} 2422}
2289 2423
2290sub db_get($$) { 2424sub db_get($$) {
2291 my $key = "$_[0]/$_[1]"; 2425 my $key = "$_[0]/$_[1]";
2292 2426
2293 cf::sync_job { 2427 cf::sync_job {
2294 BDB::db_get $DB, undef, $key, my $data; 2428 BDB::db_get $DB, undef, $key, my $data;
2295 2429
2296 $! ? () 2430 $! ? ()
2297 : Compress::LZF::sthaw $data 2431 : $data
2298 } 2432 }
2299} 2433}
2300 2434
2301sub db_put($$$) { 2435sub db_put($$$) {
2302 BDB::dbreq_pri 4; 2436 BDB::dbreq_pri 4;
2303 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438}
2439
2440=item cf::cache $id => [$paths...], $processversion => $process
2441
2442Generic caching function that returns the value of the resource $id,
2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2472 }
2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2304} 2552}
2305 2553
2306############################################################################# 2554#############################################################################
2307# the server's init and main functions 2555# the server's init and main functions
2308 2556
2309sub load_facedata { 2557sub load_facedata($) {
2310 my $path = sprintf "%s/facedata", cf::datadir; 2558 my ($path) = @_;
2311 2559
2312 warn "loading facedata from $path\n"; 2560 warn "loading facedata from $path\n";
2313 2561
2314 my $facedata; 2562 my $facedata;
2315 0 < aio_load $path, $facedata 2563 0 < aio_load $path, $facedata
… …
2356 } 2604 }
2357 2605
2358 1 2606 1
2359} 2607}
2360 2608
2609sub reload_regions {
2610 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n";
2612}
2613
2614sub reload_facedata {
2615 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n";
2617}
2618
2619sub reload_archetypes {
2620 load_resource_file "$DATADIR/archetypes"
2621 or die "unable to load archetypes\n";
2622}
2623
2624sub reload_treasures {
2625 load_resource_file "$DATADIR/treasures"
2626 or die "unable to load treasurelists\n";
2627}
2628
2361sub reload_resources { 2629sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2630 warn "reloading resource files...\n";
2363 or die "unable to load regions file\n";#d# 2631
2632 reload_regions;
2364 load_facedata 2633 reload_facedata;
2365 or die "unable to load facedata\n";#d# 2634 #reload_archetypes;#d#
2635 reload_archetypes;
2636 reload_treasures;
2637
2638 warn "finished reloading resource files\n";
2366} 2639}
2367 2640
2368sub init { 2641sub init {
2369 reload_resources; 2642 reload_resources;
2370} 2643}
2371 2644
2372sub cfg_load { 2645sub cfg_load {
2373 open my $fh, "<:utf8", cf::confdir . "/config" 2646 open my $fh, "<:utf8", "$CONFDIR/config"
2374 or return; 2647 or return;
2375 2648
2376 local $/; 2649 local $/;
2377 *CFG = YAML::Syck::Load <$fh>; 2650 *CFG = YAML::Syck::Load <$fh>;
2378 2651
… …
2463 2736
2464 warn Carp::longmess "post_cleanup backtrace" 2737 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core; 2738 if $make_core;
2466} 2739}
2467 2740
2468sub reload() { 2741sub do_reload_perl() {
2469 # can/must only be called in main 2742 # can/must only be called in main
2470 if ($Coro::current != $Coro::main) { 2743 if ($Coro::current != $Coro::main) {
2471 warn "can only reload from main coroutine"; 2744 warn "can only reload from main coroutine";
2472 return; 2745 return;
2473 } 2746 }
… …
2548 Symbol::delete_package "safe::$_" 2821 Symbol::delete_package "safe::$_"
2549 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2822 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2550 2823
2551 warn "unloading cf.pm \"a bit\""; 2824 warn "unloading cf.pm \"a bit\"";
2552 delete $INC{"cf.pm"}; 2825 delete $INC{"cf.pm"};
2826 delete $INC{"cf/pod.pm"};
2553 2827
2554 # don't, removes xs symbols, too, 2828 # don't, removes xs symbols, too,
2555 # and global variables created in xs 2829 # and global variables created in xs
2556 #Symbol::delete_package __PACKAGE__; 2830 #Symbol::delete_package __PACKAGE__;
2557 2831
… …
2572 warn "reattaching attachments to maps"; 2846 warn "reattaching attachments to maps";
2573 reattach $_ for values %MAP; 2847 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players"; 2848 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER; 2849 reattach $_ for values %PLAYER;
2576 2850
2577 warn "loading reloadable resources";
2578 reload_resources;
2579
2580 warn "leaving sync_job"; 2851 warn "leaving sync_job";
2581 2852
2582 1 2853 1
2583 } or do { 2854 } or do {
2584 warn $@; 2855 warn $@;
… …
2589 warn "reloaded"; 2860 warn "reloaded";
2590}; 2861};
2591 2862
2592our $RELOAD_WATCHER; # used only during reload 2863our $RELOAD_WATCHER; # used only during reload
2593 2864
2865sub reload_perl() {
2866 # doing reload synchronously and two reloads happen back-to-back,
2867 # coro crashes during coro_state_free->destroy here.
2868
2869 $RELOAD_WATCHER ||= Event->timer (
2870 reentrant => 0,
2871 after => 0,
2872 data => WF_AUTOCANCEL,
2873 cb => sub {
2874 do_reload_perl;
2875 undef $RELOAD_WATCHER;
2876 },
2877 );
2878}
2879
2594register_command "reload" => sub { 2880register_command "reload" => sub {
2595 my ($who, $arg) = @_; 2881 my ($who, $arg) = @_;
2596 2882
2597 if ($who->flag (FLAG_WIZ)) { 2883 if ($who->flag (FLAG_WIZ)) {
2598 $who->message ("reloading server."); 2884 $who->message ("reloading server.");
2599 2885 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 } 2886 }
2613}; 2887};
2614 2888
2615unshift @INC, $LIBDIR; 2889unshift @INC, $LIBDIR;
2616 2890
2617my $bug_warning = 0; 2891my $bug_warning = 0;
2618 2892
2893our @WAIT_FOR_TICK;
2894our @WAIT_FOR_TICK_BEGIN;
2895
2896sub wait_for_tick {
2897 return unless $TICK_WATCHER->is_active;
2898 return if $Coro::current == $Coro::main;
2899
2900 my $signal = new Coro::Signal;
2901 push @WAIT_FOR_TICK, $signal;
2902 $signal->wait;
2903}
2904
2905sub wait_for_tick_begin {
2906 return unless $TICK_WATCHER->is_active;
2907 return if $Coro::current == $Coro::main;
2908
2909 my $signal = new Coro::Signal;
2910 push @WAIT_FOR_TICK_BEGIN, $signal;
2911 $signal->wait;
2912}
2913
2914 my $min = 1e6;#d#
2915 my $avg = 10;
2619$TICK_WATCHER = Event->timer ( 2916$TICK_WATCHER = Event->timer (
2620 reentrant => 0, 2917 reentrant => 0,
2621 parked => 1, 2918 parked => 1,
2622 prio => 0, 2919 prio => 0,
2623 at => $NEXT_TICK || $TICK, 2920 at => $NEXT_TICK || $TICK,
… …
2627 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"
2628 unless ++$bug_warning > 10; 2925 unless ++$bug_warning > 10;
2629 return; 2926 return;
2630 } 2927 }
2631 2928
2632 $NOW = Event::time; 2929 $NOW = $tick_start = Event::time;
2633 2930
2634 cf::server_tick; # one server iteration 2931 cf::server_tick; # one server iteration
2932
2933 0 && sync_job {#d#
2934 for(1..10) {
2935 my $t = Event::time;
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2937 or die;
2938
2939 $map->width (50);
2940 $map->height (50);
2941 $map->alloc;
2942 $map->_load_objects ("/tmp/x.map", 1);
2943 my $t = Event::time - $t;
2944
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 };
2955
2635 $RUNTIME += $TICK; 2956 $RUNTIME += $TICK;
2636 $NEXT_TICK += $TICK; 2957 $NEXT_TICK += $TICK;
2637 2958
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10; 2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2641 write_runtime 2962 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!"; 2963 or warn "ERROR: unable to write runtime file: $!";
2643 }; 2964 };
2644 } 2965 }
2645 2966
2646 $WAIT_FOR_TICK->broadcast;
2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time; 2967# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d# 2968# warn $AFTER - $NOW;#d#
2651 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
2652 # 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
2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2654 2981
2655 $TICK_WATCHER->at ($NEXT_TICK); 2982 $TICK_WATCHER->at ($NEXT_TICK);
2656 $TICK_WATCHER->start; 2983 $TICK_WATCHER->start;
2984
2985 $LOAD = ($NOW - $tick_start) / $TICK;
2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2987
2988 _post_tick;
2989
2990
2657 }, 2991 },
2658); 2992);
2659 2993
2660{ 2994{
2661 BDB::max_poll_time $TICK * 0.1; 2995 BDB::max_poll_time $TICK * 0.1;
… …
2689 3023
2690 cf::sync_job { 3024 cf::sync_job {
2691 eval { 3025 eval {
2692 BDB::db_env_open 3026 BDB::db_env_open
2693 $DB_ENV, 3027 $DB_ENV,
2694 $BDB_ENV_DIR, 3028 $BDBDIR,
2695 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
2696 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2697 0666; 3031 0666;
2698 3032
2699 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2700 3034
2701 $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);
2702 $DB_ENV->set_lk_detect; 3036 $DB_ENV->set_lk_detect;
2703 }; 3037 };
2704 3038
… …
2720 prio => 6, 3054 prio => 6,
2721 cb => \&IO::AIO::poll_cb, 3055 cb => \&IO::AIO::poll_cb,
2722 ); 3056 );
2723} 3057}
2724 3058
3059my $_log_backtrace;
3060
3061sub _log_backtrace {
3062 my ($msg, @addr) = @_;
3063
3064 $msg =~ s/\n//;
3065
3066 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) {
3068 ++$_log_backtrace;
3069 async {
3070 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3074 or die "addr2line: $!";
3075
3076 my @funcs;
3077 my @res = <$fh>;
3078 chomp for @res;
3079 while (@res) {
3080 my ($func, $line) = splice @res, 0, 2, ();
3081 push @funcs, "[$func] $line";
3082 }
3083
3084 @funcs
3085 };
3086
3087 LOG llevInfo, "[ABT] $msg\n";
3088 LOG llevInfo, "[ABT] $_\n" for @bt;
3089 --$_log_backtrace;
3090 };
3091 } else {
3092 LOG llevInfo, "[ABT] $msg\n";
3093 LOG llevInfo, "[ABT] [suppressed]\n";
3094 }
3095}
3096
3097# load additional modules
3098use cf::pod;
3099
2725END { cf::emergency_save } 3100END { cf::emergency_save }
2726 3101
27271 31021
2728 3103

Diff Legend

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