ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.232 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.275 by root, Thu Jun 7 19:12:22 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
21 24
22use BDB (); 25use BDB ();
23use Data::Dumper; 26use Data::Dumper;
24use Digest::MD5; 27use Digest::MD5;
25use Fcntl; 28use Fcntl;
… …
28use Time::HiRes; 31use Time::HiRes;
29use Compress::LZF; 32use Compress::LZF;
30 33
31# configure various modules to our taste 34# configure various modules to our taste
32# 35#
36$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 39
36$Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
37 41
… …
50our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
52 56
53our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
54our @EVENT; 58our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 59
57our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58our $TICK_WATCHER; 73our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 76our $NEXT_TICK;
62our $NOW; 77our $NOW;
… …
71our $RUNTIME; 86our $RUNTIME;
72 87
73our %PLAYER; # all users 88our %PLAYER; # all users
74our %MAP; # all maps 89our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 91
82# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
85binmode STDOUT; 99binmode STDOUT;
86binmode STDERR; 100binmode STDERR;
87 101
88# read virtual server time, if available 102# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
93} 107}
94 108
95mkdir cf::localdir; 109mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 111
102our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
103 113
104sub cf::map::normalise; 114sub cf::map::normalise;
105 115
… …
116=item $cf::RUNTIME 126=item $cf::RUNTIME
117 127
118The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
119every server tick. 129every server tick.
120 130
121=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
122 134
123The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
124be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
125 139
126=item $cf::NOW 140=item $cf::NOW
127 141
128The time of the last (current) server tick. 142The time of the last (current) server tick.
129 143
130=item $cf::TICK 144=item $cf::TICK
131 145
132The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
133 157
134=item %cf::CFG 158=item %cf::CFG
135 159
136Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 161from wherever your confdir points to.
138 162
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
140 164
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
143processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144window of cpu time available, or simply to synchronise to the server tick.
145 168
146=back 169=back
147 170
148=cut 171=cut
149 172
150BEGIN { 173BEGIN {
151 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 175 my $msg = join "", @_;
153 utf8::encode $msg;
154 176
155 $msg .= "\n" 177 $msg .= "\n"
156 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
157 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
158 LOG llevError, $msg; 183 LOG llevError, $msg;
159 }; 184 };
160} 185}
161 186
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
167@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
168 194
169# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
170# within the Safe compartment. 196# within the Safe compartment.
171for my $pkg (qw( 197for my $pkg (qw(
172 cf::global cf::attachable 198 cf::global cf::attachable
… …
232returned. 258returned.
233 259
234Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
236 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
237=cut 267=cut
238 268
239our %LOCK; 269our %LOCK;
240 270
241sub lock_wait($) { 271sub lock_wait($) {
… …
258 288
259 Coro::guard { 289 Coro::guard {
260 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
262 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
263} 299}
264 300
265sub freeze_mainloop { 301sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
267 303
… …
297 333
298sub sync_job(&) { 334sub sync_job(&) {
299 my ($job) = @_; 335 my ($job) = @_;
300 336
301 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
302 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
304 342
305 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
317 355
318 while ($busy) { 356 while ($busy) {
319 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
320 } 358 }
321 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
322 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
323 } else { 368 } else {
324 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
325 370
326 $job->() 371 $job->()
… …
346 391
347 $coro 392 $coro
348} 393}
349 394
350sub write_runtime { 395sub write_runtime {
396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
351 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
352
353 my $runtime = cf::localdir . "/runtime";
354 404
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
356 or return; 406 or return;
357 407
358 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
364 414
365 # always fsync - this file is important 415 # always fsync - this file is important
366 aio_fsync $fh 416 aio_fsync $fh
367 and return; 417 and return;
368 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
369 close $fh 422 close $fh
370 or return; 423 or return;
371 424
372 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
373 and return; 426 and return;
427
428 warn "runtime file written.\n";
374 429
375 1 430 1
376} 431}
377 432
378=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
571 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
572 627
573 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 632
578 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 634 my $pkg = shift @arg;
580 635
581 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
622 if (ref $_[0]) { 677 if (ref $_[0]) {
623 _object_attach @_; 678 _object_attach @_;
624 } else { 679 } else {
625 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
626 } 681 }
682 _recalc_want;
627}; 683};
628 684
629# all those should be optimised 685# all those should be optimised
630sub cf::attachable::detach { 686sub cf::attachable::detach {
631 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
634 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
635 reattach ($obj); 691 reattach ($obj);
636 } else { 692 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
638 } 694 }
695 _recalc_want;
639}; 696};
640 697
641sub cf::attachable::attached { 698sub cf::attachable::attached {
642 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
643 700
… …
816 or return; 873 or return;
817 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
818 } 875 }
819 876
820 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
822 return ($data, $av); 879 return ($data, $av);
823} 880}
824 881
825############################################################################# 882#############################################################################
826# command handling &c 883# command handling &c
… …
953Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
954 1011
955=cut 1012=cut
956 1013
957sub playerdir($) { 1014sub playerdir($) {
958 cf::localdir 1015 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1017}
964 1018
965sub path($) { 1019sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1021
968 (playerdir $login) . "/$login.pl" 1022 (playerdir $login) . "/playerdata"
969} 1023}
970 1024
971sub find_active($) { 1025sub find_active($) {
972 $cf::PLAYER{$_[0]} 1026 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1027 and $cf::PLAYER{$_[0]}->active
… …
986 my $login = $_[0]; 1040 my $login = $_[0];
987 1041
988 my $guard = cf::lock_acquire "user_find:$login"; 1042 my $guard = cf::lock_acquire "user_find:$login";
989 1043
990 $cf::PLAYER{$_[0]} || do { 1044 $cf::PLAYER{$_[0]} || do {
1045 # rename old playerfiles to new ones
1046 #TODO: remove when no longer required
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl";
1051
991 my $pl = load_pl path $login 1052 my $pl = load_pl path $login
992 or return; 1053 or return;
993 $cf::PLAYER{$login} = $pl 1054 $cf::PLAYER{$login} = $pl
994 } 1055 }
995 } 1056 }
… …
1079while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1080 1141
1081=cut 1142=cut
1082 1143
1083sub list_logins { 1144sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1146 or return [];
1086 1147
1087 my @logins; 1148 my @logins;
1088 1149
1089 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
… …
1150 my ($self, $type, %msg) = @_; 1211 my ($self, $type, %msg) = @_;
1151 1212
1152 $self->ns->ext_event ($type, %msg); 1213 $self->ns->ext_event ($type, %msg);
1153} 1214}
1154 1215
1155package cf; 1216=head3 cf::region
1217
1218=over 4
1219
1220=cut
1221
1222package cf::region;
1223
1224=item cf::region::find_by_path $path
1225
1226Tries to decuce the probable region for a map knowing only its path.
1227
1228=cut
1229
1230sub find_by_path($) {
1231 my ($path) = @_;
1232
1233 my ($match, $specificity);
1234
1235 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) {
1237 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity;
1239 }
1240 }
1241
1242 $match
1243}
1156 1244
1157=back 1245=back
1158
1159 1246
1160=head3 cf::map 1247=head3 cf::map
1161 1248
1162=over 4 1249=over 4
1163 1250
… …
1218 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1219 1306
1220 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1221 local $self->{path}; 1308 local $self->{path};
1222 local $self->{load_path}; 1309 local $self->{load_path};
1223 local $self->{deny_save};
1224 local $self->{deny_reset};
1225 1310
1226 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1227} 1312}
1228 1313
1229sub normalise { 1314sub normalise {
… …
1301 1386
1302# the original (read-only) location 1387# the original (read-only) location
1303sub load_path { 1388sub load_path {
1304 my ($self) = @_; 1389 my ($self) = @_;
1305 1390
1306 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1391 "$MAPDIR/$self->{path}.map"
1307} 1392}
1308 1393
1309# the temporary/swap location 1394# the temporary/swap location
1310sub save_path { 1395sub save_path {
1311 my ($self) = @_; 1396 my ($self) = @_;
1312 1397
1313 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1314 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1399 "$TMPDIR/$path.map"
1315} 1400}
1316 1401
1317# the unique path, undef == no special unique path 1402# the unique path, undef == no special unique path
1318sub uniq_path { 1403sub uniq_path {
1319 my ($self) = @_; 1404 my ($self) = @_;
1320 1405
1321 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1322 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1407 "$UNIQUEDIR/$path"
1323} 1408}
1324 1409
1325# and all this just because we cannot iterate over 1410# and all this just because we cannot iterate over
1326# all maps in C++... 1411# all maps in C++...
1327sub change_all_map_light { 1412sub change_all_map_light {
1328 my ($change) = @_; 1413 my ($change) = @_;
1329 1414
1330 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1331 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1417}
1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1332} 1425}
1333 1426
1334sub unlink_save { 1427sub unlink_save {
1335 my ($self) = @_; 1428 my ($self) = @_;
1336 1429
… …
1394 $self->load_header_orig 1487 $self->load_header_orig
1395 or return; 1488 or return;
1396 $self->prepare_orig; 1489 $self->prepare_orig;
1397 } 1490 }
1398 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1495 $self->default_region (cf::region::find_by_path $self->{path})
1496 unless $self->default_region;
1497
1399 1 1498 1
1400} 1499}
1401 1500
1402sub find; 1501sub find;
1403sub find { 1502sub find {
… …
1415 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1416 1515
1417 $map->load_header 1516 $map->load_header
1418 or return; 1517 or return;
1419 1518
1420 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1421 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1422 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1423 $map->reset; 1522 $map->reset;
1424 undef $guard; 1523 undef $guard;
1425 return find $path; 1524 return find $path;
… …
1436 my ($self) = @_; 1535 my ($self) = @_;
1437 1536
1438 local $self->{deny_reset} = 1; # loading can take a long time 1537 local $self->{deny_reset} = 1; # loading can take a long time
1439 1538
1440 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1441 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1442 1543
1443 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1444 1545
1445 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1446 1547
1447 $self->alloc; 1548 $self->alloc;
1448 1549
1449 $self->pre_load; 1550 $self->pre_load;
1450
1451 $self->_load_objects ($self->{load_path}, 1)
1452 or return;
1453
1454 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1455 if delete $self->{load_original};
1456
1457 if (my $uniq = $self->uniq_path) {
1458 utf8::encode $uniq;
1459 if (aio_open $uniq, O_RDONLY, 0) {
1460 $self->clear_unique_items;
1461 $self->_load_objects ($uniq, 0);
1462 }
1463 }
1464
1465 Coro::cede;
1466
1467 # now do the right thing for maps
1468 $self->link_multipart_objects;
1469
1470 unless ($self->{deny_activate}) {
1471 $self->decay_objects;
1472 $self->fix_auto_apply;
1473 $self->update_buttons;
1474 Coro::cede; 1551 Coro::cede;
1475 $self->set_darkness_map; 1552
1553 $self->_load_objects ($self->{load_path}, 1)
1554 or return;
1555
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original};
1558
1559 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) {
1562 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0);
1564 }
1565 }
1566
1567 Coro::cede;
1568 # now do the right thing for maps
1569 $self->link_multipart_objects;
1476 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1477 unless $self->difficulty; 1571 unless $self->difficulty;
1478 Coro::cede; 1572 Coro::cede;
1573
1574 unless ($self->{deny_activate}) {
1575 $self->decay_objects;
1576 $self->fix_auto_apply;
1577 $self->update_buttons;
1578 Coro::cede;
1579 $self->set_darkness_map;
1580 Coro::cede;
1479 $self->activate; 1581 $self->activate;
1582 }
1583
1584 $self->in_memory (cf::MAP_IN_MEMORY);
1480 } 1585 }
1481 1586
1482 $self->post_load; 1587 $self->post_load;
1483
1484 $self->in_memory (cf::MAP_IN_MEMORY);
1485} 1588}
1486 1589
1487sub customise_for { 1590sub customise_for {
1488 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1489 1592
1490 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1491 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1492 1598
1493 $self 1599 $self
1494} 1600}
1495 1601
1496# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
… …
1607 1713
1608sub reset_at { 1714sub reset_at {
1609 my ($self) = @_; 1715 my ($self) = @_;
1610 1716
1611 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1612 return 1e99 if $self->isa ("ext::map_per_player");#d#
1613 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1614 1719
1615 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1616 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1617 1722
… …
1628 my ($self) = @_; 1733 my ($self) = @_;
1629 1734
1630 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1631 1736
1632 return if $self->players; 1737 return if $self->players;
1633 return if $self->isa ("ext::map_per_player");#d#
1634 1738
1635 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1636 1740
1637 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1638 1742
1639 # need to save uniques path 1743 # need to save uniques path
1640 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
… …
1680instantiated unique items. May block. 1784instantiated unique items. May block.
1681 1785
1682=cut 1786=cut
1683 1787
1684sub unique_maps() { 1788sub unique_maps() {
1685 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1789 my $files = aio_readdir $UNIQUEDIR
1686 or return; 1790 or return;
1687 1791
1688 my @paths; 1792 my @paths;
1689 1793
1690 for (@$files) { 1794 for (@$files) {
… …
1809 $self->deactivate_recursive; 1913 $self->deactivate_recursive;
1810 1914
1811 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1915 return if UNIVERSAL::isa $self->map, "ext::map_link";
1812 1916
1813 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1917 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1814 if $self->map; 1918 if $self->map && $self->map->{path} ne "{link}";
1815 1919
1816 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1920 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1817} 1921}
1818 1922
1819sub cf::object::player::leave_link { 1923sub cf::object::player::leave_link {
1820 my ($self, $map, $x, $y) = @_; 1924 my ($self, $map, $x, $y) = @_;
1925
1926 return unless $self->contr->active;
1821 1927
1822 my $link_pos = delete $self->{_link_pos}; 1928 my $link_pos = delete $self->{_link_pos};
1823 1929
1824 unless ($map) { 1930 unless ($map) {
1825 # restore original map position 1931 # restore original map position
… …
1848 1954
1849 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1955 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1850 $self->enter_map ($map, $x, $y); 1956 $self->enter_map ($map, $x, $y);
1851} 1957}
1852 1958
1853cf::player->attach (
1854 on_logout => sub {
1855 my ($pl) = @_;
1856
1857 # abort map switching before logout
1858 if ($pl->ob->{_link_pos}) {
1859 cf::sync_job {
1860 $pl->ob->leave_link
1861 };
1862 }
1863 },
1864 on_login => sub {
1865 my ($pl) = @_;
1866
1867 # try to abort aborted map switching on player login :)
1868 # should happen only on crashes
1869 if ($pl->ob->{_link_pos}) {
1870 $pl->ob->enter_link;
1871 (async {
1872 $pl->ob->reply (undef,
1873 "There was an internal problem at your last logout, "
1874 . "the server will try to bring you to your intended destination in a second.",
1875 cf::NDI_RED);
1876 # we need this sleep as the login has a concurrent enter_exit running
1877 # and this sleep increases chances of the player not ending up in scorn
1878 Coro::Timer::sleep 1;
1879 $pl->ob->leave_link;
1880 })->prio (2);
1881 }
1882 },
1883);
1884
1885=item $player_object->goto ($path, $x, $y) 1959=item $player_object->goto ($path, $x, $y[, $check->($map)])
1886 1960
1961Moves the player to the given map-path and coordinates by first freezing
1962her, loading and preparing them map, calling the provided $check callback
1963that has to return the map if sucecssful, and then unfreezes the player on
1964the new (success) or old (failed) map position.
1965
1887=cut 1966=cut
1967
1968our $GOTOGEN;
1888 1969
1889sub cf::object::player::goto { 1970sub cf::object::player::goto {
1890 my ($self, $path, $x, $y) = @_; 1971 my ($self, $path, $x, $y, $check) = @_;
1972
1973 # do generation counting so two concurrent goto's will be executed in-order
1974 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1891 1975
1892 $self->enter_link; 1976 $self->enter_link;
1893 1977
1894 (async { 1978 (async {
1895 my $map = eval { 1979 my $map = eval {
1896 my $map = cf::map::find $path; 1980 my $map = cf::map::find $path;
1981
1982 if ($map) {
1897 $map = $map->customise_for ($self) if $map; 1983 $map = $map->customise_for ($self);
1984 $map = $check->($map) if $check && $map;
1985 } else {
1986 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1987 }
1988
1898 $map 1989 $map
1990 };
1991
1992 if ($@) {
1993 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1994 LOG llevError | logBacktrace, Carp::longmess $@;
1899 } or 1995 }
1900 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1901 1996
1997 if ($gen == $self->{_goto_generation}) {
1998 delete $self->{_goto_generation};
1902 $self->leave_link ($map, $x, $y); 1999 $self->leave_link ($map, $x, $y);
2000 }
1903 })->prio (1); 2001 })->prio (1);
1904} 2002}
1905 2003
1906=item $player_object->enter_exit ($exit_object) 2004=item $player_object->enter_exit ($exit_object)
1907 2005
… …
1946 2044
1947 $rmp->{random_seed} ||= $exit->random_seed; 2045 $rmp->{random_seed} ||= $exit->random_seed;
1948 2046
1949 my $data = cf::to_json $rmp; 2047 my $data = cf::to_json $rmp;
1950 my $md5 = Digest::MD5::md5_hex $data; 2048 my $md5 = Digest::MD5::md5_hex $data;
1951 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2049 my $meta = "$RANDOMDIR/$md5.meta";
1952 2050
1953 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2051 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1954 aio_write $fh, 0, (length $data), $data, 0; 2052 aio_write $fh, 0, (length $data), $data, 0;
1955 undef $fh; 2053 undef $fh;
1956 aio_rename "$meta~", $meta; 2054 aio_rename "$meta~", $meta;
… …
1965 2063
1966 return unless $self->type == cf::PLAYER; 2064 return unless $self->type == cf::PLAYER;
1967 2065
1968 if ($exit->slaying eq "/!") { 2066 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job 2067 #TODO: this should de-fi-ni-te-ly not be a sync-job
2068 # the problem is that $exit might not survive long enough
2069 # so it needs to be done right now, right here
1970 cf::sync_job { prepare_random_map $exit }; 2070 cf::sync_job { prepare_random_map $exit };
1971 } 2071 }
1972 2072
1973 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2073 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1974 my $hp = $exit->stats->hp; 2074 my $hp = $exit->stats->hp;
… …
1982 $self->goto ($slaying, $hp, $sp); 2082 $self->goto ($slaying, $hp, $sp);
1983 2083
1984 1; 2084 1;
1985 }) { 2085 }) {
1986 $self->message ("Something went wrong deep within the crossfire server. " 2086 $self->message ("Something went wrong deep within the crossfire server. "
1987 . "I'll try to bring you back to the map you were before. " 2087 . "I'll try to bring you back to the map you were before. "
1988 . "Please report this to the dungeon master!", 2088 . "Please report this to the dungeon master!",
1989 cf::NDI_UNIQUE | cf::NDI_RED); 2089 cf::NDI_UNIQUE | cf::NDI_RED);
1990 2090
1991 warn "ERROR in enter_exit: $@"; 2091 warn "ERROR in enter_exit: $@";
1992 $self->leave_link; 2092 $self->leave_link;
1993 } 2093 }
1994 })->prio (1); 2094 })->prio (1);
… …
2223############################################################################# 2323#############################################################################
2224 2324
2225=head2 EXTENSION DATABASE SUPPORT 2325=head2 EXTENSION DATABASE SUPPORT
2226 2326
2227Crossfire maintains a very simple database for extension use. It can 2327Crossfire maintains a very simple database for extension use. It can
2228currently store anything that can be serialised using Storable, which 2328currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2229excludes objects. 2329convert to/from binary).
2230 2330
2231The parameter C<$family> should best start with the name of the extension 2331The parameter C<$family> should best start with the name of the extension
2232using it, it should be unique. 2332using it, it should be unique.
2233 2333
2234=over 4 2334=over 4
… …
2257 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2357 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2258 cf::cleanup "db_open(db): $!" if $!; 2358 cf::cleanup "db_open(db): $!" if $!;
2259 }; 2359 };
2260 cf::cleanup "db_open(db): $@" if $@; 2360 cf::cleanup "db_open(db): $@" if $@;
2261 }; 2361 };
2262
2263 my $path = cf::localdir . "/database.pst";
2264 if (stat $path) {
2265 cf::sync_job {
2266 my $pst = Storable::retrieve $path;
2267
2268 cf::db_put (board => data => $pst->{board});
2269 cf::db_put (guildrules => data => $pst->{guildrules});
2270 cf::db_put (rent => balance => $pst->{rent}{balance});
2271 BDB::db_env_txn_checkpoint $DB_ENV;
2272
2273 unlink $path;
2274 };
2275 }
2276 } 2362 }
2277} 2363}
2278 2364
2279sub db_get($$) { 2365sub db_get($$) {
2280 my $key = "$_[0]/$_[1]"; 2366 my $key = "$_[0]/$_[1]";
2281 2367
2282 cf::sync_job { 2368 cf::sync_job {
2283 BDB::db_get $DB, undef, $key, my $data; 2369 BDB::db_get $DB, undef, $key, my $data;
2284 2370
2285 $! ? () 2371 $! ? ()
2286 : Compress::LZF::sthaw $data 2372 : $data
2287 } 2373 }
2288} 2374}
2289 2375
2290sub db_put($$$) { 2376sub db_put($$$) {
2291 BDB::dbreq_pri 4; 2377 BDB::dbreq_pri 4;
2292 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2378 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2379}
2380
2381=item cf::cache $id => [$paths...], $processversion => $process
2382
2383Generic caching function that returns the value of the resource $id,
2384caching and regenerating as required.
2385
2386This function can block.
2387
2388=cut
2389
2390sub cache {
2391 my ($id, $src, $processversion, $process) = @_;
2392
2393 my $meta =
2394 join "\x00",
2395 $processversion,
2396 map {
2397 aio_stat $_
2398 and Carp::croak "$_: $!";
2399
2400 ($_, (stat _)[7,9])
2401 } @$src;
2402
2403 my $dbmeta = db_get cache => "$id/meta";
2404 if ($dbmeta ne $meta) {
2405 # changed, we may need to process
2406
2407 my @data;
2408 my $md5;
2409
2410 for (0 .. $#$src) {
2411 0 <= aio_load $src->[$_], $data[$_]
2412 or Carp::croak "$src->[$_]: $!";
2413 }
2414
2415 # if processing is expensive, check
2416 # checksum first
2417 if (1) {
2418 $md5 =
2419 join "\x00",
2420 $processversion,
2421 map {
2422 Coro::cede;
2423 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2424 } 0.. $#$src;
2425
2426
2427 my $dbmd5 = db_get cache => "$id/md5";
2428 if ($dbmd5 eq $md5) {
2429 db_put cache => "$id/meta", $meta;
2430
2431 return db_get cache => "$id/data";
2432 }
2433 }
2434
2435 my $t1 = Time::HiRes::time;
2436 my $data = $process->(\@data);
2437 my $t2 = Time::HiRes::time;
2438
2439 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2440
2441 db_put cache => "$id/data", $data;
2442 db_put cache => "$id/md5" , $md5;
2443 db_put cache => "$id/meta", $meta;
2444
2445 return $data;
2446 }
2447
2448 db_get cache => "$id/data"
2449}
2450
2451=item fork_call { }, $args
2452
2453Executes the given code block with the given arguments in a seperate
2454process, returning the results. Everything must be serialisable with
2455Coro::Storable. May, of course, block. Note that the executed sub may
2456never block itself or use any form of Event handling.
2457
2458=cut
2459
2460sub fork_call(&@) {
2461 my ($cb, @args) = @_;
2462
2463# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2464# or die "socketpair: $!";
2465 pipe my $fh1, my $fh2
2466 or die "pipe: $!";
2467
2468 if (my $pid = fork) {
2469 close $fh2;
2470
2471 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2472 $res = Coro::Storable::thaw $res;
2473
2474 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2475
2476 die $$res unless "ARRAY" eq ref $res;
2477
2478 return wantarray ? @$res : $res->[-1];
2479 } else {
2480 reset_signals;
2481 local $SIG{__WARN__};
2482 local $SIG{__DIE__};
2483 eval {
2484 close $fh1;
2485
2486 my @res = eval { $cb->(@args) };
2487 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2488 };
2489
2490 warn $@ if $@;
2491 _exit 0;
2492 }
2293} 2493}
2294 2494
2295############################################################################# 2495#############################################################################
2296# the server's init and main functions 2496# the server's init and main functions
2297 2497
2298sub load_facedata { 2498sub load_facedata($) {
2299 my $path = sprintf "%s/facedata", cf::datadir; 2499 my ($path) = @_;
2300 2500
2301 warn "loading facedata from $path\n"; 2501 warn "loading facedata from $path\n";
2302 2502
2303 my $faces; 2503 my $facedata;
2304 0 < aio_load $path, $faces 2504 0 < aio_load $path, $facedata
2305 or die "$path: $!"; 2505 or die "$path: $!";
2306 2506
2307 Coro::cede;
2308 $faces = Storable::thaw $faces; 2507 $facedata = Coro::Storable::thaw $facedata;
2309 Coro::cede;
2310 2508
2311 my $meta = delete $faces->{""};
2312 $meta->{version} == 1 2509 $facedata->{version} == 2
2313 or cf::cleanup "$path: version mismatch, cannot proceed."; 2510 or cf::cleanup "$path: version mismatch, cannot proceed.";
2314 2511
2512 {
2513 my $faces = $facedata->{faceinfo};
2514
2315 while (my ($face, $info) = each %$faces) { 2515 while (my ($face, $info) = each %$faces) {
2316 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2516 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2317 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2517 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2318 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2518 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2319 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2519 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2320 Coro::cede; 2520 Coro::cede;
2321 } 2521 }
2322 2522
2323 while (my ($face, $info) = each %$faces) { 2523 while (my ($face, $info) = each %$faces) {
2324 next unless $info->{smooth}; 2524 next unless $info->{smooth};
2325 my $idx = cf::face::find $face 2525 my $idx = cf::face::find $face
2326 or next; 2526 or next;
2327 if (my $smooth = cf::face::find $info->{smooth}) { 2527 if (my $smooth = cf::face::find $info->{smooth}) {
2328 cf::face::set_smooth $idx, $smooth; 2528 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2329 } else { 2529 } else {
2330 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2530 warn "smooth face '$info->{smooth}' not found for face '$face'";
2331 } 2531 }
2332 Coro::cede; 2532 Coro::cede;
2533 }
2534 }
2535
2536 {
2537 my $anims = $facedata->{animinfo};
2538
2539 while (my ($anim, $info) = each %$anims) {
2540 cf::anim::set $anim, $info->{frames}, $info->{facings};
2541 Coro::cede;
2542 }
2543
2544 cf::anim::invalidate_all; # d'oh
2333 } 2545 }
2334 2546
2335 1 2547 1
2336} 2548}
2337 2549
2550sub reload_regions {
2551 load_resource_file "$MAPDIR/regions"
2552 or die "unable to load regions file\n";
2553}
2554
2555sub reload_facedata {
2556 load_facedata "$DATADIR/facedata"
2557 or die "unable to load facedata\n";
2558}
2559
2560sub reload_archetypes {
2561 load_resource_file "$DATADIR/archetypes"
2562 or die "unable to load archetypes\n";
2563}
2564
2565sub reload_treasures {
2566 load_resource_file "$DATADIR/treasures"
2567 or die "unable to load treasurelists\n";
2568}
2569
2338sub reload_resources { 2570sub reload_resources {
2339 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2571 warn "reloading resource files...\n";
2340 or die "unable to load regions file\n";#d# 2572
2573 reload_regions;
2341 load_facedata 2574 reload_facedata;
2342 or die "unable to load facedata\n";#d# 2575 #reload_archetypes;#d#
2576 reload_archetypes;
2577 reload_treasures;
2578
2579 warn "finished reloading resource files\n";
2343} 2580}
2344 2581
2345sub init { 2582sub init {
2346 reload_resources; 2583 reload_resources;
2347} 2584}
2348 2585
2349sub cfg_load { 2586sub cfg_load {
2350 open my $fh, "<:utf8", cf::confdir . "/config" 2587 open my $fh, "<:utf8", "$CONFDIR/config"
2351 or return; 2588 or return;
2352 2589
2353 local $/; 2590 local $/;
2354 *CFG = YAML::Syck::Load <$fh>; 2591 *CFG = YAML::Syck::Load <$fh>;
2355 2592
… …
2440 2677
2441 warn Carp::longmess "post_cleanup backtrace" 2678 warn Carp::longmess "post_cleanup backtrace"
2442 if $make_core; 2679 if $make_core;
2443} 2680}
2444 2681
2445sub reload() { 2682sub do_reload_perl() {
2446 # can/must only be called in main 2683 # can/must only be called in main
2447 if ($Coro::current != $Coro::main) { 2684 if ($Coro::current != $Coro::main) {
2448 warn "can only reload from main coroutine"; 2685 warn "can only reload from main coroutine";
2449 return; 2686 return;
2450 } 2687 }
… …
2525 Symbol::delete_package "safe::$_" 2762 Symbol::delete_package "safe::$_"
2526 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2763 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2527 2764
2528 warn "unloading cf.pm \"a bit\""; 2765 warn "unloading cf.pm \"a bit\"";
2529 delete $INC{"cf.pm"}; 2766 delete $INC{"cf.pm"};
2767 delete $INC{"cf/pod.pm"};
2530 2768
2531 # don't, removes xs symbols, too, 2769 # don't, removes xs symbols, too,
2532 # and global variables created in xs 2770 # and global variables created in xs
2533 #Symbol::delete_package __PACKAGE__; 2771 #Symbol::delete_package __PACKAGE__;
2534 2772
… …
2549 warn "reattaching attachments to maps"; 2787 warn "reattaching attachments to maps";
2550 reattach $_ for values %MAP; 2788 reattach $_ for values %MAP;
2551 warn "reattaching attachments to players"; 2789 warn "reattaching attachments to players";
2552 reattach $_ for values %PLAYER; 2790 reattach $_ for values %PLAYER;
2553 2791
2554 warn "loading reloadable resources";
2555 reload_resources;
2556
2557 warn "leaving sync_job"; 2792 warn "leaving sync_job";
2558 2793
2559 1 2794 1
2560 } or do { 2795 } or do {
2561 warn $@; 2796 warn $@;
… …
2566 warn "reloaded"; 2801 warn "reloaded";
2567}; 2802};
2568 2803
2569our $RELOAD_WATCHER; # used only during reload 2804our $RELOAD_WATCHER; # used only during reload
2570 2805
2806sub reload_perl() {
2807 # doing reload synchronously and two reloads happen back-to-back,
2808 # coro crashes during coro_state_free->destroy here.
2809
2810 $RELOAD_WATCHER ||= Event->timer (
2811 reentrant => 0,
2812 after => 0,
2813 data => WF_AUTOCANCEL,
2814 cb => sub {
2815 do_reload_perl;
2816 undef $RELOAD_WATCHER;
2817 },
2818 );
2819}
2820
2571register_command "reload" => sub { 2821register_command "reload" => sub {
2572 my ($who, $arg) = @_; 2822 my ($who, $arg) = @_;
2573 2823
2574 if ($who->flag (FLAG_WIZ)) { 2824 if ($who->flag (FLAG_WIZ)) {
2575 $who->message ("reloading server."); 2825 $who->message ("reloading server.");
2576 2826 async { reload_perl };
2577 # doing reload synchronously and two reloads happen back-to-back,
2578 # coro crashes during coro_state_free->destroy here.
2579
2580 $RELOAD_WATCHER ||= Event->timer (
2581 reentrant => 0,
2582 after => 0,
2583 data => WF_AUTOCANCEL,
2584 cb => sub {
2585 reload;
2586 undef $RELOAD_WATCHER;
2587 },
2588 );
2589 } 2827 }
2590}; 2828};
2591 2829
2592unshift @INC, $LIBDIR; 2830unshift @INC, $LIBDIR;
2593 2831
2594my $bug_warning = 0; 2832my $bug_warning = 0;
2595 2833
2834our @WAIT_FOR_TICK;
2835our @WAIT_FOR_TICK_BEGIN;
2836
2837sub wait_for_tick {
2838 return unless $TICK_WATCHER->is_active;
2839 return if $Coro::current == $Coro::main;
2840
2841 my $signal = new Coro::Signal;
2842 push @WAIT_FOR_TICK, $signal;
2843 $signal->wait;
2844}
2845
2846sub wait_for_tick_begin {
2847 return unless $TICK_WATCHER->is_active;
2848 return if $Coro::current == $Coro::main;
2849
2850 my $signal = new Coro::Signal;
2851 push @WAIT_FOR_TICK_BEGIN, $signal;
2852 $signal->wait;
2853}
2854
2855 my $min = 1e6;#d#
2856 my $avg = 10;
2596$TICK_WATCHER = Event->timer ( 2857$TICK_WATCHER = Event->timer (
2597 reentrant => 0, 2858 reentrant => 0,
2598 parked => 1, 2859 parked => 1,
2599 prio => 0, 2860 prio => 0,
2600 at => $NEXT_TICK || $TICK, 2861 at => $NEXT_TICK || $TICK,
… …
2604 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2865 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2605 unless ++$bug_warning > 10; 2866 unless ++$bug_warning > 10;
2606 return; 2867 return;
2607 } 2868 }
2608 2869
2609 $NOW = Event::time; 2870 $NOW = $tick_start = Event::time;
2610 2871
2611 cf::server_tick; # one server iteration 2872 cf::server_tick; # one server iteration
2873
2874 0 && sync_job {#d#
2875 for(1..10) {
2876 my $t = Event::time;
2877 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2878 or die;
2879
2880 $map->width (50);
2881 $map->height (50);
2882 $map->alloc;
2883 $map->_load_objects ("/tmp/x.map", 1);
2884 my $t = Event::time - $t;
2885
2886 #next unless $t < 0.0013;#d#
2887 if ($t < $min) {
2888 $min = $t;
2889 }
2890 $avg = $avg * 0.99 + $t * 0.01;
2891 }
2892 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2893 exit 0;
2894 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2895 };
2896
2612 $RUNTIME += $TICK; 2897 $RUNTIME += $TICK;
2613 $NEXT_TICK += $TICK; 2898 $NEXT_TICK += $TICK;
2614 2899
2615 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2900 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2616 $NEXT_RUNTIME_WRITE = $NOW + 10; 2901 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2618 write_runtime 2903 write_runtime
2619 or warn "ERROR: unable to write runtime file: $!"; 2904 or warn "ERROR: unable to write runtime file: $!";
2620 }; 2905 };
2621 } 2906 }
2622 2907
2623 $WAIT_FOR_TICK->broadcast;
2624 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2625
2626# my $AFTER = Event::time; 2908# my $AFTER = Event::time;
2627# warn $AFTER - $NOW;#d# 2909# warn $AFTER - $NOW;#d#
2628 2910
2911 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2912 $sig->send;
2913 }
2914 while (my $sig = shift @WAIT_FOR_TICK) {
2915 $sig->send;
2916 }
2917
2918 $NOW = Event::time;
2919
2629 # if we are delayed by four ticks or more, skip them all 2920 # if we are delayed by four ticks or more, skip them all
2630 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2921 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2631 2922
2632 $TICK_WATCHER->at ($NEXT_TICK); 2923 $TICK_WATCHER->at ($NEXT_TICK);
2633 $TICK_WATCHER->start; 2924 $TICK_WATCHER->start;
2925
2926 $LOAD = ($NOW - $tick_start) / $TICK;
2927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2928
2929 _post_tick;
2930
2931
2634 }, 2932 },
2635); 2933);
2636 2934
2637{ 2935{
2638 BDB::max_poll_time $TICK * 0.1; 2936 BDB::max_poll_time $TICK * 0.1;
… …
2666 2964
2667 cf::sync_job { 2965 cf::sync_job {
2668 eval { 2966 eval {
2669 BDB::db_env_open 2967 BDB::db_env_open
2670 $DB_ENV, 2968 $DB_ENV,
2671 $BDB_ENV_DIR, 2969 $BDBDIR,
2672 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2970 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2673 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2971 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2674 0666; 2972 0666;
2675 2973
2676 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2974 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2677 2975
2678 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2679 $DB_ENV->set_lk_detect; 2977 $DB_ENV->set_lk_detect;
2680 }; 2978 };
2681 2979
… …
2697 prio => 6, 2995 prio => 6,
2698 cb => \&IO::AIO::poll_cb, 2996 cb => \&IO::AIO::poll_cb,
2699 ); 2997 );
2700} 2998}
2701 2999
3000my $_log_backtrace;
3001
3002sub _log_backtrace {
3003 my ($msg, @addr) = @_;
3004
3005 $msg =~ s/\n//;
3006
3007 # limit the # of concurrent backtraces
3008 if ($_log_backtrace < 2) {
3009 ++$_log_backtrace;
3010 async {
3011 my @bt = fork_call {
3012 @addr = map { sprintf "%x", $_ } @addr;
3013 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3014 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3015 or die "addr2line: $!";
3016
3017 my @funcs;
3018 my @res = <$fh>;
3019 chomp for @res;
3020 while (@res) {
3021 my ($func, $line) = splice @res, 0, 2, ();
3022 push @funcs, "[$func] $line";
3023 }
3024
3025 @funcs
3026 };
3027
3028 LOG llevInfo, "[ABT] $msg\n";
3029 LOG llevInfo, "[ABT] $_\n" for @bt;
3030 --$_log_backtrace;
3031 };
3032 } else {
3033 LOG llevInfo, "[ABT] $msg\n";
3034 LOG llevInfo, "[ABT] [suppressed]\n";
3035 }
3036}
3037
3038# load additional modules
3039use cf::pod;
3040
2702END { cf::emergency_save } 3041END { cf::emergency_save }
2703 3042
27041 30431
2705 3044

Diff Legend

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