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.119 by root, Tue Jan 2 08:26:42 2007 UTC vs.
Revision 1.140 by root, Fri Jan 5 20:04:02 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
184=item cf::lock_wait $string
185
186Wait until the given lock is available. See cf::lock_acquire.
187
188=item my $lock = cf::lock_acquire $string
189
190Wait until the given lock is available and then acquires it and returns
191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
192for example when the coroutine gets canceled), the lock is automatically
193returned.
194
195Lock names should begin with a unique identifier (for example, cf::map::find
196uses map_find and cf::map::load uses map_load).
197
198=cut
199
200our %LOCK;
201
202sub lock_wait($) {
203 my ($key) = @_;
204
205 # wait for lock, if any
206 while ($LOCK{$key}) {
207 push @{ $LOCK{$key} }, $Coro::current;
208 Coro::schedule;
209 }
210}
211
212sub lock_acquire($) {
213 my ($key) = @_;
214
215 # wait, to be sure we are not locked
216 lock_wait $key;
217
218 $LOCK{$key} = [];
219
220 Coro::guard {
221 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} };
223 }
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 }
243
186=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
187 245
188The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 247always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 248reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
205 263
206 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 265 # (but this is cancel-safe)
208 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
209 267
210 my $busy = 1; 268 my $busy = 1;
211 my @res; 269 my @res;
212 270
213 (Coro::async { 271 (async {
214 @res = eval { $job->() }; 272 @res = eval { $job->() };
215 warn $@ if $@; 273 warn $@ if $@;
216 undef $busy; 274 undef $busy;
217 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
218 276
219 while ($busy) { 277 while ($busy) {
220 Coro::cede_notself; 278 unless (Coro::cede) {
221 Event::one_event unless Coro::nready; 279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
281 }
222 } 282 }
223 283
224 wantarray ? @res : $res[0] 284 wantarray ? @res : $res[0]
225 } else { 285 } else {
226 # we are in another coroutine, how wonderful, everything just works 286 # we are in another coroutine, how wonderful, everything just works
227 287
228 $job->() 288 $job->()
229 } 289 }
230} 290}
231 291
232=item $coro = cf::coro { BLOCK } 292=item $coro = cf::async_ext { BLOCK }
233 293
234Creates and returns a new coro. This coro is automcatially being canceled 294Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 295extension calling this is being unloaded.
236 296
237=cut 297=cut
238 298
239sub coro(&) { 299sub async_ext(&) {
240 my $cb = shift; 300 my $cb = shift;
241 301
242 my $coro; $coro = async { 302 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 303
249 $coro->on_destroy (sub { 304 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 305 delete $EXT_CORO{$coro+0};
251 }); 306 });
252 $EXT_CORO{$coro+0} = $coro; 307 $EXT_CORO{$coro+0} = $coro;
… …
1062package cf::map; 1117package cf::map;
1063 1118
1064use Fcntl; 1119use Fcntl;
1065use Coro::AIO; 1120use Coro::AIO;
1066 1121
1067our $MAX_RESET = 7200; 1122our $MAX_RESET = 3600;
1068our $DEFAULT_RESET = 3600; 1123our $DEFAULT_RESET = 3000;
1069 1124
1070sub generate_random_map { 1125sub generate_random_map {
1071 my ($path, $rmp) = @_; 1126 my ($path, $rmp) = @_;
1072 1127
1073 # mit "rum" bekleckern, nicht 1128 # mit "rum" bekleckern, nicht
… …
1089# and all this just because we cannot iterate over 1144# and all this just because we cannot iterate over
1090# all maps in C++... 1145# all maps in C++...
1091sub change_all_map_light { 1146sub change_all_map_light {
1092 my ($change) = @_; 1147 my ($change) = @_;
1093 1148
1094 $_->change_map_light ($change) for values %cf::MAP; 1149 $_->change_map_light ($change)
1150 for grep $_->outdoor, values %cf::MAP;
1095} 1151}
1096 1152
1097sub try_load_header($) { 1153sub try_load_header($) {
1098 my ($path) = @_; 1154 my ($path) = @_;
1099 1155
… …
1102 or return; 1158 or return;
1103 1159
1104 my $map = cf::map::new 1160 my $map = cf::map::new
1105 or return; 1161 or return;
1106 1162
1163 # for better error messages only, will be overwritten
1164 $map->path ($path);
1165
1107 $map->load_header ($path) 1166 $map->load_header ($path)
1108 or return; 1167 or return;
1109 1168
1110 $map->{load_path} = $path; 1169 $map->{load_path} = $path;
1111 1170
1112 $map 1171 $map
1113} 1172}
1114 1173
1174sub find;
1115sub find_map { 1175sub find {
1116 my ($path, $origin) = @_; 1176 my ($path, $origin) = @_;
1117 1177
1118 #warn "find_map<$path,$origin>\n";#d# 1178 #warn "find<$path,$origin>\n";#d#
1119 1179
1120 $path = new cf::path $path, $origin && $origin->path; 1180 $path = new cf::path $path, $origin && $origin->path;
1121 my $key = $path->as_string; 1181 my $key = $path->as_string;
1122 1182
1183 cf::lock_wait "map_find:$key";
1184
1123 $cf::MAP{$key} || do { 1185 $cf::MAP{$key} || do {
1186 my $guard = cf::lock_acquire "map_find:$key";
1187
1124 # do it the slow way 1188 # do it the slow way
1125 my $map = try_load_header $path->save_path; 1189 my $map = try_load_header $path->save_path;
1126 1190
1191 Coro::cede;
1192
1127 if ($map) { 1193 if ($map) {
1194 $map->last_access ((delete $map->{last_access})
1195 || $cf::RUNTIME); #d#
1128 # safety 1196 # safety
1129 $map->{instantiate_time} = $cf::RUNTIME 1197 $map->{instantiate_time} = $cf::RUNTIME
1130 if $map->{instantiate_time} > $cf::RUNTIME; 1198 if $map->{instantiate_time} > $cf::RUNTIME;
1131 } else { 1199 } else {
1132 if (my $rmp = $path->random_map_params) { 1200 if (my $rmp = $path->random_map_params) {
… …
1137 1205
1138 $map or return; 1206 $map or return;
1139 1207
1140 $map->{load_original} = 1; 1208 $map->{load_original} = 1;
1141 $map->{instantiate_time} = $cf::RUNTIME; 1209 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->last_access ($cf::RUNTIME);
1142 $map->instantiate; 1211 $map->instantiate;
1143 1212
1144 # per-player maps become, after loading, normal maps 1213 # per-player maps become, after loading, normal maps
1145 $map->per_player (0) if $path->{user_rel}; 1214 $map->per_player (0) if $path->{user_rel};
1146 } 1215 }
1147 #Coro::Timer::sleep 1;#d#
1148 1216
1149 $map->path ($key); 1217 $map->path ($key);
1150 $map->{path} = $path; 1218 $map->{path} = $path;
1151 $map->{last_save} = $cf::RUNTIME; 1219 $map->{last_save} = $cf::RUNTIME;
1152 $map->last_access ($cf::RUNTIME); 1220
1221 Coro::cede;
1153 1222
1154 if ($map->should_reset) { 1223 if ($map->should_reset) {
1155 $map->reset; 1224 $map->reset;
1225 undef $guard;
1156 $map = find_map $path; 1226 $map = find $path
1227 or return;
1157 } 1228 }
1158 1229
1159 $cf::MAP{$key} = $map 1230 $cf::MAP{$key} = $map
1160 } 1231 }
1161} 1232}
1162 1233
1163sub load { 1234sub load {
1164 my ($self) = @_; 1235 my ($self) = @_;
1165 1236
1237 my $path = $self->{path};
1238 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1239
1166 return if $self->in_memory != cf::MAP_SWAPPED; 1240 return if $self->in_memory != cf::MAP_SWAPPED;
1167 1241
1168 $self->in_memory (cf::MAP_LOADING); 1242 $self->in_memory (cf::MAP_LOADING);
1169
1170 my $path = $self->{path};
1171 1243
1172 $self->alloc; 1244 $self->alloc;
1173 $self->load_objects ($self->{load_path}, 1) 1245 $self->load_objects ($self->{load_path}, 1)
1174 or return; 1246 or return;
1175 1247
… …
1181 if (aio_open $uniq, O_RDONLY, 0) { 1253 if (aio_open $uniq, O_RDONLY, 0) {
1182 $self->clear_unique_items; 1254 $self->clear_unique_items;
1183 $self->load_objects ($uniq, 0); 1255 $self->load_objects ($uniq, 0);
1184 } 1256 }
1185 } 1257 }
1258
1259 Coro::cede;
1186 1260
1187 # now do the right thing for maps 1261 # now do the right thing for maps
1188 $self->link_multipart_objects; 1262 $self->link_multipart_objects;
1189 1263
1190 if ($self->{path}->is_style_map) { 1264 if ($self->{path}->is_style_map) {
… …
1198 $self->difficulty ($self->estimate_difficulty) 1272 $self->difficulty ($self->estimate_difficulty)
1199 unless $self->difficulty; 1273 unless $self->difficulty;
1200 $self->activate; 1274 $self->activate;
1201 } 1275 }
1202 1276
1277 Coro::cede;
1278
1203 $self->in_memory (cf::MAP_IN_MEMORY); 1279 $self->in_memory (cf::MAP_IN_MEMORY);
1204} 1280}
1205 1281
1206sub load_map_sync { 1282sub find_sync {
1207 my ($path, $origin) = @_; 1283 my ($path, $origin) = @_;
1208 1284
1209 #warn "load_map_sync<$path, $origin>\n";#d# 1285 cf::sync_job { cf::map::find $path, $origin }
1286}
1210 1287
1211 cf::sync_job { 1288sub do_load_sync {
1212 my $map = cf::map::find_map $path, $origin 1289 my ($map) = @_;
1213 or return; 1290
1214 $map->load; 1291 cf::sync_job { $map->load };
1215 $map
1216 }
1217} 1292}
1218 1293
1219sub save { 1294sub save {
1220 my ($self) = @_; 1295 my ($self) = @_;
1221 1296
1297 my $lock = cf::lock_acquire "map_data:" . $self->path;
1298
1222 $self->{last_save} = $cf::RUNTIME; 1299 $self->{last_save} = $cf::RUNTIME;
1223 1300
1224 return unless $self->dirty; 1301 return unless $self->dirty;
1225 1302
1226 my $save = $self->{path}->save_path; utf8::encode $save; 1303 my $save = $self->{path}->save_path; utf8::encode $save;
1227 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1304 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1228 1305
1229 $self->{load_path} = $save; 1306 $self->{load_path} = $save;
1230 1307
1231 return if $self->{deny_save}; 1308 return if $self->{deny_save};
1309
1310 local $self->{last_access} = $self->last_access;#d#
1232 1311
1233 if ($uniq) { 1312 if ($uniq) {
1234 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1235 $self->save_objects ($uniq, cf::IO_UNIQUES); 1314 $self->save_objects ($uniq, cf::IO_UNIQUES);
1236 } else { 1315 } else {
… …
1239} 1318}
1240 1319
1241sub swap_out { 1320sub swap_out {
1242 my ($self) = @_; 1321 my ($self) = @_;
1243 1322
1323 # save first because save cedes
1324 $self->save;
1325
1326 my $lock = cf::lock_acquire "map_data:" . $self->path;
1327
1244 return if $self->players; 1328 return if $self->players;
1245 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1246 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1247 1331
1248 $self->save;
1249 $self->clear; 1332 $self->clear;
1250 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1251} 1334}
1252 1335
1253sub reset_at { 1336sub reset_at {
… …
1291} 1374}
1292 1375
1293sub reset { 1376sub reset {
1294 my ($self) = @_; 1377 my ($self) = @_;
1295 1378
1379 my $lock = cf::lock_acquire "map_data:" . $self->path;
1380
1296 return if $self->players; 1381 return if $self->players;
1297 return if $self->{path}{user_rel};#d# 1382 return if $self->{path}{user_rel};#d#
1298 1383
1299 warn "resetting map ", $self->path;#d# 1384 warn "resetting map ", $self->path;#d#
1300 1385
… …
1319 1404
1320sub customise_for { 1405sub customise_for {
1321 my ($map, $ob) = @_; 1406 my ($map, $ob) = @_;
1322 1407
1323 if ($map->per_player) { 1408 if ($map->per_player) {
1324 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1409 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1325 } 1410 }
1326 1411
1327 $map 1412 $map
1328} 1413}
1329 1414
1330sub emergency_save { 1415sub emergency_save {
1331 local $cf::FREEZE = 1; 1416 my $freeze_guard = cf::freeze_mainloop;
1332 1417
1333 warn "enter emergency map save\n"; 1418 warn "enter emergency map save\n";
1334 1419
1335 cf::sync_job { 1420 cf::sync_job {
1336 warn "begin emergency map save\n"; 1421 warn "begin emergency map save\n";
… …
1408=cut 1493=cut
1409 1494
1410sub cf::object::player::enter_link { 1495sub cf::object::player::enter_link {
1411 my ($self) = @_; 1496 my ($self) = @_;
1412 1497
1498 $self->deactivate_recursive;
1499
1413 return if $self->map == $LINK_MAP; 1500 return if $self->map == $LINK_MAP;
1414 1501
1415 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1416 if $self->map; 1503 if $self->map;
1417 1504
1418 $self->enter_map ($LINK_MAP, 20, 20); 1505 $self->enter_map ($LINK_MAP, 20, 20);
1419 $self->deactivate_recursive;
1420} 1506}
1421 1507
1422sub cf::object::player::leave_link { 1508sub cf::object::player::leave_link {
1423 my ($self, $map, $x, $y) = @_; 1509 my ($self, $map, $x, $y) = @_;
1424 1510
1425 my $link_pos = delete $self->{_link_pos}; 1511 my $link_pos = delete $self->{_link_pos};
1426 1512
1427 unless ($map) { 1513 unless ($map) {
1428 # restore original map position 1514 # restore original map position
1429 ($map, $x, $y) = @{ $link_pos || [] }; 1515 ($map, $x, $y) = @{ $link_pos || [] };
1430 $map = cf::map::find_map $map; 1516 $map = cf::map::find $map;
1431 1517
1432 unless ($map) { 1518 unless ($map) {
1433 ($map, $x, $y) = @$EMERGENCY_POSITION; 1519 ($map, $x, $y) = @$EMERGENCY_POSITION;
1434 $map = cf::map::find_map $map 1520 $map = cf::map::find $map
1435 or die "FATAL: cannot load emergency map\n"; 1521 or die "FATAL: cannot load emergency map\n";
1436 } 1522 }
1437 } 1523 }
1438 1524
1439 ($x, $y) = (-1, -1) 1525 ($x, $y) = (-1, -1)
… …
1447 1533
1448 $self->activate_recursive; 1534 $self->activate_recursive;
1449 $self->enter_map ($map, $x, $y); 1535 $self->enter_map ($map, $x, $y);
1450} 1536}
1451 1537
1538cf::player->attach (
1539 on_logout => sub {
1540 my ($pl) = @_;
1541
1542 # abort map switching before logout
1543 if ($pl->ob->{_link_pos}) {
1544 cf::sync_job {
1545 $pl->ob->leave_link
1546 };
1547 }
1548 },
1549 on_login => sub {
1550 my ($pl) = @_;
1551
1552 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) {
1555
1556 $pl->ob->enter_link;
1557 (async {
1558 # we need this sleep as the login has a concurrent enter_exit running
1559 # and this sleep increases chances of the player not ending up in scorn
1560 $pl->ob->reply (undef,
1561 "There was an internal problem at your last logout, "
1562 . "the server will try to bring you to your intended destination in a second.",
1563 cf::NDI_RED);
1564 Coro::Timer::sleep 1;
1565 $pl->ob->leave_link;
1566 })->prio (2);
1567 }
1568 },
1569);
1570
1452=item $player_object->goto_map ($path, $x, $y) 1571=item $player_object->goto ($path, $x, $y)
1453 1572
1454=cut 1573=cut
1455 1574
1456sub cf::object::player::goto_map { 1575sub cf::object::player::goto {
1457 my ($self, $path, $x, $y) = @_; 1576 my ($self, $path, $x, $y) = @_;
1458 1577
1459 $self->enter_link; 1578 $self->enter_link;
1460 1579
1461 (Coro::async { 1580 (async {
1462 $path = new cf::path $path; 1581 $path = new cf::path $path;
1463 1582
1464 my $map = cf::map::find_map $path->as_string; 1583 my $map = cf::map::find $path->as_string;
1465 $map = $map->customise_for ($self) if $map; 1584 $map = $map->customise_for ($self) if $map;
1466 1585
1467# warn "entering ", $map->path, " at ($x, $y)\n" 1586# warn "entering ", $map->path, " at ($x, $y)\n"
1468# if $map; 1587# if $map;
1469 1588
… …
1528 1647
1529 return unless $self->type == cf::PLAYER; 1648 return unless $self->type == cf::PLAYER;
1530 1649
1531 $self->enter_link; 1650 $self->enter_link;
1532 1651
1533 (Coro::async { 1652 (async {
1653 $self->deactivate_recursive; # just to be sure
1534 unless (eval { 1654 unless (eval {
1535
1536 prepare_random_map $exit 1655 prepare_random_map $exit
1537 if $exit->slaying eq "/!"; 1656 if $exit->slaying eq "/!";
1538 1657
1539 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1658 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1540 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1659 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1541 1660
1542 1; 1661 1;
1543 }) { 1662 }) {
1544 $self->message ("Something went wrong deep within the crossfire server. " 1663 $self->message ("Something went wrong deep within the crossfire server. "
1545 . "I'll try to bring you back to the map you were before. " 1664 . "I'll try to bring you back to the map you were before. "
… …
1602 on_reply => sub { 1721 on_reply => sub {
1603 my ($ns, $msg) = @_; 1722 my ($ns, $msg) = @_;
1604 1723
1605 # this weird shuffling is so that direct followup queries 1724 # this weird shuffling is so that direct followup queries
1606 # get handled first 1725 # get handled first
1607 my $queue = delete $ns->{query_queue}; 1726 my $queue = delete $ns->{query_queue}
1727 or return; # be conservative, not sure how that can happen, but we saw a crash here
1608 1728
1609 (shift @$queue)->[1]->($msg); 1729 (shift @$queue)->[1]->($msg);
1610 1730
1611 push @{ $ns->{query_queue} }, @$queue; 1731 push @{ $ns->{query_queue} }, @$queue;
1612 1732
… …
1618 } 1738 }
1619 } 1739 }
1620 }, 1740 },
1621); 1741);
1622 1742
1623=item $client->coro (\&cb) 1743=item $client->async (\&cb)
1624 1744
1625Create a new coroutine, running the specified callback. The coroutine will 1745Create a new coroutine, running the specified callback. The coroutine will
1626be automatically cancelled when the client gets destroyed (e.g. on logout, 1746be automatically cancelled when the client gets destroyed (e.g. on logout,
1627or loss of connection). 1747or loss of connection).
1628 1748
1629=cut 1749=cut
1630 1750
1631sub cf::client::coro { 1751sub cf::client::async {
1632 my ($self, $cb) = @_; 1752 my ($self, $cb) = @_;
1633 1753
1634 my $coro; $coro = async { 1754 my $coro = &Coro::async ($cb);
1635 eval {
1636 $cb->();
1637 };
1638 warn $@ if $@;
1639 };
1640 1755
1641 $coro->on_destroy (sub { 1756 $coro->on_destroy (sub {
1642 delete $self->{_coro}{$coro+0}; 1757 delete $self->{_coro}{$coro+0};
1643 }); 1758 });
1644 1759
… …
1816 1931
1817{ 1932{
1818 my $path = cf::localdir . "/database.pst"; 1933 my $path = cf::localdir . "/database.pst";
1819 1934
1820 sub db_load() { 1935 sub db_load() {
1821 warn "loading database $path\n";#d# remove later
1822 $DB = stat $path ? Storable::retrieve $path : { }; 1936 $DB = stat $path ? Storable::retrieve $path : { };
1823 } 1937 }
1824 1938
1825 my $pid; 1939 my $pid;
1826 1940
1827 sub db_save() { 1941 sub db_save() {
1828 warn "saving database $path\n";#d# remove later
1829 waitpid $pid, 0 if $pid; 1942 waitpid $pid, 0 if $pid;
1830 if (0 == ($pid = fork)) { 1943 if (0 == ($pid = fork)) {
1831 $DB->{_meta}{version} = 1; 1944 $DB->{_meta}{version} = 1;
1832 Storable::nstore $DB, "$path~"; 1945 Storable::nstore $DB, "$path~";
1833 rename "$path~", $path; 1946 rename "$path~", $path;
… …
1881 open my $fh, "<:utf8", cf::confdir . "/config" 1994 open my $fh, "<:utf8", cf::confdir . "/config"
1882 or return; 1995 or return;
1883 1996
1884 local $/; 1997 local $/;
1885 *CFG = YAML::Syck::Load <$fh>; 1998 *CFG = YAML::Syck::Load <$fh>;
1999
2000 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2001
2002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2004
2005 if (exists $CFG{mlockall}) {
2006 eval {
2007 $CFG{mlockall} ? &mlockall : &munlockall
2008 and die "WARNING: m(un)lockall failed: $!\n";
2009 };
2010 warn $@ if $@;
2011 }
1886} 2012}
1887 2013
1888sub main { 2014sub main {
1889 # we must not ever block the main coroutine 2015 # we must not ever block the main coroutine
1890 local $Coro::idle = sub { 2016 local $Coro::idle = sub {
1891 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1892 (Coro::unblock_sub {
1893 Event::one_event; 2018 async { Event::one_event };
1894 })->();
1895 }; 2019 };
1896 2020
1897 cfg_load; 2021 cfg_load;
1898 db_load; 2022 db_load;
1899 load_extensions; 2023 load_extensions;
… …
1910 return; 2034 return;
1911 } 2035 }
1912 2036
1913 warn "reloading..."; 2037 warn "reloading...";
1914 2038
1915 local $FREEZE = 1; 2039 my $guard = freeze_mainloop;
1916 cf::emergency_save; 2040 cf::emergency_save;
1917 2041
1918 eval { 2042 eval {
1919 # if anything goes wrong in here, we should simply crash as we already saved 2043 # if anything goes wrong in here, we should simply crash as we already saved
1920 2044
… …
2056 reentrant => 0, 2180 reentrant => 0,
2057 prio => 0, 2181 prio => 0,
2058 at => $NEXT_TICK || $TICK, 2182 at => $NEXT_TICK || $TICK,
2059 data => WF_AUTOCANCEL, 2183 data => WF_AUTOCANCEL,
2060 cb => sub { 2184 cb => sub {
2061 unless ($FREEZE) {
2062 cf::server_tick; # one server iteration 2185 cf::server_tick; # one server iteration
2063 $RUNTIME += $TICK; 2186 $RUNTIME += $TICK;
2064 }
2065
2066 $NEXT_TICK += $TICK; 2187 $NEXT_TICK += $TICK;
2067 2188
2068 # if we are delayed by four ticks or more, skip them all 2189 # if we are delayed by four ticks or more, skip them all
2069 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2070 2191
… …
2093 or warn "ERROR: unable to write runtime file: $!"; 2214 or warn "ERROR: unable to write runtime file: $!";
2094 })->(); 2215 })->();
2095 }, 2216 },
2096); 2217);
2097 2218
2219END { cf::emergency_save }
2220
20981 22211
2099 2222

Diff Legend

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