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.235 by root, Tue Apr 10 09:35:23 2007 UTC vs.
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Socket;
9use Event; 9use EV 1.86;
10use Opcode; 10use Opcode;
11use Safe; 11use Safe;
12use Safe::Hole; 12use Safe::Hole;
13use Storable ();
13 14
14use Coro 3.52 (); 15use Coro 4.32 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::EV;
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::BDB;
24use Coro::Storable;
25use Coro::Util ();
21 26
27use JSON::XS 2.01 ();
22use BDB (); 28use BDB ();
23use Data::Dumper; 29use Data::Dumper;
24use Digest::MD5; 30use Digest::MD5;
25use Fcntl; 31use Fcntl;
26use YAML::Syck (); 32use YAML ();
27use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
28use Time::HiRes; 34use Time::HiRes;
29use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
30 37
31# configure various modules to our taste 38# configure various modules to our taste
32# 39#
40$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::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 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 43
36$Event::Eval = 1; # no idea why this is required, but it is
37
38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
39$YAML::Syck::ImplicitUnicode = 1;
40
41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42 45
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
44 47
45our %COMMAND = (); 48our %COMMAND = ();
46our %COMMAND_TIME = (); 49our %COMMAND_TIME = ();
47 50
48our @EXTS = (); # list of extension package names 51our @EXTS = (); # list of extension package names
49our %EXTCMD = (); 52our %EXTCMD = ();
53our %EXTICMD = ();
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";
71our %RESOURCE;
72
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58our $TICK_WATCHER; 74our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 77our $NEXT_TICK;
62our $NOW;
63our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
64 79
65our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
66our $DB_ENV; 84our $DB_ENV;
67 85
68our %CFG; 86our %CFG;
69 87
70our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
71our $RUNTIME; 89our $RUNTIME;
90our $NOW;
72 91
73our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
74our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
75our $LINK_MAP; # the special {link} map, which is always available 94our $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 95
82# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
85binmode STDOUT; 103binmode STDOUT;
86binmode STDERR; 104binmode STDERR;
87 105
88# read virtual server time, if available 106# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
93} 111}
94 112
95mkdir cf::localdir; 113mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 114 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 115
102our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
103 117
104sub cf::map::normalise; 118sub cf::map::normalise;
105 119
… …
116=item $cf::RUNTIME 130=item $cf::RUNTIME
117 131
118The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
119every server tick. 133every server tick.
120 134
121=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
122 138
123The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
124be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
125 143
126=item $cf::NOW 144=item $cf::NOW
127 145
128The time of the last (current) server tick. 146The time of the last (current) server tick.
129 147
130=item $cf::TICK 148=item $cf::TICK
131 149
132The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
133 151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
161
134=item %cf::CFG 162=item %cf::CFG
135 163
136Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
137from wherever your confdir points to. 165from wherever your confdir points to.
138 166
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
140 168
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These 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 170returns 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 171per 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. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
145 178
146=back 179=back
147 180
148=cut 181=cut
149 182
150BEGIN { 183BEGIN {
151 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 185 my $msg = join "", @_;
153 utf8::encode $msg;
154 186
155 $msg .= "\n" 187 $msg .= "\n"
156 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
157 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
158 LOG llevError, $msg; 192 LOG llevError, $msg;
159 }; 193 };
160} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
161 200
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 205@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
206@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
167@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 207@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
168 208
169# we bless all objects into (empty) derived classes to force a method lookup 209# we bless all objects into (empty) derived classes to force a method lookup
170# within the Safe compartment. 210# within the Safe compartment.
171for my $pkg (qw( 211for my $pkg (qw(
172 cf::global cf::attachable 212 cf::global cf::attachable
… …
177)) { 217)) {
178 no strict 'refs'; 218 no strict 'refs';
179 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
180} 220}
181 221
182$Event::DIED = sub { 222$EV::DIED = sub {
183 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
184}; 224};
225
226#############################################################################
185 227
186=head2 UTILITY FUNCTIONS 228=head2 UTILITY FUNCTIONS
187 229
188=over 4 230=over 4
189 231
… …
208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 250 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
209 $d 251 $d
210 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
211} 253}
212 254
213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
214
215=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
216 256
217Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
218 258
219=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
220 260
221Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
262
263=cut
264
265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
266
267sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) }
222 269
223=item cf::lock_wait $string 270=item cf::lock_wait $string
224 271
225Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
226 273
… …
229Wait until the given lock is available and then acquires it and returns 276Wait until the given lock is available and then acquires it and returns
230a Coro::guard object. If the guard object gets destroyed (goes out of scope, 277a Coro::guard object. If the guard object gets destroyed (goes out of scope,
231for example when the coroutine gets canceled), the lock is automatically 278for example when the coroutine gets canceled), the lock is automatically
232returned. 279returned.
233 280
281Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro.
283
234Lock names should begin with a unique identifier (for example, cf::map::find 284Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load). 285uses map_find and cf::map::load uses map_load).
236 286
287=item $locked = cf::lock_active $string
288
289Return true if the lock is currently active, i.e. somebody has locked it.
290
237=cut 291=cut
238 292
239our %LOCK; 293our %LOCK;
294our %LOCKER;#d#
240 295
241sub lock_wait($) { 296sub lock_wait($) {
242 my ($key) = @_; 297 my ($key) = @_;
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
243 303
244 # wait for lock, if any 304 # wait for lock, if any
245 while ($LOCK{$key}) { 305 while ($LOCK{$key}) {
246 push @{ $LOCK{$key} }, $Coro::current; 306 push @{ $LOCK{$key} }, $Coro::current;
247 Coro::schedule; 307 Coro::schedule;
… …
253 313
254 # wait, to be sure we are not locked 314 # wait, to be sure we are not locked
255 lock_wait $key; 315 lock_wait $key;
256 316
257 $LOCK{$key} = []; 317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
258 319
259 Coro::guard { 320 Coro::guard {
321 delete $LOCKER{$key};#d#
260 # wake up all waiters, to be on the safe side 322 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 323 $_->ready for @{ delete $LOCK{$key} };
262 } 324 }
325}
326
327sub lock_active($) {
328 my ($key) = @_;
329
330 ! ! $LOCK{$key}
263} 331}
264 332
265sub freeze_mainloop { 333sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 334 return unless $TICK_WATCHER->is_active;
267 335
… …
270 }; 338 };
271 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
272 $guard 340 $guard
273} 341}
274 342
343=item cf::periodic $interval, $cb
344
345Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer.
347
348=cut
349
350sub periodic($$) {
351 my ($interval, $cb) = @_;
352
353 my $start = rand List::Util::min 180, $interval;
354
355 EV::periodic $start, $interval, 0, $cb
356}
357
358=item cf::get_slot $time[, $priority[, $name]]
359
360Allocate $time seconds of blocking CPU time at priority C<$priority>:
361This call blocks and returns only when you have at least C<$time> seconds
362of cpu time till the next tick. The slot is only valid till the next cede.
363
364The optional C<$name> can be used to identify the job to run. It might be
365used for statistical purposes and should identify the same time-class.
366
367Useful for short background jobs.
368
369=cut
370
371our @SLOT_QUEUE;
372our $SLOT_QUEUE;
373
374$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager");
377
378 my $signal = new Coro::Signal;
379
380 while () {
381 next_job:
382 my $avail = cf::till_tick;
383 if ($avail > 0.01) {
384 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) {
386 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send;
388 Coro::cede;
389 goto next_job;
390 }
391 }
392 }
393
394 if (@SLOT_QUEUE) {
395 # we do not use wait_for_tick() as it returns immediately when tick is inactive
396 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait;
398 } else {
399 Coro::schedule;
400 }
401 }
402};
403
404sub get_slot($;$$) {
405 my ($time, $pri, $name) = @_;
406
407 $time = $TICK * .6 if $time > $TICK * .6;
408 my $sig = new Coro::Signal;
409
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready;
413 $sig->wait;
414}
415
275=item cf::async { BLOCK } 416=item cf::async { BLOCK }
276 417
277Currently the same as Coro::async_pool, meaning you cannot use 418Currently the same as Coro::async_pool, meaning you cannot use
278C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 419C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
279thing you are allowed to do is call C<prio> on it. 420thing you are allowed to do is call C<prio> on it.
… …
282 423
283BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
284 425
285=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
286 427
287The design of crossfire+ requires that the main coro ($Coro::main) is 428The design of Deliantra requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 429is always able to handle events or runnable, as Deliantra is only
289reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
431acceptable.
290 432
291If it must be done, put the blocking parts into C<sync_job>. This will run 433If it must be done, put the blocking parts into C<sync_job>. This will run
292the given BLOCK in another coroutine while waiting for the result. The 434the given BLOCK in another coroutine while waiting for the result. The
293server will be frozen during this time, so the block should either finish 435server will be frozen during this time, so the block should either finish
294fast or be very important. 436fast or be very important.
… …
297 439
298sub sync_job(&) { 440sub sync_job(&) {
299 my ($job) = @_; 441 my ($job) = @_;
300 442
301 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
444 my $time = EV::time;
445
302 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
304 448
449 LOG llevError, Carp::longmess "sync job";#d#
450
305 # TODO: use suspend/resume instead 451 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 452 # (but this is cancel-safe)
307 my $freeze_guard = freeze_mainloop; 453 my $freeze_guard = freeze_mainloop;
308 454
309 my $busy = 1; 455 my $busy = 1;
310 my @res; 456 my @res;
311 457
312 (async { 458 (async {
459 $Coro::current->desc ("sync job coro");
313 @res = eval { $job->() }; 460 @res = eval { $job->() };
314 warn $@ if $@; 461 warn $@ if $@;
315 undef $busy; 462 undef $busy;
316 })->prio (Coro::PRIO_MAX); 463 })->prio (Coro::PRIO_MAX);
317 464
318 while ($busy) { 465 while ($busy) {
319 Coro::cede or Event::one_event; 466 if (Coro::nready) {
467 Coro::cede_notself;
468 } else {
469 EV::loop EV::LOOP_ONESHOT;
320 } 470 }
471 }
472
473 $time = EV::time - $time;
474
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load
321 479
322 wantarray ? @res : $res[0] 480 wantarray ? @res : $res[0]
323 } else { 481 } else {
324 # we are in another coroutine, how wonderful, everything just works 482 # we are in another coroutine, how wonderful, everything just works
325 483
… …
345 $EXT_CORO{$coro+0} = $coro; 503 $EXT_CORO{$coro+0} = $coro;
346 504
347 $coro 505 $coro
348} 506}
349 507
350sub write_runtime { 508=item fork_call { }, $args
351 my $guard = cf::lock_acquire "write_runtime";
352 509
353 my $runtime = cf::localdir . "/runtime"; 510Executes the given code block with the given arguments in a seperate
511process, returning the results. Everything must be serialisable with
512Coro::Storable. May, of course, block. Note that the executed sub may
513never block itself or use any form of event handling.
354 514
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 515=cut
356 or return;
357 516
358 my $value = $cf::RUNTIME + 90 + 10; 517sub fork_call(&@) {
359 # 10 is the runtime save interval, for a monotonic clock 518 my ($cb, @args) = @_;
360 # 60 allows for the watchdog to kill the server.
361 519
362 (aio_write $fh, 0, (length $value), $value, 0) <= 0 520 # we seemingly have to make a local copy of the whole thing,
363 and return; 521 # otherwise perl prematurely frees the stuff :/
522 # TODO: investigate and fix (likely this will be rather laborious)
364 523
365 # always fsync - this file is important 524 my @res = Coro::Util::fork_eval {
366 aio_fsync $fh 525 reset_signals;
367 and return; 526 &$cb
527 }, @args;
368 528
369 close $fh 529 wantarray ? @res : $res[-1]
370 or return; 530}
371 531
372 aio_rename "$runtime~", $runtime 532=item $value = cf::db_get $family => $key
373 and return;
374 533
534Returns a single value from the environment database.
535
536=item cf::db_put $family => $key => $value
537
538Stores the given C<$value> in the family. It can currently store binary
539data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
540
541=item $db = cf::db_table "name"
542
543Create and/or open a new database table. The string must not be "db" and must be unique
544within each server.
545
546=cut
547
548sub db_table($) {
549 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV;
551
552 eval {
553 $db->set_flags (BDB::CHKSUM);
554
555 utf8::encode $name;
556 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
557 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
558 cf::cleanup "db_open(db): $!" if $!;
559 };
560 cf::cleanup "db_open(db): $@" if $@;
561
562 $db
563}
564
565our $DB;
566
567sub db_init {
568 cf::sync_job {
569 $DB ||= db_table "db";
570 };
571}
572
573sub db_get($$) {
574 my $key = "$_[0]/$_[1]";
575
576 cf::sync_job {
577 BDB::db_get $DB, undef, $key, my $data;
578
579 $! ? ()
580 : $data
375 1 581 }
582}
583
584sub db_put($$$) {
585 BDB::dbreq_pri 4;
586 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
587}
588
589=item cf::cache $id => [$paths...], $processversion => $process
590
591Generic caching function that returns the value of the resource $id,
592caching and regenerating as required.
593
594This function can block.
595
596=cut
597
598sub cache {
599 my ($id, $src, $processversion, $process) = @_;
600
601 my $meta =
602 join "\x00",
603 $processversion,
604 map {
605 aio_stat $_
606 and Carp::croak "$_: $!";
607
608 ($_, (stat _)[7,9])
609 } @$src;
610
611 my $dbmeta = db_get cache => "$id/meta";
612 if ($dbmeta ne $meta) {
613 # changed, we may need to process
614
615 my @data;
616 my $md5;
617
618 for (0 .. $#$src) {
619 0 <= aio_load $src->[$_], $data[$_]
620 or Carp::croak "$src->[$_]: $!";
621 }
622
623 # if processing is expensive, check
624 # checksum first
625 if (1) {
626 $md5 =
627 join "\x00",
628 $processversion,
629 map {
630 cf::cede_to_tick;
631 ($src->[$_], Digest::MD5::md5_hex $data[$_])
632 } 0.. $#$src;
633
634
635 my $dbmd5 = db_get cache => "$id/md5";
636 if ($dbmd5 eq $md5) {
637 db_put cache => "$id/meta", $meta;
638
639 return db_get cache => "$id/data";
640 }
641 }
642
643 my $t1 = Time::HiRes::time;
644 my $data = $process->(\@data);
645 my $t2 = Time::HiRes::time;
646
647 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
648
649 db_put cache => "$id/data", $data;
650 db_put cache => "$id/md5" , $md5;
651 db_put cache => "$id/meta", $meta;
652
653 return $data;
654 }
655
656 db_get cache => "$id/data"
376} 657}
377 658
378=item cf::datalog type => key => value, ... 659=item cf::datalog type => key => value, ...
379 660
380Log a datalog packet of the given type with the given key-value pairs. 661Log a datalog packet of the given type with the given key-value pairs.
… …
398attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
400 681
401In the following description, CLASS can be any of C<global>, C<object> 682In the following description, CLASS can be any of C<global>, C<object>
402C<player>, C<client> or C<map> (i.e. the attachable objects in 683C<player>, C<client> or C<map> (i.e. the attachable objects in
403crossfire+). 684Deliantra).
404 685
405=over 4 686=over 4
406 687
407=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
408 689
… …
571 $registry = $CB_TYPE[$object_type] ||= []; 852 $registry = $CB_TYPE[$object_type] ||= [];
572 853
573 } elsif ($type eq "subtype") { 854 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 855 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 856 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 857 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 858
578 } elsif ($type eq "package") { 859 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 860 my $pkg = shift @arg;
580 861
581 while (my ($name, $id) = each %cb_id) { 862 while (my ($name, $id) = each %cb_id) {
… …
610 _attach $registry, $klass, @attach; 891 _attach $registry, $klass, @attach;
611 } 892 }
612 893
613 $obj->{$name} = \%arg; 894 $obj->{$name} = \%arg;
614 } else { 895 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 896 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 897 }
617 898
618 $obj->{_attachment}{$name} = undef; 899 $obj->{_attachment}{$name} = undef;
619} 900}
620 901
… …
622 if (ref $_[0]) { 903 if (ref $_[0]) {
623 _object_attach @_; 904 _object_attach @_;
624 } else { 905 } else {
625 _attach shift->_attach_registry, @_; 906 _attach shift->_attach_registry, @_;
626 } 907 }
908 _recalc_want;
627}; 909};
628 910
629# all those should be optimised 911# all those should be optimised
630sub cf::attachable::detach { 912sub cf::attachable::detach {
631 my ($obj, $name) = @_; 913 my ($obj, $name) = @_;
… …
634 delete $obj->{_attachment}{$name}; 916 delete $obj->{_attachment}{$name};
635 reattach ($obj); 917 reattach ($obj);
636 } else { 918 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 919 Carp::croak "cannot, currently, detach class attachments";
638 } 920 }
921 _recalc_want;
639}; 922};
640 923
641sub cf::attachable::attached { 924sub cf::attachable::attached {
642 my ($obj, $name) = @_; 925 my ($obj, $name) = @_;
643 926
… …
658 "; 941 ";
659 die if $@; 942 die if $@;
660} 943}
661 944
662our $override; 945our $override;
663our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 946our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
664 947
665sub override { 948sub override {
666 $override = 1; 949 $override = 1;
667 @invoke_results = (); 950 @INVOKE_RESULTS = (@_);
668} 951}
669 952
670sub do_invoke { 953sub do_invoke {
671 my $event = shift; 954 my $event = shift;
672 my $callbacks = shift; 955 my $callbacks = shift;
673 956
674 @invoke_results = (); 957 @INVOKE_RESULTS = ();
675 958
676 local $override; 959 local $override;
677 960
678 for (@$callbacks) { 961 for (@$callbacks) {
679 eval { &{$_->[1]} }; 962 eval { &{$_->[1]} };
… …
688 } 971 }
689 972
690 0 973 0
691} 974}
692 975
693=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
694 977
695=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
696 979
697Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
698 981
699This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 982This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
700removed in future versions), and there is no public API to access override 983removed in future versions), and there is no public API to access override
701results (if you must, access C<@cf::invoke_results> directly). 984results (if you must, access C<@cf::INVOKE_RESULTS> directly).
702 985
703=back 986=back
704 987
705=cut 988=cut
706 989
707############################################################################# 990#############################################################################
708# object support 991# object support
992
993sub _object_equal($$);
994sub _object_equal($$) {
995 my ($a, $b) = @_;
996
997 return 0 unless (ref $a) eq (ref $b);
998
999 if ("HASH" eq ref $a) {
1000 my @ka = keys %$a;
1001 my @kb = keys %$b;
1002
1003 return 0 if @ka != @kb;
1004
1005 for (0 .. $#ka) {
1006 return 0 unless $ka[$_] eq $kb[$_];
1007 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1008 }
1009
1010 } elsif ("ARRAY" eq ref $a) {
1011
1012 return 0 if @$a != @$b;
1013
1014 for (0 .. $#$a) {
1015 return 0 unless _object_equal $a->[$_], $b->[$_];
1016 }
1017
1018 } elsif ($a ne $b) {
1019 return 0;
1020 }
1021
1022 1
1023}
1024
1025our $SLOW_MERGES;#d#
1026sub _can_merge {
1027 my ($ob1, $ob2) = @_;
1028
1029 ++$SLOW_MERGES;#d#
1030
1031 # we do the slow way here
1032 return _object_equal $ob1, $ob2
1033}
709 1034
710sub reattach { 1035sub reattach {
711 # basically do the same as instantiate, without calling instantiate 1036 # basically do the same as instantiate, without calling instantiate
712 my ($obj) = @_; 1037 my ($obj) = @_;
713 1038
… …
734cf::attachable->attach ( 1059cf::attachable->attach (
735 prio => -1000000, 1060 prio => -1000000,
736 on_instantiate => sub { 1061 on_instantiate => sub {
737 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
738 1063
739 $data = from_json $data; 1064 $data = decode_json $data;
740 1065
741 for (@$data) { 1066 for (@$data) {
742 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
743 1068
744 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
… …
760sub object_freezer_save { 1085sub object_freezer_save {
761 my ($filename, $rdata, $objs) = @_; 1086 my ($filename, $rdata, $objs) = @_;
762 1087
763 sync_job { 1088 sync_job {
764 if (length $$rdata) { 1089 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename);
765 warn sprintf "saving %s (%d,%d)\n", 1091 warn sprintf "saving %s (%d,%d)\n",
766 $filename, length $$rdata, scalar @$objs; 1092 $decname, length $$rdata, scalar @$objs;
767 1093
768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
769 chmod SAVE_MODE, $fh; 1095 chmod SAVE_MODE, $fh;
770 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
771 aio_fsync $fh if $cf::USE_FSYNC; 1097 aio_fsync $fh if $cf::USE_FSYNC;
772 close $fh; 1098 close $fh;
773 1099
774 if (@$objs) { 1100 if (@$objs) {
775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
776 chmod SAVE_MODE, $fh; 1102 chmod SAVE_MODE, $fh;
777 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
778 aio_write $fh, 0, (length $data), $data, 0; 1104 aio_write $fh, 0, (length $data), $data, 0;
779 aio_fsync $fh if $cf::USE_FSYNC; 1105 aio_fsync $fh if $cf::USE_FSYNC;
780 close $fh; 1106 close $fh;
781 aio_rename "$filename.pst~", "$filename.pst"; 1107 aio_rename "$filename.pst~", "$filename.pst";
782 } 1108 }
… …
790 } 1116 }
791 } else { 1117 } else {
792 aio_unlink $filename; 1118 aio_unlink $filename;
793 aio_unlink "$filename.pst"; 1119 aio_unlink "$filename.pst";
794 } 1120 }
795 } 1121 };
796} 1122}
797 1123
798sub object_freezer_as_string { 1124sub object_freezer_as_string {
799 my ($rdata, $objs) = @_; 1125 my ($rdata, $objs) = @_;
800 1126
… …
812 or return; 1138 or return;
813 1139
814 unless (aio_stat "$filename.pst") { 1140 unless (aio_stat "$filename.pst") {
815 (aio_load "$filename.pst", $av) >= 0 1141 (aio_load "$filename.pst", $av) >= 0
816 or return; 1142 or return;
1143
817 $av = eval { (Storable::thaw $av)->{objs} }; 1144 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs};
818 } 1146 }
819 1147
1148 utf8::decode (my $decname = $filename);
820 warn sprintf "loading %s (%d)\n", 1149 warn sprintf "loading %s (%d,%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1150 $decname, length $data, scalar @{$av || []};
1151
822 return ($data, $av); 1152 ($data, $av)
823} 1153}
1154
1155=head2 COMMAND CALLBACKS
1156
1157=over 4
1158
1159=cut
824 1160
825############################################################################# 1161#############################################################################
826# command handling &c 1162# command handling &c
827 1163
828=item cf::register_command $name => \&callback($ob,$args); 1164=item cf::register_command $name => \&callback($ob,$args);
… …
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1177 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1178}
843 1179
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1180=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1181
846Register a callbackf ro execution when the client sends an extcmd packet. 1182Register a callback for execution when the client sends an (synchronous)
1183extcmd packet. Ext commands will be processed in the order they are
1184received by the server, like other user commands. The first argument is
1185the logged-in player. Ext commands can only be processed after a player
1186has logged in successfully.
847 1187
848If the callback returns something, it is sent back as if reply was being 1188If the callback returns something, it is sent back as if reply was being
849called. 1189called.
850 1190
1191=item cf::register_exticmd $name => \&callback($ns,$packet);
1192
1193Register a callback for execution when the client sends an (asynchronous)
1194exticmd packet. Exti commands are processed by the server as soon as they
1195are received, i.e. out of order w.r.t. other commands. The first argument
1196is a client socket. Exti commands can be received anytime, even before
1197log-in.
1198
1199If the callback returns something, it is sent back as if reply was being
1200called.
1201
851=cut 1202=cut
852 1203
853sub register_extcmd { 1204sub register_extcmd {
854 my ($name, $cb) = @_; 1205 my ($name, $cb) = @_;
855 1206
856 $EXTCMD{$name} = $cb; 1207 $EXTCMD{$name} = $cb;
1208}
1209
1210sub register_exticmd {
1211 my ($name, $cb) = @_;
1212
1213 $EXTICMD{$name} = $cb;
857} 1214}
858 1215
859cf::player->attach ( 1216cf::player->attach (
860 on_command => sub { 1217 on_command => sub {
861 my ($pl, $name, $params) = @_; 1218 my ($pl, $name, $params) = @_;
… …
870 cf::override; 1227 cf::override;
871 }, 1228 },
872 on_extcmd => sub { 1229 on_extcmd => sub {
873 my ($pl, $buf) = @_; 1230 my ($pl, $buf) = @_;
874 1231
875 my $msg = eval { from_json $buf }; 1232 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
876 1233
877 if (ref $msg) { 1234 if (ref $msg) {
1235 my ($type, $reply, @payload) =
1236 "ARRAY" eq ref $msg
1237 ? @$msg
1238 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1239
1240 my @reply;
1241
878 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1242 if (my $cb = $EXTCMD{$type}) {
879 if (my %reply = $cb->($pl, $msg)) { 1243 @reply = $cb->($pl, @payload);
880 $pl->ext_reply ($msg->{msgid}, %reply);
881 }
882 } 1244 }
1245
1246 $pl->ext_reply ($reply, @reply)
1247 if $reply;
1248
883 } else { 1249 } else {
884 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
885 } 1251 }
886 1252
887 cf::override; 1253 cf::override;
888 }, 1254 },
889); 1255);
890 1256
891sub load_extension {
892 my ($path) = @_;
893
894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
895 my $base = $1;
896 my $pkg = $1;
897 $pkg =~ s/[^[:word:]]/_/g;
898 $pkg = "ext::$pkg";
899
900 warn "... loading '$path' into '$pkg'\n";
901
902 open my $fh, "<:utf8", $path
903 or die "$path: $!";
904
905 my $source =
906 "package $pkg; use strict; use utf8;\n"
907 . "#line 1 \"$path\"\n{\n"
908 . (do { local $/; <$fh> })
909 . "\n};\n1";
910
911 unless (eval $source) {
912 my $msg = $@ ? "$path: $@\n"
913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
921
922 push @EXTS, $pkg;
923}
924
925sub load_extensions { 1257sub load_extensions {
1258 cf::sync_job {
1259 my %todo;
1260
926 for my $ext (<$LIBDIR/*.ext>) { 1261 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1262 next unless -r $path;
928 eval { 1263
929 load_extension $ext; 1264 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1265 my $base = $1;
1266 my $pkg = $1;
1267 $pkg =~ s/[^[:word:]]/_/g;
1268 $pkg = "ext::$pkg";
1269
1270 open my $fh, "<:utf8", $path
1271 or die "$path: $!";
1272
1273 my $source = do { local $/; <$fh> };
1274
1275 my %ext = (
1276 path => $path,
1277 base => $base,
1278 pkg => $pkg,
1279 );
1280
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283
1284 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n"
1286 . "#line 1 \"$path\"\n{\n"
1287 . $source
1288 . "\n};\n1";
1289
1290 $todo{$base} = \%ext;
1291 }
1292
1293 my %done;
1294 while (%todo) {
1295 my $progress;
1296
1297 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip
1300 unless exists $done{$_};
1301 }
1302
1303 warn "... loading '$k' into '$v->{pkg}'\n";
1304
1305 unless (eval $v->{source}) {
1306 my $msg = $@ ? "$v->{path}: $@\n"
1307 : "$v->{base}: extension inactive.\n";
1308
1309 if (exists $v->{meta}{mandatory}) {
1310 warn $msg;
1311 warn "mandatory extension failed to load, exiting.\n";
1312 exit 1;
1313 }
1314
1315 warn $msg;
1316 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
930 1 1321 }
931 } or warn "$ext not loaded: $@"; 1322
1323 skip:
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1325 unless $progress;
1326 }
932 } 1327 };
933} 1328}
934 1329
935############################################################################# 1330#############################################################################
936 1331
1332=back
1333
937=head2 CORE EXTENSIONS 1334=head2 CORE EXTENSIONS
938 1335
939Functions and methods that extend core crossfire objects. 1336Functions and methods that extend core crossfire objects.
940 1337
941=cut 1338=cut
… …
946 1343
947=head3 cf::player 1344=head3 cf::player
948 1345
949=over 4 1346=over 4
950 1347
1348=item cf::player::num_playing
1349
1350Returns the official number of playing players, as per the Crossfire metaserver rules.
1351
1352=cut
1353
1354sub num_playing {
1355 scalar grep
1356 $_->ob->map
1357 && !$_->hidden
1358 && !$_->ob->flag (cf::FLAG_WIZ),
1359 cf::player::list
1360}
1361
951=item cf::player::find $login 1362=item cf::player::find $login
952 1363
953Returns the given player object, loading it if necessary (might block). 1364Returns the given player object, loading it if necessary (might block).
954 1365
955=cut 1366=cut
956 1367
957sub playerdir($) { 1368sub playerdir($) {
958 cf::localdir 1369 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1370 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1371}
964 1372
965sub path($) { 1373sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1374 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
993 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1401 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
994 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1402 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
995 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1403 aio_unlink +(playerdir $login) . "/$login.pl.pst";
996 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
997 1405
998 my $pl = load_pl path $login 1406 my $f = new_from_file cf::object::thawer path $login
999 or return; 1407 or return;
1408
1409 my $pl = cf::player::load_pl $f
1410 or return;
1411 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs;
1000 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
1001 } 1414 }
1002 } 1415 }
1003} 1416}
1004 1417
… …
1014 1427
1015 aio_mkdir playerdir $pl, 0770; 1428 aio_mkdir playerdir $pl, 0770;
1016 $pl->{last_save} = $cf::RUNTIME; 1429 $pl->{last_save} = $cf::RUNTIME;
1017 1430
1018 $pl->save_pl ($path); 1431 $pl->save_pl ($path);
1019 Coro::cede; 1432 cf::cede_to_tick;
1020} 1433}
1021 1434
1022sub new($) { 1435sub new($) {
1023 my ($login) = @_; 1436 my ($login) = @_;
1024 1437
… …
1028 $self->{deny_save} = 1; 1441 $self->{deny_save} = 1;
1029 1442
1030 $cf::PLAYER{$login} = $self; 1443 $cf::PLAYER{$login} = $self;
1031 1444
1032 $self 1445 $self
1446}
1447
1448=item $player->send_msg ($channel, $msg, $color, [extra...])
1449
1450=cut
1451
1452sub send_msg {
1453 my $ns = shift->ns
1454 or return;
1455 $ns->send_msg (@_);
1033} 1456}
1034 1457
1035=item $pl->quit_character 1458=item $pl->quit_character
1036 1459
1037Nukes the player without looking back. If logged in, the connection will 1460Nukes the player without looking back. If logged in, the connection will
… …
1086while and may block, so not sync_job-capable, ever. 1509while and may block, so not sync_job-capable, ever.
1087 1510
1088=cut 1511=cut
1089 1512
1090sub list_logins { 1513sub list_logins {
1091 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1514 my $dirs = aio_readdir $PLAYERDIR
1092 or return []; 1515 or return [];
1093 1516
1094 my @logins; 1517 my @logins;
1095 1518
1096 for my $login (@$dirs) { 1519 for my $login (@$dirs) {
1520 my $path = path $login;
1521
1522 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") {
1097 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1098 aio_read $fh, 0, 512, my $buf, 0 or next; 1525 aio_read $fh, 0, 512, my $buf, 0 or next;
1099 $buf !~ /^password -------------$/m or next; # official not-valid tag 1526 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 }
1100 1528
1101 utf8::decode $login; 1529 utf8::decode $login;
1102 push @logins, $login; 1530 push @logins, $login;
1103 } 1531 }
1104 1532
… …
1131 } 1559 }
1132 1560
1133 \@paths 1561 \@paths
1134} 1562}
1135 1563
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1565
1566Expand crossfire pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656
1136=item $player->ext_reply ($msgid, %msg) 1657=item $player->ext_reply ($msgid, @msg)
1137 1658
1138Sends an ext reply to the player. 1659Sends an ext reply to the player.
1139 1660
1140=cut 1661=cut
1141 1662
1142sub ext_reply($$%) { 1663sub ext_reply($$@) {
1143 my ($self, $id, %msg) = @_; 1664 my ($self, $id, @msg) = @_;
1144 1665
1145 $msg{msgid} = $id; 1666 $self->ns->ext_reply ($id, @msg)
1146
1147 $self->send ("ext " . cf::to_json \%msg);
1148} 1667}
1149 1668
1150=item $player->ext_event ($type, %msg) 1669=item $player->ext_msg ($type, @msg)
1151 1670
1152Sends an ext event to the client. 1671Sends an ext event to the client.
1153 1672
1154=cut 1673=cut
1155 1674
1156sub ext_event($$%) { 1675sub ext_msg($$@) {
1157 my ($self, $type, %msg) = @_; 1676 my ($self, $type, @msg) = @_;
1158 1677
1159 $self->ns->ext_event ($type, %msg); 1678 $self->ns->ext_msg ($type, @msg);
1160} 1679}
1161 1680
1162package cf; 1681=head3 cf::region
1682
1683=over 4
1684
1685=cut
1686
1687package cf::region;
1688
1689=item cf::region::find_by_path $path
1690
1691Tries to decuce the likely region for a map knowing only its path.
1692
1693=cut
1694
1695sub find_by_path($) {
1696 my ($path) = @_;
1697
1698 my ($match, $specificity);
1699
1700 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity)
1703 if $region->specificity > $specificity;
1704 }
1705 }
1706
1707 $match
1708}
1163 1709
1164=back 1710=back
1165
1166 1711
1167=head3 cf::map 1712=head3 cf::map
1168 1713
1169=over 4 1714=over 4
1170 1715
… …
1225 my ($self, $merge) = @_; 1770 my ($self, $merge) = @_;
1226 1771
1227 # we have to keep some variables in memory intact 1772 # we have to keep some variables in memory intact
1228 local $self->{path}; 1773 local $self->{path};
1229 local $self->{load_path}; 1774 local $self->{load_path};
1230 local $self->{deny_save};
1231 local $self->{deny_reset};
1232 1775
1233 $self->SUPER::thawer_merge ($merge); 1776 $self->SUPER::thawer_merge ($merge);
1234} 1777}
1235 1778
1236sub normalise { 1779sub normalise {
… …
1283 $self->init; # pass $1 etc. 1826 $self->init; # pass $1 etc.
1284 return $self; 1827 return $self;
1285 } 1828 }
1286 } 1829 }
1287 1830
1288 Carp::carp "unable to resolve path '$path' (base '$base')."; 1831 Carp::cluck "unable to resolve path '$path' (base '$base').";
1289 () 1832 ()
1290} 1833}
1291 1834
1292sub init { 1835sub init {
1293 my ($self) = @_; 1836 my ($self) = @_;
… …
1308 1851
1309# the original (read-only) location 1852# the original (read-only) location
1310sub load_path { 1853sub load_path {
1311 my ($self) = @_; 1854 my ($self) = @_;
1312 1855
1313 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1856 "$MAPDIR/$self->{path}.map"
1314} 1857}
1315 1858
1316# the temporary/swap location 1859# the temporary/swap location
1317sub save_path { 1860sub save_path {
1318 my ($self) = @_; 1861 my ($self) = @_;
1319 1862
1320 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1321 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1864 "$TMPDIR/$path.map"
1322} 1865}
1323 1866
1324# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1325sub uniq_path { 1868sub uniq_path {
1326 my ($self) = @_; 1869 my ($self) = @_;
1327 1870
1328 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1329 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1872 "$UNIQUEDIR/$path"
1330} 1873}
1331 1874
1332# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1333# all maps in C++... 1876# all maps in C++...
1334sub change_all_map_light { 1877sub change_all_map_light {
… …
1336 1879
1337 $_->change_map_light ($change) 1880 $_->change_map_light ($change)
1338 for grep $_->outdoor, values %cf::MAP; 1881 for grep $_->outdoor, values %cf::MAP;
1339} 1882}
1340 1883
1884sub decay_objects {
1885 my ($self) = @_;
1886
1887 return if $self->{deny_reset};
1888
1889 $self->do_decay_objects;
1890}
1891
1341sub unlink_save { 1892sub unlink_save {
1342 my ($self) = @_; 1893 my ($self) = @_;
1343 1894
1344 utf8::encode (my $save = $self->save_path); 1895 utf8::encode (my $save = $self->save_path);
1345 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1896 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1348 1899
1349sub load_header_from($) { 1900sub load_header_from($) {
1350 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1351 1902
1352 utf8::encode $path; 1903 utf8::encode $path;
1353 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1354 # or return;
1355
1356 $self->_load_header ($path)
1357 or return; 1905 or return;
1906
1907 $self->_load_header ($f)
1908 or return;
1909
1910 local $MAP_LOADING{$self->{path}} = $self;
1911 $f->resolve_delayed_derefs;
1358 1912
1359 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1360 1914
1361 1 1915 1
1362} 1916}
… …
1401 $self->load_header_orig 1955 $self->load_header_orig
1402 or return; 1956 or return;
1403 $self->prepare_orig; 1957 $self->prepare_orig;
1404 } 1958 }
1405 1959
1960 $self->{deny_reset} = 1
1961 if $self->no_reset;
1962
1963 $self->default_region (cf::region::find_by_path $self->{path})
1964 unless $self->default_region;
1965
1406 1 1966 1
1407} 1967}
1408 1968
1409sub find; 1969sub find;
1410sub find { 1970sub find {
1411 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1412 1972
1413 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1414 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1415 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1416 1977
1417 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1418 my $guard = cf::lock_acquire "map_find:$path"; 1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1419 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1420 or return; 1983 or return;
1421 1984
1422 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1423 1986
1424 $map->load_header 1987 $map->load_header
1425 or return; 1988 or return;
1426 1989
1427 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1428 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1429 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard1;
1994 undef $guard2;
1430 $map->reset; 1995 $map->reset;
1431 undef $guard;
1432 return find $path; 1996 return find $path;
1433 } 1997 }
1434 1998
1435 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1436 } 2000 }
… …
1443 my ($self) = @_; 2007 my ($self) = @_;
1444 2008
1445 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1446 2010
1447 my $path = $self->{path}; 2011 my $path = $self->{path};
2012
2013 {
1448 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1449 2015
2016 return unless $self->valid;
1450 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1451 2018
1452 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1453 2020
1454 $self->alloc; 2021 $self->alloc;
1455 2022
1456 $self->pre_load; 2023 $self->pre_load;
2024 cf::cede_to_tick;
1457 2025
1458 $self->_load_objects ($self->{load_path}, 1) 2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
2028 $self->_load_objects ($f)
1459 or return; 2029 or return;
1460 2030
1461 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1462 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1463 2033
1464 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1465 utf8::encode $uniq; 2035 utf8::encode $uniq;
1466 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1467 $self->clear_unique_items; 2038 $self->clear_unique_items;
1468 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1469 } 2042 }
1470 } 2043 }
1471 2044
1472 Coro::cede; 2045 $f->resolve_delayed_derefs;
1473 2046
2047 cf::cede_to_tick;
1474 # now do the right thing for maps 2048 # now do the right thing for maps
1475 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1476
1477 unless ($self->{deny_activate}) {
1478 $self->decay_objects;
1479 $self->fix_auto_apply;
1480 $self->update_buttons;
1481 Coro::cede;
1482 $self->set_darkness_map;
1483 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1484 unless $self->difficulty; 2051 unless $self->difficulty;
1485 Coro::cede; 2052 cf::cede_to_tick;
2053
2054 unless ($self->{deny_activate}) {
2055 $self->decay_objects;
2056 $self->fix_auto_apply;
2057 $self->update_buttons;
2058 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
1486 $self->activate; 2061 $self->activate;
2062 }
2063
2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME);
2066
2067 $self->in_memory (cf::MAP_IN_MEMORY);
1487 } 2068 }
1488 2069
1489 $self->post_load; 2070 $self->post_load;
1490
1491 $self->in_memory (cf::MAP_IN_MEMORY);
1492} 2071}
1493 2072
1494sub customise_for { 2073sub customise_for {
1495 my ($self, $ob) = @_; 2074 my ($self, $ob) = @_;
1496 2075
1497 return find "~" . $ob->name . "/" . $self->{path} 2076 return find "~" . $ob->name . "/" . $self->{path}
1498 if $self->per_player; 2077 if $self->per_player;
1499 2078
2079# return find "?party/" . $ob->name . "/" . $self->{path}
2080# if $self->per_party;
2081
1500 $self 2082 $self
1501} 2083}
1502 2084
1503# find and load all maps in the 3x3 area around a map 2085# find and load all maps in the 3x3 area around a map
1504sub load_diag { 2086sub load_neighbours {
1505 my ($map) = @_; 2087 my ($map) = @_;
1506 2088
1507 my @diag; # diagonal neighbours 2089 my @neigh; # diagonal neighbours
1508 2090
1509 for (0 .. 3) { 2091 for (0 .. 3) {
1510 my $neigh = $map->tile_path ($_) 2092 my $neigh = $map->tile_path ($_)
1511 or next; 2093 or next;
1512 $neigh = find $neigh, $map 2094 $neigh = find $neigh, $map
1513 or next; 2095 or next;
1514 $neigh->load; 2096 $neigh->load;
1515 2097
2098 push @neigh,
1516 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1517 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1518 } 2101 }
1519 2102
1520 for (@diag) { 2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
1521 my $neigh = find @$_ 2105 my $neigh = find $path, $origin
1522 or next; 2106 or next;
1523 $neigh->load; 2107 $neigh->load;
1524 } 2108 }
1525} 2109}
1526 2110
… …
1531} 2115}
1532 2116
1533sub do_load_sync { 2117sub do_load_sync {
1534 my ($map) = @_; 2118 my ($map) = @_;
1535 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1536 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1537} 2124}
1538 2125
1539our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1540our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1541 2128
1542sub find_async { 2129sub find_async {
1543 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1544 2131
1545 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1546 2133
1547 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1548 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1549 } 2136 }
1550 2137
1551 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1552 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1553 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1554 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1555 my $map = find $path 2145 if (my $map = find $k) {
1556 or next;
1557 $map->load; 2146 $map->load if $v;
2147 }
1558 2148
1559 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
1560 } 2150 }
1561 } 2151 }
1562 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
1563 }; 2153 };
1564 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
… …
1567} 2157}
1568 2158
1569sub save { 2159sub save {
1570 my ($self) = @_; 2160 my ($self) = @_;
1571 2161
1572 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
1573 2163
1574 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
1575 2165
1576 return unless $self->dirty; 2166 return unless $self->dirty;
1577 2167
… …
1583 return if $self->{deny_save}; 2173 return if $self->{deny_save};
1584 2174
1585 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
1586 2176
1587 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
1588 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
1589 }; 2180 };
1590 2181
1591 if ($uniq) { 2182 if ($uniq) {
1592 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1600 my ($self) = @_; 2191 my ($self) = @_;
1601 2192
1602 # save first because save cedes 2193 # save first because save cedes
1603 $self->save; 2194 $self->save;
1604 2195
1605 my $lock = cf::lock_acquire "map_data:" . $self->path; 2196 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 2197
1607 return if $self->players; 2198 return if $self->players;
1608 return if $self->in_memory != cf::MAP_IN_MEMORY; 2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
1609 return if $self->{deny_save}; 2200 return if $self->{deny_save};
1610 2201
2202 $self->in_memory (cf::MAP_SWAPPED);
2203
2204 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP;
1611 $self->clear; 2206 $self->clear;
1612 $self->in_memory (cf::MAP_SWAPPED);
1613} 2207}
1614 2208
1615sub reset_at { 2209sub reset_at {
1616 my ($self) = @_; 2210 my ($self) = @_;
1617 2211
1618 # TODO: safety, remove and allow resettable per-player maps 2212 # TODO: safety, remove and allow resettable per-player maps
1619 return 1e99 if $self->isa ("ext::map_per_player");#d#
1620 return 1e99 if $self->{deny_reset}; 2213 return 1e99 if $self->{deny_reset};
1621 2214
1622 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2215 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1623 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2216 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1624 2217
… …
1635 my ($self) = @_; 2228 my ($self) = @_;
1636 2229
1637 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2230 my $lock = cf::lock_acquire "map_data:$self->{path}";
1638 2231
1639 return if $self->players; 2232 return if $self->players;
1640 return if $self->isa ("ext::map_per_player");#d#
1641 2233
1642 warn "resetting map ", $self->path;#d# 2234 warn "resetting map ", $self->path;
1643 2235
1644 $self->in_memory (cf::MAP_SWAPPED); 2236 $self->in_memory (cf::MAP_SWAPPED);
1645 2237
1646 # need to save uniques path 2238 # need to save uniques path
1647 unless ($self->{deny_save}) { 2239 unless ($self->{deny_save}) {
… …
1651 if $uniq; 2243 if $uniq;
1652 } 2244 }
1653 2245
1654 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
1655 2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
1656 $self->clear; 2250 $self->clear;
1657
1658 $_->clear_links_to ($self) for values %cf::MAP;
1659 2251
1660 $self->unlink_save; 2252 $self->unlink_save;
1661 $self->destroy; 2253 $self->destroy;
1662} 2254}
1663 2255
1664my $nuke_counter = "aaaa"; 2256my $nuke_counter = "aaaa";
1665 2257
1666sub nuke { 2258sub nuke {
1667 my ($self) = @_; 2259 my ($self) = @_;
1668 2260
2261 {
2262 my $lock = cf::lock_acquire "map_data:$self->{path}";
2263
1669 delete $cf::MAP{$self->path}; 2264 delete $cf::MAP{$self->path};
1670 2265
1671 $self->unlink_save; 2266 $self->unlink_save;
1672 2267
1673 bless $self, "cf::map"; 2268 bless $self, "cf::map";
1674 delete $self->{deny_reset}; 2269 delete $self->{deny_reset};
1675 $self->{deny_save} = 1; 2270 $self->{deny_save} = 1;
1676 $self->reset_timeout (1); 2271 $self->reset_timeout (1);
1677 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1678 2273
1679 $cf::MAP{$self->path} = $self; 2274 $cf::MAP{$self->path} = $self;
2275 }
1680 2276
1681 $self->reset; # polite request, might not happen 2277 $self->reset; # polite request, might not happen
2278}
2279
2280=item $maps = cf::map::tmp_maps
2281
2282Returns an arrayref with all map paths of currently instantiated and saved
2283maps. May block.
2284
2285=cut
2286
2287sub tmp_maps() {
2288 [
2289 map {
2290 utf8::decode $_;
2291 /\.map$/
2292 ? normalise $_
2293 : ()
2294 } @{ aio_readdir $TMPDIR or [] }
2295 ]
2296}
2297
2298=item $maps = cf::map::random_maps
2299
2300Returns an arrayref with all map paths of currently instantiated and saved
2301random maps. May block.
2302
2303=cut
2304
2305sub random_maps() {
2306 [
2307 map {
2308 utf8::decode $_;
2309 /\.map$/
2310 ? normalise "?random/$_"
2311 : ()
2312 } @{ aio_readdir $RANDOMDIR or [] }
2313 ]
1682} 2314}
1683 2315
1684=item cf::map::unique_maps 2316=item cf::map::unique_maps
1685 2317
1686Returns an arrayref of paths of all shared maps that have 2318Returns an arrayref of paths of all shared maps that have
1687instantiated unique items. May block. 2319instantiated unique items. May block.
1688 2320
1689=cut 2321=cut
1690 2322
1691sub unique_maps() { 2323sub unique_maps() {
1692 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2324 [
1693 or return; 2325 map {
1694
1695 my @paths;
1696
1697 for (@$files) {
1698 utf8::decode $_; 2326 utf8::decode $_;
1699 next if /\.pst$/; 2327 /\.map$/
1700 next unless /^$PATH_SEP/o; 2328 ? normalise $_
1701 2329 : ()
1702 push @paths, cf::map::normalise $_; 2330 } @{ aio_readdir $UNIQUEDIR or [] }
1703 } 2331 ]
1704
1705 \@paths
1706} 2332}
1707 2333
1708package cf; 2334package cf;
1709 2335
1710=back 2336=back
… …
1728 map { $_, inv_recursive_ $_->inv } @_ 2354 map { $_, inv_recursive_ $_->inv } @_
1729} 2355}
1730 2356
1731sub inv_recursive { 2357sub inv_recursive {
1732 inv_recursive_ inv $_[0] 2358 inv_recursive_ inv $_[0]
2359}
2360
2361=item $ref = $ob->ref
2362
2363creates and returns a persistent reference to an objetc that can be stored as a string.
2364
2365=item $ob = cf::object::deref ($refstring)
2366
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block.
2369
2370=cut
2371
2372sub deref {
2373 my ($ref) = @_;
2374
2375 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2376 my ($uuid, $name) = ($1, $2);
2377 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2378 or return;
2379 $pl->ob->uuid eq $uuid
2380 or return;
2381
2382 $pl->ob
2383 } else {
2384 warn "$ref: cannot resolve object reference\n";
2385 undef
2386 }
1733} 2387}
1734 2388
1735package cf; 2389package cf;
1736 2390
1737=back 2391=back
… …
1756 2410
1757 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2411 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1758 2412
1759 if ($self->{record_replies}) { 2413 if ($self->{record_replies}) {
1760 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2414 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2415
1761 } else { 2416 } else {
2417 my $pl = $self->contr;
2418
2419 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2420 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422
2423 } else {
1762 $msg = $npc->name . " says: $msg" if $npc; 2424 $msg = $npc->name . " says: $msg" if $npc;
1763 $self->message ($msg, $flags); 2425 $self->message ($msg, $flags);
2426 }
1764 } 2427 }
2428}
2429
2430=item $object->send_msg ($channel, $msg, $color, [extra...])
2431
2432=cut
2433
2434sub cf::object::send_msg {
2435 my $pl = shift->contr
2436 or return;
2437 $pl->send_msg (@_);
1765} 2438}
1766 2439
1767=item $player_object->may ("access") 2440=item $player_object->may ("access")
1768 2441
1769Returns wether the given player is authorized to access resource "access" 2442Returns wether the given player is authorized to access resource "access"
… …
1816 $self->deactivate_recursive; 2489 $self->deactivate_recursive;
1817 2490
1818 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2491 return if UNIVERSAL::isa $self->map, "ext::map_link";
1819 2492
1820 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1821 if $self->map; 2494 if $self->map && $self->map->{path} ne "{link}";
1822 2495
1823 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2496 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1824} 2497}
1825 2498
1826sub cf::object::player::leave_link { 2499sub cf::object::player::leave_link {
1827 my ($self, $map, $x, $y) = @_; 2500 my ($self, $map, $x, $y) = @_;
2501
2502 return unless $self->contr->active;
1828 2503
1829 my $link_pos = delete $self->{_link_pos}; 2504 my $link_pos = delete $self->{_link_pos};
1830 2505
1831 unless ($map) { 2506 unless ($map) {
1832 # restore original map position 2507 # restore original map position
… …
1846 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
1847 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
1848 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
1849 2524
1850 $map->load; 2525 $map->load;
1851 $map->load_diag; 2526 $map->load_neighbours;
1852 2527
1853 return unless $self->contr->active; 2528 return unless $self->contr->active;
1854 $self->activate_recursive; 2529 $self->activate_recursive;
1855 2530
1856 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1857 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
1858} 2533}
1859 2534
1860cf::player->attach ( 2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1861 on_logout => sub {
1862 my ($pl) = @_;
1863 2536
1864 # abort map switching before logout 2537Moves the player to the given map-path and coordinates by first freezing
1865 if ($pl->ob->{_link_pos}) { 2538her, loading and preparing them map, calling the provided $check callback
1866 cf::sync_job { 2539that has to return the map if sucecssful, and then unfreezes the player on
1867 $pl->ob->leave_link 2540the new (success) or old (failed) map position. In either case, $done will
1868 }; 2541be called at the end of this process.
1869 }
1870 },
1871 on_login => sub {
1872 my ($pl) = @_;
1873 2542
1874 # try to abort aborted map switching on player login :)
1875 # should happen only on crashes
1876 if ($pl->ob->{_link_pos}) {
1877 $pl->ob->enter_link;
1878 (async {
1879 $pl->ob->reply (undef,
1880 "There was an internal problem at your last logout, "
1881 . "the server will try to bring you to your intended destination in a second.",
1882 cf::NDI_RED);
1883 # we need this sleep as the login has a concurrent enter_exit running
1884 # and this sleep increases chances of the player not ending up in scorn
1885 Coro::Timer::sleep 1;
1886 $pl->ob->leave_link;
1887 })->prio (2);
1888 }
1889 },
1890);
1891
1892=item $player_object->goto ($path, $x, $y)
1893
1894=cut 2543=cut
2544
2545our $GOTOGEN;
1895 2546
1896sub cf::object::player::goto { 2547sub cf::object::player::goto {
1897 my ($self, $path, $x, $y) = @_; 2548 my ($self, $path, $x, $y, $check, $done) = @_;
2549
2550 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1898 2552
1899 $self->enter_link; 2553 $self->enter_link;
1900 2554
1901 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
1902 my $map = eval { 2577 my $map = eval {
1903 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2579
2580 if ($map) {
1904 $map = $map->customise_for ($self) if $map; 2581 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map;
2583 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 }
2586
1905 $map 2587 $map
2588 };
2589
2590 if ($@) {
2591 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2592 LOG llevError | logBacktrace, Carp::longmess $@;
1906 } or 2593 }
1907 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1908 2594
2595 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation};
1909 $self->leave_link ($map, $x, $y); 2597 $self->leave_link ($map, $x, $y);
2598 }
2599
2600 $done->() if $done;
1910 })->prio (1); 2601 })->prio (1);
1911} 2602}
1912 2603
1913=item $player_object->enter_exit ($exit_object) 2604=item $player_object->enter_exit ($exit_object)
1914 2605
… …
1951 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
1952 } 2643 }
1953 2644
1954 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
1955 2646
1956 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
1957 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
1958 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
1959 2650
1960 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1961 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
1962 undef $fh; 2653 undef $fh;
1963 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
… …
1983 my $hp = $exit->stats->hp; 2674 my $hp = $exit->stats->hp;
1984 my $sp = $exit->stats->sp; 2675 my $sp = $exit->stats->sp;
1985 2676
1986 $self->enter_link; 2677 $self->enter_link;
1987 2678
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
1988 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
1989 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
1990 unless (eval { 2687 unless (eval {
1991 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
1992 2689
1993 1; 2690 1;
… …
2019 2716
2020 utf8::encode $text; 2717 utf8::encode $text;
2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2022} 2719}
2023 2720
2721=item $client->send_msg ($channel, $msg, $color, [extra...])
2722
2723Send a drawinfo or msg packet to the client, formatting the msg for the
2724client if neccessary. C<$type> should be a string identifying the type of
2725the message, with C<log> being the default. If C<$color> is negative, suppress
2726the message unless the client supports the msg packet.
2727
2728=cut
2729
2730# non-persistent channels (usually the info channel)
2731our %CHANNEL = (
2732 "c/identify" => {
2733 id => "infobox",
2734 title => "Identify",
2735 reply => undef,
2736 tooltip => "Items recently identified",
2737 },
2738 "c/examine" => {
2739 id => "infobox",
2740 title => "Examine",
2741 reply => undef,
2742 tooltip => "Signs and other items you examined",
2743 },
2744 "c/book" => {
2745 id => "infobox",
2746 title => "Book",
2747 reply => undef,
2748 tooltip => "The contents of a note or book",
2749 },
2750 "c/lookat" => {
2751 id => "infobox",
2752 title => "Look",
2753 reply => undef,
2754 tooltip => "What you saw there",
2755 },
2756 "c/who" => {
2757 id => "infobox",
2758 title => "Players",
2759 reply => undef,
2760 tooltip => "Shows players who are currently online",
2761 },
2762 "c/body" => {
2763 id => "infobox",
2764 title => "Body Parts",
2765 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available",
2767 },
2768 "c/uptime" => {
2769 id => "infobox",
2770 title => "Uptime",
2771 reply => undef,
2772 tooltip => "How long the server has been running since last restart",
2773 },
2774 "c/mapinfo" => {
2775 id => "infobox",
2776 title => "Map Info",
2777 reply => undef,
2778 tooltip => "Information related to the maps",
2779 },
2780);
2781
2782sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_;
2784
2785 $msg = $self->pl->expand_cfpod ($msg);
2786
2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788
2789 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel};
2792
2793 $self->ext_msg (channel_info => $channel)
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id};
2797
2798 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804 }
2805
2806 $channel = $channel->{id};
2807 }
2808
2809 return unless @extra || length $msg;
2810
2811 if ($self->can_msg) {
2812 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF;
2815
2816 $self->send_packet ("msg " . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2818 } else {
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829
2830 $color &= cf::NDI_COLOR_MASK;
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843}
2844
2024=item $client->ext_event ($type, %msg) 2845=item $client->ext_msg ($type, @msg)
2025 2846
2026Sends an exti event to the client. 2847Sends an ext event to the client.
2027 2848
2028=cut 2849=cut
2029 2850
2030sub cf::client::ext_event($$%) { 2851sub cf::client::ext_msg($$@) {
2031 my ($self, $type, %msg) = @_; 2852 my ($self, $type, @msg) = @_;
2032 2853
2854 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove
2033 $msg{msgtype} = "event_$type"; 2857 push @msg, msgtype => "event_$type";
2034 $self->send_packet ("ext " . cf::to_json \%msg); 2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 }
2860}
2861
2862=item $client->ext_reply ($msgid, @msg)
2863
2864Sends an ext reply to the client.
2865
2866=cut
2867
2868sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_;
2870
2871 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 }
2035} 2878}
2036 2879
2037=item $success = $client->query ($flags, "text", \&cb) 2880=item $success = $client->query ($flags, "text", \&cb)
2038 2881
2039Queues a query to the client, calling the given callback with 2882Queues a query to the client, calling the given callback with
2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2883the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2041C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2884C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2042 2885
2043Queries can fail, so check the return code. Or don't, as queries will become 2886Queries can fail, so check the return code. Or don't, as queries will
2044reliable at some point in the future. 2887become reliable at some point in the future.
2045 2888
2046=cut 2889=cut
2047 2890
2048sub cf::client::query { 2891sub cf::client::query {
2049 my ($self, $flags, $text, $cb) = @_; 2892 my ($self, $flags, $text, $cb) = @_;
… …
2057 utf8::encode $text; 2900 utf8::encode $text;
2058 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2901 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2059 2902
2060 $self->send_packet ($self->{query_queue}[0][0]) 2903 $self->send_packet ($self->{query_queue}[0][0])
2061 if @{ $self->{query_queue} } == 1; 2904 if @{ $self->{query_queue} } == 1;
2905
2906 1
2062} 2907}
2063 2908
2064cf::client->attach ( 2909cf::client->attach (
2910 on_connect => sub {
2911 my ($ns) = @_;
2912
2913 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2914 },
2065 on_reply => sub { 2915 on_reply => sub {
2066 my ($ns, $msg) = @_; 2916 my ($ns, $msg) = @_;
2067 2917
2068 # this weird shuffling is so that direct followup queries 2918 # this weird shuffling is so that direct followup queries
2069 # get handled first 2919 # get handled first
… …
2081 } else { 2931 } else {
2082 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2932 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2083 } 2933 }
2084 } 2934 }
2085 }, 2935 },
2936 on_exticmd => sub {
2937 my ($ns, $buf) = @_;
2938
2939 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2940
2941 if (ref $msg) {
2942 my ($type, $reply, @payload) =
2943 "ARRAY" eq ref $msg
2944 ? @$msg
2945 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2946
2947 my @reply;
2948
2949 if (my $cb = $EXTICMD{$type}) {
2950 @reply = $cb->($ns, @payload);
2951 }
2952
2953 $ns->ext_reply ($reply, @reply)
2954 if $reply;
2955
2956 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 }
2959
2960 cf::override;
2961 },
2086); 2962);
2087 2963
2088=item $client->async (\&cb) 2964=item $client->async (\&cb)
2089 2965
2090Create a new coroutine, running the specified callback. The coroutine will 2966Create a new coroutine, running the specified callback. The coroutine will
… …
2131our $safe = new Safe "safe"; 3007our $safe = new Safe "safe";
2132our $safe_hole = new Safe::Hole; 3008our $safe_hole = new Safe::Hole;
2133 3009
2134$SIG{FPE} = 'IGNORE'; 3010$SIG{FPE} = 'IGNORE';
2135 3011
2136$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3012$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math
3014 grepstart grepwhile mapstart mapwhile
3015 sort time
3016));
2137 3017
2138# here we export the classes and methods available to script code 3018# here we export the classes and methods available to script code
2139 3019
2140=pod 3020=pod
2141 3021
2142The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2143 3023
2144 cf::object contr pay_amount pay_player map 3024 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr
3027
2145 cf::object::player player 3028 cf::object::player
2146 cf::player peaceful 3029 player
2147 cf::map trigger 3030
3031 cf::player
3032 peaceful
3033
3034 cf::map
3035 trigger
2148 3036
2149=cut 3037=cut
2150 3038
2151for ( 3039for (
2152 ["cf::object" => qw(contr pay_amount pay_player map)], 3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race
3042 decrease_ob_nr destroy)],
2153 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2154 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2155 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2156) { 3046) {
2157 no strict 'refs'; 3047 no strict 'refs';
… …
2228=back 3118=back
2229 3119
2230=cut 3120=cut
2231 3121
2232############################################################################# 3122#############################################################################
2233
2234=head2 EXTENSION DATABASE SUPPORT
2235
2236Crossfire maintains a very simple database for extension use. It can
2237currently store anything that can be serialised using Storable, which
2238excludes objects.
2239
2240The parameter C<$family> should best start with the name of the extension
2241using it, it should be unique.
2242
2243=over 4
2244
2245=item $value = cf::db_get $family => $key
2246
2247Returns a single value from the database.
2248
2249=item cf::db_put $family => $key => $value
2250
2251Stores the given C<$value> in the family.
2252
2253=cut
2254
2255our $DB;
2256
2257sub db_init {
2258 unless ($DB) {
2259 $DB = BDB::db_create $DB_ENV;
2260
2261 cf::sync_job {
2262 eval {
2263 $DB->set_flags (BDB::CHKSUM);
2264
2265 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2266 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2267 cf::cleanup "db_open(db): $!" if $!;
2268 };
2269 cf::cleanup "db_open(db): $@" if $@;
2270 };
2271
2272 my $path = cf::localdir . "/database.pst";
2273 if (stat $path) {
2274 cf::sync_job {
2275 my $pst = Storable::retrieve $path;
2276
2277 cf::db_put (board => data => $pst->{board});
2278 cf::db_put (guildrules => data => $pst->{guildrules});
2279 cf::db_put (rent => balance => $pst->{rent}{balance});
2280 BDB::db_env_txn_checkpoint $DB_ENV;
2281
2282 unlink $path;
2283 };
2284 }
2285 }
2286}
2287
2288sub db_get($$) {
2289 my $key = "$_[0]/$_[1]";
2290
2291 cf::sync_job {
2292 BDB::db_get $DB, undef, $key, my $data;
2293
2294 $! ? ()
2295 : Compress::LZF::sthaw $data
2296 }
2297}
2298
2299sub db_put($$$) {
2300 BDB::dbreq_pri 4;
2301 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2302}
2303
2304#############################################################################
2305# the server's init and main functions 3123# the server's init and main functions
2306 3124
2307sub load_facedata { 3125sub load_facedata($) {
2308 my $path = sprintf "%s/facedata", cf::datadir; 3126 my ($path) = @_;
3127
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2309 3133
2310 warn "loading facedata from $path\n"; 3134 warn "loading facedata from $path\n";
2311 3135
2312 my $faces; 3136 my $facedata;
2313 0 < aio_load $path, $faces 3137 0 < aio_load $path, $facedata
2314 or die "$path: $!"; 3138 or die "$path: $!";
2315 3139
2316 Coro::cede;
2317 $faces = Storable::thaw $faces; 3140 $facedata = Coro::Storable::thaw $facedata;
2318 Coro::cede;
2319 3141
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1 3142 $facedata->{version} == 2
2322 or cf::cleanup "$path: version mismatch, cannot proceed."; 3143 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323 3144
3145 # patch in the exptable
3146 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3149 };
3150 cf::cede_to_tick;
3151
3152 {
3153 my $faces = $facedata->{faceinfo};
3154
2324 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3157
3158 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2329 Coro::cede;
2330 }
2331 3162
3163 cf::cede_to_tick;
3164 }
3165
2332 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
2334 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
2335 or next; 3170 or next;
3171
2336 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth;
2337 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2338 } else { 3175 } else {
2339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
2340 } 3177 }
2341 Coro::cede; 3178
3179 cf::cede_to_tick;
3180 }
3181 }
3182
2342 } 3183 {
3184 my $anims = $facedata->{animinfo};
3185
3186 while (my ($anim, $info) = each %$anims) {
3187 cf::anim::set $anim, $info->{frames}, $info->{facings};
3188 cf::cede_to_tick;
3189 }
3190
3191 cf::anim::invalidate_all; # d'oh
3192 }
3193
3194 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource};
3198
3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203
3204 if ($info->{type} & 1) {
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type};
3219 } else {
3220 $RESOURCE{$name} = $info;
3221 }
3222
3223 cf::cede_to_tick;
3224 }
3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2343 3228
2344 1 3229 1
2345} 3230}
2346 3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3251
3252register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_;
3254
3255 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v);
3257 }
3258};
3259
3260sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = ();
3264
3265 load_resource_file "$MAPDIR/regions"
3266 or die "unable to load regions file\n";
3267
3268 for (cf::region::list) {
3269 $_->{match} = qr/$_->{match}/
3270 if exists $_->{match};
3271 }
3272}
3273
3274sub reload_facedata {
3275 load_facedata "$DATADIR/facedata"
3276 or die "unable to load facedata\n";
3277}
3278
3279sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287}
3288
3289sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n";
3292}
3293
2347sub reload_resources { 3294sub reload_resources {
2348 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3295 warn "reloading resource files...\n";
2349 or die "unable to load regions file\n";#d# 3296
3297 reload_regions;
2350 load_facedata 3298 reload_facedata;
2351 or die "unable to load facedata\n";#d# 3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures;
3302
3303 warn "finished reloading resource files\n";
2352} 3304}
2353 3305
2354sub init { 3306sub init {
2355 reload_resources; 3307 reload_resources;
2356} 3308}
2357 3309
2358sub cfg_load { 3310sub reload_config {
2359 open my $fh, "<:utf8", cf::confdir . "/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
2360 or return; 3312 or return;
2361 3313
2362 local $/; 3314 local $/;
2363 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
2364 3316
2365 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2366 3318
2367 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2368 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2379sub main { 3331sub main {
2380 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
2381 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
2382 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2383 (async { 3335 (async {
2384 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
2385 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
2386 }; 3339 };
2387 3340
2388 cfg_load; 3341 reload_config;
2389 db_init; 3342 db_init;
2390 load_extensions; 3343 load_extensions;
2391 3344
2392 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2393 Event::loop; 3347 EV::loop;
2394} 3348}
2395 3349
2396############################################################################# 3350#############################################################################
2397# initialisation and cleanup 3351# initialisation and cleanup
2398 3352
2399# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
2400BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
2401 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
2402 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2403 reentrant => 0,
2404 data => WF_AUTOCANCEL,
2405 signal => $signal,
2406 prio => 0,
2407 cb => sub {
2408 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
2409 },
2410 ); 3359 };
3360 }
3361}
3362
3363sub write_runtime {
3364 my $runtime = "$LOCALDIR/runtime";
3365
3366 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time.
3368
3369 IO::AIO::aio_utime $runtime, undef, undef;
3370
3371 my $guard = cf::lock_acquire "write_runtime";
3372
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3374 or return;
3375
3376 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server.
3379
3380 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3381 and return;
3382
3383 # always fsync - this file is important
3384 aio_fsync $fh
3385 and return;
3386
3387 # touch it again to show we are up-to-date
3388 aio_utime $fh, undef, undef;
3389
3390 close $fh
3391 or return;
3392
3393 aio_rename "$runtime~", $runtime
3394 and return;
3395
3396 warn "runtime file written.\n";
3397
2411 } 3398 1
2412} 3399}
2413 3400
2414sub emergency_save() { 3401sub emergency_save() {
2415 my $freeze_guard = cf::freeze_mainloop; 3402 my $freeze_guard = cf::freeze_mainloop;
2416 3403
… …
2422 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
2423 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
2424 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
2425 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
2426 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2427 $pl->save; 3415 $pl->save;
2428 } 3416 }
2429 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
2430 3418
2431 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
… …
2449 3437
2450 warn Carp::longmess "post_cleanup backtrace" 3438 warn Carp::longmess "post_cleanup backtrace"
2451 if $make_core; 3439 if $make_core;
2452} 3440}
2453 3441
2454sub reload() { 3442sub do_reload_perl() {
2455 # can/must only be called in main 3443 # can/must only be called in main
2456 if ($Coro::current != $Coro::main) { 3444 if ($Coro::current != $Coro::main) {
2457 warn "can only reload from main coroutine"; 3445 warn "can only reload from main coroutine";
2458 return; 3446 return;
2459 } 3447 }
… …
2470 warn "syncing database to disk"; 3458 warn "syncing database to disk";
2471 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
2472 3460
2473 # if anything goes wrong in here, we should simply crash as we already saved 3461 # if anything goes wrong in here, we should simply crash as we already saved
2474 3462
2475 warn "cancelling all WF_AUTOCANCEL watchers";
2476 for (Event::all_watchers) {
2477 $_->cancel if $_->data & WF_AUTOCANCEL;
2478 }
2479
2480 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
2481 for (;;) { 3464 for (;;) {
2482 BDB::flush; 3465 BDB::flush;
2483 IO::AIO::flush; 3466 IO::AIO::flush;
2484 Coro::cede; 3467 Coro::cede_notself;
2485 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
2486 warn "iterate..."; 3469 warn "iterate...";
2487 } 3470 }
2488 3471
2489 ++$RELOAD; 3472 ++$RELOAD;
… …
2493 %EXT_CORO = (); 3476 %EXT_CORO = ();
2494 3477
2495 warn "removing commands"; 3478 warn "removing commands";
2496 %COMMAND = (); 3479 %COMMAND = ();
2497 3480
2498 warn "removing ext commands"; 3481 warn "removing ext/exti commands";
2499 %EXTCMD = (); 3482 %EXTCMD = ();
3483 %EXTICMD = ();
2500 3484
2501 warn "unloading/nuking all extensions"; 3485 warn "unloading/nuking all extensions";
2502 for my $pkg (@EXTS) { 3486 for my $pkg (@EXTS) {
2503 warn "... unloading $pkg"; 3487 warn "... unloading $pkg";
2504 3488
… …
2534 Symbol::delete_package "safe::$_" 3518 Symbol::delete_package "safe::$_"
2535 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2536 3520
2537 warn "unloading cf.pm \"a bit\""; 3521 warn "unloading cf.pm \"a bit\"";
2538 delete $INC{"cf.pm"}; 3522 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"};
2539 3524
2540 # don't, removes xs symbols, too, 3525 # don't, removes xs symbols, too,
2541 # and global variables created in xs 3526 # and global variables created in xs
2542 #Symbol::delete_package __PACKAGE__; 3527 #Symbol::delete_package __PACKAGE__;
2543 3528
… …
2546 warn "reloading cf.pm"; 3531 warn "reloading cf.pm";
2547 require cf; 3532 require cf;
2548 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2549 3534
2550 warn "loading config and database again"; 3535 warn "loading config and database again";
2551 cf::cfg_load; 3536 cf::reload_config;
2552 3537
2553 warn "loading extensions"; 3538 warn "loading extensions";
2554 cf::load_extensions; 3539 cf::load_extensions;
2555 3540
2556 warn "reattaching attachments to objects/players"; 3541 warn "reattaching attachments to objects/players";
… …
2558 warn "reattaching attachments to maps"; 3543 warn "reattaching attachments to maps";
2559 reattach $_ for values %MAP; 3544 reattach $_ for values %MAP;
2560 warn "reattaching attachments to players"; 3545 warn "reattaching attachments to players";
2561 reattach $_ for values %PLAYER; 3546 reattach $_ for values %PLAYER;
2562 3547
2563 warn "loading reloadable resources";
2564 reload_resources;
2565
2566 warn "leaving sync_job"; 3548 warn "leaving sync_job";
2567 3549
2568 1 3550 1
2569 } or do { 3551 } or do {
2570 warn $@; 3552 warn $@;
… …
2575 warn "reloaded"; 3557 warn "reloaded";
2576}; 3558};
2577 3559
2578our $RELOAD_WATCHER; # used only during reload 3560our $RELOAD_WATCHER; # used only during reload
2579 3561
3562sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here.
3565
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3567 undef $RELOAD_WATCHER;
3568 do_reload_perl;
3569 };
3570}
3571
2580register_command "reload" => sub { 3572register_command "reload" => sub {
2581 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
2582 3574
2583 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
2584 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
2585 3577 async {
2586 # doing reload synchronously and two reloads happen back-to-back, 3578 $Coro::current->{desc} = "perl_reload";
2587 # coro crashes during coro_state_free->destroy here.
2588
2589 $RELOAD_WATCHER ||= Event->timer (
2590 reentrant => 0,
2591 after => 0,
2592 data => WF_AUTOCANCEL,
2593 cb => sub {
2594 reload; 3579 reload_perl;
2595 undef $RELOAD_WATCHER;
2596 },
2597 ); 3580 };
2598 } 3581 }
2599}; 3582};
2600 3583
2601unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
2602 3585
2603my $bug_warning = 0; 3586my $bug_warning = 0;
2604 3587
2605$TICK_WATCHER = Event->timer ( 3588our @WAIT_FOR_TICK;
2606 reentrant => 0, 3589our @WAIT_FOR_TICK_BEGIN;
2607 parked => 1, 3590
2608 prio => 0, 3591sub wait_for_tick {
2609 at => $NEXT_TICK || $TICK, 3592 return unless $TICK_WATCHER->is_active;
2610 data => WF_AUTOCANCEL, 3593 return if $Coro::current == $Coro::main;
2611 cb => sub { 3594
3595 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait;
3598}
3599
3600sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main;
3603
3604 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait;
3607}
3608
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2612 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
2613 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2614 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
2615 return; 3613 return;
2616 } 3614 }
2617 3615
2618 $NOW = Event::time; 3616 $NOW = $tick_start = EV::now;
2619 3617
2620 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3619
2621 $RUNTIME += $TICK; 3620 $RUNTIME += $TICK;
2622 $NEXT_TICK += $TICK; 3621 $NEXT_TICK = $_[0]->at;
2623 3622
2624 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2625 $NEXT_RUNTIME_WRITE = $NOW + 10; 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2626 Coro::async_pool { 3625 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver";
2627 write_runtime 3627 write_runtime
2628 or warn "ERROR: unable to write runtime file: $!"; 3628 or warn "ERROR: unable to write runtime file: $!";
2629 };
2630 } 3629 };
2631
2632 $WAIT_FOR_TICK->broadcast;
2633 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2634
2635# my $AFTER = Event::time;
2636# warn $AFTER - $NOW;#d#
2637
2638 # if we are delayed by four ticks or more, skip them all
2639 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2640
2641 $TICK_WATCHER->at ($NEXT_TICK);
2642 $TICK_WATCHER->start;
2643 }, 3630 }
2644); 3631
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send;
3634 }
3635 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send;
3637 }
3638
3639 $LOAD = ($NOW - $tick_start) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641
3642 _post_tick;
3643};
3644$TICK_WATCHER->priority (EV::MAXPRI);
2645 3645
2646{ 3646{
2647 BDB::max_poll_time $TICK * 0.1; 3647 # configure BDB
2648 $BDB_POLL_WATCHER = Event->io ( 3648
2649 reentrant => 0,
2650 fd => BDB::poll_fileno,
2651 poll => 'r',
2652 prio => 0,
2653 data => WF_AUTOCANCEL,
2654 cb => \&BDB::poll_cb,
2655 );
2656 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
2657 3650 BDB::max_poll_reqs $TICK * 0.1;
2658 BDB::set_sync_prepare { 3651 $Coro::BDB::WATCHER->priority (1);
2659 my $status;
2660 my $current = $Coro::current;
2661 (
2662 sub {
2663 $status = $!;
2664 $current->ready; undef $current;
2665 },
2666 sub {
2667 Coro::schedule while defined $current;
2668 $! = $status;
2669 },
2670 )
2671 };
2672 3652
2673 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
2674 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2675 3659
2676 cf::sync_job { 3660 cf::sync_job {
2677 eval { 3661 eval {
2678 BDB::db_env_open 3662 BDB::db_env_open
2679 $DB_ENV, 3663 $DB_ENV,
2680 $BDB_ENV_DIR, 3664 $BDBDIR,
2681 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2682 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2683 0666; 3667 0666;
2684 3668
2685 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2686
2687 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2688 $DB_ENV->set_lk_detect;
2689 }; 3670 };
2690 3671
2691 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
2692 }; 3673 };
2693 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
2694} 3685}
2695 3686
2696{ 3687{
3688 # configure IO::AIO
3689
2697 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
2698
2699 undef $Coro::AIO::WATCHER;
2700 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
2701 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
2702 reentrant => 0,
2703 data => WF_AUTOCANCEL,
2704 fd => IO::AIO::poll_fileno,
2705 poll => 'r',
2706 prio => 6,
2707 cb => \&IO::AIO::poll_cb,
2708 );
2709} 3693}
3694
3695my $_log_backtrace;
3696
3697sub _log_backtrace {
3698 my ($msg, @addr) = @_;
3699
3700 $msg =~ s/\n//;
3701
3702 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace;
3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3708 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr;
3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3712 or die "addr2line: $!";
3713
3714 my @funcs;
3715 my @res = <$fh>;
3716 chomp for @res;
3717 while (@res) {
3718 my ($func, $line) = splice @res, 0, 2, ();
3719 push @funcs, "[$func] $line";
3720 }
3721
3722 @funcs
3723 };
3724
3725 LOG llevInfo, "[ABT] $msg\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace;
3728 };
3729 } else {
3730 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n";
3732 }
3733}
3734
3735# load additional modules
3736use cf::pod;
2710 3737
2711END { cf::emergency_save } 3738END { cf::emergency_save }
2712 3739
27131 37401
2714 3741

Diff Legend

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