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.125 by root, Tue Jan 2 23:06:39 2007 UTC vs.
Revision 1.142 by root, Fri Jan 5 21:51:42 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 184=item cf::lock_wait $string
209 185
210Wait until the given lock is available. See cf::lock_acquire. 186Wait until the given lock is available. See cf::lock_acquire.
211 187
212=item my $lock = cf::lock_acquire $string 188=item my $lock = cf::lock_acquire $string
213 189
214Wait until the given lock is available and then acquires it and returns 190Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 192for example when the coroutine gets canceled), the lock is automatically
217returned. 193returned.
218 194
219Lock names should begin with a unique identifier (for example, find_map 195Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 196uses map_find and cf::map::load uses map_load).
221 197
222=cut 198=cut
223 199
224our %LOCK; 200our %LOCK;
225 201
… …
239 # wait, to be sure we are not locked 215 # wait, to be sure we are not locked
240 lock_wait $key; 216 lock_wait $key;
241 217
242 $LOCK{$key} = []; 218 $LOCK{$key} = [];
243 219
244 cf::guard { 220 Coro::guard {
245 # wake up all waiters, to be on the safe side 221 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 222 $_->ready for @{ delete $LOCK{$key} };
247 } 223 }
248} 224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
234=item cf::async { BLOCK }
235
236Currently the same as Coro::async_pool, meaning you cannot use
237C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
238thing you are allowed to do is call C<prio> on it.
239
240=cut
241
242BEGIN { *async = \&Coro::async_pool }
249 243
250=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
251 245
252The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 247always able to handle events or runnable, as crossfire+ is only partly
… …
267 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
269 263
270 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 265 # (but this is cancel-safe)
272 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
273 267
274 my $busy = 1; 268 my $busy = 1;
275 my @res; 269 my @res;
276 270
277 (Coro::async { 271 (async {
278 @res = eval { $job->() }; 272 @res = eval { $job->() };
279 warn $@ if $@; 273 warn $@ if $@;
280 undef $busy; 274 undef $busy;
281 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
282 276
283 while ($busy) { 277 while ($busy) {
284 Coro::cede_notself; 278 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 279 }
287 280
288 wantarray ? @res : $res[0] 281 wantarray ? @res : $res[0]
289 } else { 282 } else {
290 # we are in another coroutine, how wonderful, everything just works 283 # we are in another coroutine, how wonderful, everything just works
291 284
292 $job->() 285 $job->()
293 } 286 }
294} 287}
295 288
296=item $coro = cf::coro { BLOCK } 289=item $coro = cf::async_ext { BLOCK }
297 290
298Creates and returns a new coro. This coro is automcatially being canceled 291Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 292extension calling this is being unloaded.
300 293
301=cut 294=cut
302 295
303sub coro(&) { 296sub async_ext(&) {
304 my $cb = shift; 297 my $cb = shift;
305 298
306 my $coro; $coro = async { 299 my $coro = &Coro::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 300
313 $coro->on_destroy (sub { 301 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 302 delete $EXT_CORO{$coro+0};
315 }); 303 });
316 $EXT_CORO{$coro+0} = $coro; 304 $EXT_CORO{$coro+0} = $coro;
… …
1126package cf::map; 1114package cf::map;
1127 1115
1128use Fcntl; 1116use Fcntl;
1129use Coro::AIO; 1117use Coro::AIO;
1130 1118
1131our $MAX_RESET = 7200; 1119our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1120our $DEFAULT_RESET = 3000;
1133 1121
1134sub generate_random_map { 1122sub generate_random_map {
1135 my ($path, $rmp) = @_; 1123 my ($path, $rmp) = @_;
1136 1124
1137 # mit "rum" bekleckern, nicht 1125 # mit "rum" bekleckern, nicht
… …
1167 or return; 1155 or return;
1168 1156
1169 my $map = cf::map::new 1157 my $map = cf::map::new
1170 or return; 1158 or return;
1171 1159
1160 # for better error messages only, will be overwritten
1161 $map->path ($path);
1162
1172 $map->load_header ($path) 1163 $map->load_header ($path)
1173 or return; 1164 or return;
1174 1165
1175 $map->{load_path} = $path; 1166 $map->{load_path} = $path;
1176 1167
1177 $map 1168 $map
1178} 1169}
1179 1170
1171sub find;
1180sub find_map { 1172sub find {
1181 my ($path, $origin) = @_; 1173 my ($path, $origin) = @_;
1182 1174
1183 #warn "find_map<$path,$origin>\n";#d# 1175 #warn "find<$path,$origin>\n";#d#
1184 1176
1185 $path = new cf::path $path, $origin && $origin->path; 1177 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1178 my $key = $path->as_string;
1187 1179
1188 cf::lock_wait "map_find:$key"; 1180 cf::lock_wait "map_find:$key";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1183 my $guard = cf::lock_acquire "map_find:$key";
1192 1184
1193 # do it the slow way 1185 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1186 my $map = try_load_header $path->save_path;
1195 1187
1188 Coro::cede;
1189
1196 if ($map) { 1190 if ($map) {
1191 $map->last_access ((delete $map->{last_access})
1192 || $cf::RUNTIME); #d#
1197 # safety 1193 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1194 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1195 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1196 } else {
1201 if (my $rmp = $path->random_map_params) { 1197 if (my $rmp = $path->random_map_params) {
… …
1206 1202
1207 $map or return; 1203 $map or return;
1208 1204
1209 $map->{load_original} = 1; 1205 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1206 $map->{instantiate_time} = $cf::RUNTIME;
1207 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1208 $map->instantiate;
1212 1209
1213 # per-player maps become, after loading, normal maps 1210 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1211 $map->per_player (0) if $path->{user_rel};
1215 } 1212 }
1216 1213
1217 $map->path ($key); 1214 $map->path ($key);
1218 $map->{path} = $path; 1215 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1216 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1217
1218 Coro::cede;
1221 1219
1222 if ($map->should_reset) { 1220 if ($map->should_reset) {
1223 $map->reset; 1221 $map->reset;
1224 undef $guard; 1222 undef $guard;
1225 $map = cf::map::find_map ($path) 1223 $map = find $path
1226 or return; 1224 or return;
1227 } 1225 }
1228 1226
1229 $cf::MAP{$key} = $map 1227 $cf::MAP{$key} = $map
1230 } 1228 }
… …
1252 if (aio_open $uniq, O_RDONLY, 0) { 1250 if (aio_open $uniq, O_RDONLY, 0) {
1253 $self->clear_unique_items; 1251 $self->clear_unique_items;
1254 $self->load_objects ($uniq, 0); 1252 $self->load_objects ($uniq, 0);
1255 } 1253 }
1256 } 1254 }
1255
1256 Coro::cede;
1257 1257
1258 # now do the right thing for maps 1258 # now do the right thing for maps
1259 $self->link_multipart_objects; 1259 $self->link_multipart_objects;
1260 1260
1261 if ($self->{path}->is_style_map) { 1261 if ($self->{path}->is_style_map) {
… …
1269 $self->difficulty ($self->estimate_difficulty) 1269 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1270 unless $self->difficulty;
1271 $self->activate; 1271 $self->activate;
1272 } 1272 }
1273 1273
1274 Coro::cede;
1275
1274 $self->in_memory (cf::MAP_IN_MEMORY); 1276 $self->in_memory (cf::MAP_IN_MEMORY);
1275} 1277}
1276 1278
1277sub load_map_sync { 1279sub find_sync {
1278 my ($path, $origin) = @_; 1280 my ($path, $origin) = @_;
1279 1281
1280 #warn "load_map_sync<$path, $origin>\n";#d# 1282 cf::sync_job { cf::map::find $path, $origin }
1283}
1281 1284
1282 cf::sync_job { 1285sub do_load_sync {
1283 my $map = cf::map::find_map $path, $origin 1286 my ($map) = @_;
1284 or return; 1287
1285 $map->load; 1288 cf::sync_job { $map->load };
1286 $map
1287 }
1288} 1289}
1289 1290
1290sub save { 1291sub save {
1291 my ($self) = @_; 1292 my ($self) = @_;
1292 1293
1294 my $lock = cf::lock_acquire "map_data:" . $self->path;
1295
1293 $self->{last_save} = $cf::RUNTIME; 1296 $self->{last_save} = $cf::RUNTIME;
1294 1297
1295 return unless $self->dirty; 1298 return unless $self->dirty;
1296 1299
1297 my $save = $self->{path}->save_path; utf8::encode $save; 1300 my $save = $self->{path}->save_path; utf8::encode $save;
1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1301 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1299 1302
1300 $self->{load_path} = $save; 1303 $self->{load_path} = $save;
1301 1304
1302 return if $self->{deny_save}; 1305 return if $self->{deny_save};
1306
1307 local $self->{last_access} = $self->last_access;#d#
1303 1308
1304 if ($uniq) { 1309 if ($uniq) {
1305 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1310 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1306 $self->save_objects ($uniq, cf::IO_UNIQUES); 1311 $self->save_objects ($uniq, cf::IO_UNIQUES);
1307 } else { 1312 } else {
… …
1310} 1315}
1311 1316
1312sub swap_out { 1317sub swap_out {
1313 my ($self) = @_; 1318 my ($self) = @_;
1314 1319
1320 # save first because save cedes
1321 $self->save;
1322
1323 my $lock = cf::lock_acquire "map_data:" . $self->path;
1324
1315 return if $self->players; 1325 return if $self->players;
1316 return if $self->in_memory != cf::MAP_IN_MEMORY; 1326 return if $self->in_memory != cf::MAP_IN_MEMORY;
1317 return if $self->{deny_save}; 1327 return if $self->{deny_save};
1318 1328
1319 $self->save;
1320 $self->clear; 1329 $self->clear;
1321 $self->in_memory (cf::MAP_SWAPPED); 1330 $self->in_memory (cf::MAP_SWAPPED);
1322} 1331}
1323 1332
1324sub reset_at { 1333sub reset_at {
… …
1362} 1371}
1363 1372
1364sub reset { 1373sub reset {
1365 my ($self) = @_; 1374 my ($self) = @_;
1366 1375
1376 my $lock = cf::lock_acquire "map_data:" . $self->path;
1377
1367 return if $self->players; 1378 return if $self->players;
1368 return if $self->{path}{user_rel};#d# 1379 return if $self->{path}{user_rel};#d#
1369 1380
1370 warn "resetting map ", $self->path;#d# 1381 warn "resetting map ", $self->path;#d#
1371 1382
… …
1390 1401
1391sub customise_for { 1402sub customise_for {
1392 my ($map, $ob) = @_; 1403 my ($map, $ob) = @_;
1393 1404
1394 if ($map->per_player) { 1405 if ($map->per_player) {
1395 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1406 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1396 } 1407 }
1397 1408
1398 $map 1409 $map
1399} 1410}
1400 1411
1401sub emergency_save { 1412sub emergency_save {
1402 local $cf::FREEZE = 1; 1413 my $freeze_guard = cf::freeze_mainloop;
1403 1414
1404 warn "enter emergency map save\n"; 1415 warn "enter emergency map save\n";
1405 1416
1406 cf::sync_job { 1417 cf::sync_job {
1407 warn "begin emergency map save\n"; 1418 warn "begin emergency map save\n";
… …
1497 my $link_pos = delete $self->{_link_pos}; 1508 my $link_pos = delete $self->{_link_pos};
1498 1509
1499 unless ($map) { 1510 unless ($map) {
1500 # restore original map position 1511 # restore original map position
1501 ($map, $x, $y) = @{ $link_pos || [] }; 1512 ($map, $x, $y) = @{ $link_pos || [] };
1502 $map = cf::map::find_map $map; 1513 $map = cf::map::find $map;
1503 1514
1504 unless ($map) { 1515 unless ($map) {
1505 ($map, $x, $y) = @$EMERGENCY_POSITION; 1516 ($map, $x, $y) = @$EMERGENCY_POSITION;
1506 $map = cf::map::find_map $map 1517 $map = cf::map::find $map
1507 or die "FATAL: cannot load emergency map\n"; 1518 or die "FATAL: cannot load emergency map\n";
1508 } 1519 }
1509 } 1520 }
1510 1521
1511 ($x, $y) = (-1, -1) 1522 ($x, $y) = (-1, -1)
… …
1536 my ($pl) = @_; 1547 my ($pl) = @_;
1537 1548
1538 # try to abort aborted map switching on player login :) 1549 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes 1550 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) { 1551 if ($pl->ob->{_link_pos}) {
1552
1541 $pl->ob->enter_link; 1553 $pl->ob->enter_link;
1542 Coro::async { 1554 (async {
1543 # we need this sleep as the login has a concurrent enter_exit running 1555 # we need this sleep as the login has a concurrent enter_exit running
1544 # and this sleep increases chances of the player not ending up in scorn 1556 # and this sleep increases chances of the player not ending up in scorn
1557 $pl->ob->reply (undef,
1558 "There was an internal problem at your last logout, "
1559 . "the server will try to bring you to your intended destination in a second.",
1560 cf::NDI_RED);
1545 Coro::Timer::sleep 1; 1561 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link; 1562 $pl->ob->leave_link;
1547 }; 1563 })->prio (2);
1548 } 1564 }
1549 }, 1565 },
1550); 1566);
1551 1567
1552=item $player_object->goto_map ($path, $x, $y) 1568=item $player_object->goto ($path, $x, $y)
1553 1569
1554=cut 1570=cut
1555 1571
1556sub cf::object::player::goto_map { 1572sub cf::object::player::goto {
1557 my ($self, $path, $x, $y) = @_; 1573 my ($self, $path, $x, $y) = @_;
1558 1574
1559 $self->enter_link; 1575 $self->enter_link;
1560 1576
1561 (Coro::async { 1577 (async {
1562 $path = new cf::path $path; 1578 $path = new cf::path $path;
1563 1579
1564 my $map = cf::map::find_map $path->as_string; 1580 my $map = cf::map::find $path->as_string;
1565 $map = $map->customise_for ($self) if $map; 1581 $map = $map->customise_for ($self) if $map;
1566 1582
1567# warn "entering ", $map->path, " at ($x, $y)\n" 1583# warn "entering ", $map->path, " at ($x, $y)\n"
1568# if $map; 1584# if $map;
1569 1585
… …
1628 1644
1629 return unless $self->type == cf::PLAYER; 1645 return unless $self->type == cf::PLAYER;
1630 1646
1631 $self->enter_link; 1647 $self->enter_link;
1632 1648
1633 (Coro::async { 1649 (async {
1650 $self->deactivate_recursive; # just to be sure
1634 unless (eval { 1651 unless (eval {
1635
1636 prepare_random_map $exit 1652 prepare_random_map $exit
1637 if $exit->slaying eq "/!"; 1653 if $exit->slaying eq "/!";
1638 1654
1639 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1640 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1656 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1641 1657
1642 1; 1658 1;
1643 }) { 1659 }) {
1644 $self->message ("Something went wrong deep within the crossfire server. " 1660 $self->message ("Something went wrong deep within the crossfire server. "
1645 . "I'll try to bring you back to the map you were before. " 1661 . "I'll try to bring you back to the map you were before. "
… …
1702 on_reply => sub { 1718 on_reply => sub {
1703 my ($ns, $msg) = @_; 1719 my ($ns, $msg) = @_;
1704 1720
1705 # this weird shuffling is so that direct followup queries 1721 # this weird shuffling is so that direct followup queries
1706 # get handled first 1722 # get handled first
1707 my $queue = delete $ns->{query_queue}; 1723 my $queue = delete $ns->{query_queue}
1724 or return; # be conservative, not sure how that can happen, but we saw a crash here
1708 1725
1709 (shift @$queue)->[1]->($msg); 1726 (shift @$queue)->[1]->($msg);
1710 1727
1711 push @{ $ns->{query_queue} }, @$queue; 1728 push @{ $ns->{query_queue} }, @$queue;
1712 1729
… …
1718 } 1735 }
1719 } 1736 }
1720 }, 1737 },
1721); 1738);
1722 1739
1723=item $client->coro (\&cb) 1740=item $client->async (\&cb)
1724 1741
1725Create a new coroutine, running the specified callback. The coroutine will 1742Create a new coroutine, running the specified callback. The coroutine will
1726be automatically cancelled when the client gets destroyed (e.g. on logout, 1743be automatically cancelled when the client gets destroyed (e.g. on logout,
1727or loss of connection). 1744or loss of connection).
1728 1745
1729=cut 1746=cut
1730 1747
1731sub cf::client::coro { 1748sub cf::client::async {
1732 my ($self, $cb) = @_; 1749 my ($self, $cb) = @_;
1733 1750
1734 my $coro; $coro = async { 1751 my $coro = &Coro::async ($cb);
1735 eval {
1736 $cb->();
1737 };
1738 warn $@ if $@;
1739 };
1740 1752
1741 $coro->on_destroy (sub { 1753 $coro->on_destroy (sub {
1742 delete $self->{_coro}{$coro+0}; 1754 delete $self->{_coro}{$coro+0};
1743 }); 1755 });
1744 1756
… …
1979 open my $fh, "<:utf8", cf::confdir . "/config" 1991 open my $fh, "<:utf8", cf::confdir . "/config"
1980 or return; 1992 or return;
1981 1993
1982 local $/; 1994 local $/;
1983 *CFG = YAML::Syck::Load <$fh>; 1995 *CFG = YAML::Syck::Load <$fh>;
1996
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998
1999 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2000 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2001
2002 if (exists $CFG{mlockall}) {
2003 eval {
2004 $CFG{mlockall} ? &mlockall : &munlockall
2005 and die "WARNING: m(un)lockall failed: $!\n";
2006 };
2007 warn $@ if $@;
2008 }
1984} 2009}
1985 2010
1986sub main { 2011sub main {
1987 # we must not ever block the main coroutine 2012 # we must not ever block the main coroutine
1988 local $Coro::idle = sub { 2013 local $Coro::idle = sub {
1989 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2014 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1990 (Coro::unblock_sub {
1991 Event::one_event; 2015 async { Event::one_event };
1992 })->();
1993 }; 2016 };
1994 2017
1995 cfg_load; 2018 cfg_load;
1996 db_load; 2019 db_load;
1997 load_extensions; 2020 load_extensions;
… …
2008 return; 2031 return;
2009 } 2032 }
2010 2033
2011 warn "reloading..."; 2034 warn "reloading...";
2012 2035
2013 local $FREEZE = 1; 2036 my $guard = freeze_mainloop;
2014 cf::emergency_save; 2037 cf::emergency_save;
2015 2038
2016 eval { 2039 eval {
2017 # if anything goes wrong in here, we should simply crash as we already saved 2040 # if anything goes wrong in here, we should simply crash as we already saved
2018 2041
… …
2105 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2128 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2106 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2129 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2107 2130
2108 # dirty hack because... archetypes are not yet loaded 2131 # dirty hack because... archetypes are not yet loaded
2109 Event->timer ( 2132 Event->timer (
2110 after => 2, 2133 after => 10,
2111 cb => sub { 2134 cb => sub {
2112 $_[0]->w->cancel; 2135 $_[0]->w->cancel;
2113 2136
2114 # provide some exits "home" 2137 # provide some exits "home"
2115 my $exit = cf::object::new "exit"; 2138 my $exit = cf::object::new "exit";
… …
2154 reentrant => 0, 2177 reentrant => 0,
2155 prio => 0, 2178 prio => 0,
2156 at => $NEXT_TICK || $TICK, 2179 at => $NEXT_TICK || $TICK,
2157 data => WF_AUTOCANCEL, 2180 data => WF_AUTOCANCEL,
2158 cb => sub { 2181 cb => sub {
2159 unless ($FREEZE) {
2160 cf::server_tick; # one server iteration 2182 cf::server_tick; # one server iteration
2161 $RUNTIME += $TICK; 2183 $RUNTIME += $TICK;
2162 }
2163
2164 $NEXT_TICK += $TICK; 2184 $NEXT_TICK += $TICK;
2165 2185
2166 # if we are delayed by four ticks or more, skip them all 2186 # if we are delayed by four ticks or more, skip them all
2167 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2187 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2168 2188

Diff Legend

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